Implement Win Loss #808
Open
Implement Win Loss #808
Conversation
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
acrantel
reviewed
Sep 25, 2024
lowtorola
force-pushed
the
win-loss-record
branch
from
5218fb3
to
2cf0484
Compare
|
we should release after this pr is merged |
working win loss tie
lowtorola
force-pushed
the
win-loss-record
branch
from
2cf0484
to
a5f440a
Compare
acrantel
reviewed
Sep 28, 2024
Comment on lines
+28
to
+44
| const scrimmagingRecordAll = useScrimmagingRecord({ | ||
| episodeId, | ||
| teamId: team.id, | ||
| scrimmageType: CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.All, | ||
| }); | ||
| const scrimmagingRecordUnranked = useScrimmagingRecord({ | ||
| episodeId, | ||
| teamId: team.id, | ||
| scrimmageType: | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Unranked, | ||
| }); | ||
| const scrimmagingRecordRanked = useScrimmagingRecord({ | ||
| episodeId, | ||
| teamId: team.id, | ||
| scrimmageType: | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Ranked, | ||
| }); |
There was a problem hiding this comment.
These are bits of repeated code that could be pushed into the WinLossTie component by having that component take the scrimmage type.
Comment on lines
+67
to
+95
| {!hideAllScrimmages && ( | ||
| <WinLossTie | ||
| scrimmageType={ | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.All | ||
| } | ||
| loading={scrimmagingRecordAll.isFetching} | ||
| wins={scrimmagingRecordAll.data?.wins ?? 0} | ||
| losses={scrimmagingRecordAll.data?.losses ?? 0} | ||
| ties={scrimmagingRecordAll.data?.ties ?? 0} | ||
| /> | ||
| )} | ||
| {!hideUnranked && ( | ||
| <WinLossTie | ||
| scrimmageType={ | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Unranked | ||
| } | ||
| loading={scrimmagingRecordUnranked.isFetching} | ||
| wins={scrimmagingRecordUnranked.data?.wins ?? 0} | ||
| losses={scrimmagingRecordUnranked.data?.losses ?? 0} | ||
| ties={scrimmagingRecordUnranked.data?.ties ?? 0} | ||
| /> | ||
| )} | ||
| {!hideRanked && ( | ||
| <WinLossTie | ||
| scrimmageType={ | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Ranked | ||
| } | ||
| loading={scrimmagingRecordRanked.isFetching} | ||
| wins={scrimmagingRecordRanked.data?.wins ?? 0} |
There was a problem hiding this comment.
We can reduce the repetitiveness of this code by moving the useScrimmagingRecord call into the WinLossTie component
Comment on lines
+31
to
+61
| const userTeamRatingData: Record<string, ChartData[]> | undefined = | ||
| useMemo(() => { | ||
| if (!userTeamRatingHistory.isSuccess) return undefined; | ||
| const ratingRecord: Record<string, ChartData[]> = {}; | ||
| return userTeamRatingHistory.data.reduce((record, teamData) => { | ||
| if (teamData.team_rating !== undefined) { | ||
| record[teamData.team_rating.team.name] = | ||
| teamData.team_rating.rating_history.map((match) => [ | ||
| match.timestamp.getTime(), | ||
| match.rating, | ||
| ]); | ||
| } | ||
| return record; | ||
| }, ratingRecord); | ||
| }, [userTeamRatingHistory]); | ||
|
|
||
| const topTeamRatingData: Record<string, ChartData[]> | undefined = | ||
| useMemo(() => { | ||
| if (!topRatingHistory.isSuccess) return undefined; | ||
| const ratingRecord: Record<string, ChartData[]> = {}; | ||
| return topRatingHistory.data.reduce((record, teamData) => { | ||
| if (teamData.team_rating !== undefined) { | ||
| record[teamData.team_rating.team.name] = | ||
| teamData.team_rating.rating_history.map((match) => [ | ||
| match.timestamp.getTime(), | ||
| match.rating, | ||
| ]); | ||
| } | ||
| return record; | ||
| }, ratingRecord); | ||
| }, [topRatingHistory]); |
There was a problem hiding this comment.
Lets see if we can improve the repetitiveness of this code. We can probably drop the stuff inside the useMemo into a function that takes a rating history
Comment on lines
+32
to
+58
| queryKey: buildKey(scrimmagingRecordFactory.queryKey, { | ||
| episodeId, | ||
| teamId: teamDataCached.id, | ||
| scrimmageType: | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Ranked, | ||
| }), | ||
| }); | ||
|
|
||
| void queryClient.ensureQueryData({ | ||
| queryKey: buildKey(scrimmagingRecordFactory.queryKey, { | ||
| episodeId, | ||
| teamId: teamDataCached.id, | ||
| scrimmageType: | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.Unranked, | ||
| }), | ||
| }); | ||
|
|
||
| void queryClient.ensureQueryData({ | ||
| queryKey: buildKey(scrimmagingRecordFactory.queryKey, { | ||
| episodeId, | ||
| teamId: teamDataCached.id, | ||
| scrimmageType: | ||
| CompeteMatchScrimmagingRecordRetrieveScrimmageTypeEnum.All, | ||
| }), | ||
| }); | ||
| } | ||
|
|
There was a problem hiding this comment.
maybe we can reduce the repetitiveness here too? the main thing that's different is the scrimmage type
| @@ -1,3 +1,3 @@ | |||
| REACT_APP_THIS_URL=http://localhost:3000 | |||
| REACT_APP_BACKEND_URL=http://api.staging.battlecode.org/ | |||
| REACT_APP_BACKEND_URL=http://localhost:8000 | |||
There was a problem hiding this comment.
i accidentally changed this to staging in a recent pr, it's good that we're changing it back to localhost here
Comment on lines
+489
to
+516
| queryset = self.get_queryset().filter(tournament_round__isnull=True) | ||
|
|
||
| scrimmage_type = self.request.query_params.get("scrimmage_type") | ||
| if scrimmage_type is not None: | ||
| if scrimmage_type == "ranked": | ||
| queryset = queryset.filter(is_ranked=True) | ||
| elif scrimmage_type == "unranked": | ||
| queryset = queryset.filter(is_ranked=False) | ||
|
|
||
| team_id = parse_int(self.request.query_params.get("team_id")) | ||
| if team_id is None and request.user.pk is not None: | ||
| team_id = ( | ||
| Team.objects.filter(members__pk=request.user.pk) | ||
| .filter(episode_id=episode_id) | ||
| .first() | ||
| .id | ||
| ) | ||
| if team_id is None: | ||
| return Response(status=status.HTTP_400_BAD_REQUEST) | ||
| if team_id is not None: | ||
| queryset = queryset.filter(participants__team=team_id) | ||
| else: | ||
| return Response(status=status.HTTP_400_BAD_REQUEST) | ||
| has_invisible = self.get_queryset().filter( | ||
| participants__team__status=TeamStatus.INVISIBLE | ||
| ) | ||
| queryset = queryset.exclude(pk__in=Subquery(has_invisible.values("pk"))) | ||
|
|
There was a problem hiding this comment.
see if we can improve this whole function's performance using the code here
#558
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements the querying of a team's win-loss-tie record and adds the tile to the home screen, account page, and scrimmaging page! Resolves #781 🚀
Tile:
