From 7166e8a4a2da5247a88efbac515d3e7ec51ae7a8 Mon Sep 17 00:00:00 2001 From: Zachary Orr <516458+ZachOrr@users.noreply.github.com> Date: Sun, 14 Feb 2021 17:51:26 -0500 Subject: [PATCH] De-Java some helpers (#3387) --- old_py2/api/apiv3/api_event_controller.py | 8 +-- .../admin/admin_event_controller.py | 6 +- .../controllers/api/api_event_controller.py | 2 +- .../controllers/api/api_team_controller.py | 2 +- old_py2/controllers/backup_controller.py | 2 +- old_py2/controllers/cron_controller.py | 4 +- old_py2/controllers/district_controller.py | 2 +- old_py2/controllers/event_controller.py | 12 ++-- old_py2/controllers/mytba_controller.py | 2 +- .../parsers/fms_api/fms_api_match_parser.py | 2 +- old_py2/helpers/district_helper.py | 2 +- old_py2/helpers/team_helper.py | 2 +- old_py2/models/notifications/awards.py | 4 +- old_py2/notifications/awards_updated.py | 2 +- old_py2/tests/test_notification_awards.py | 2 +- src/backend/common/helpers/award_helper.py | 2 +- .../helpers/playoff_advancement_helper.py | 62 +++++++++---------- src/backend/common/helpers/team_helper.py | 2 +- .../common/helpers/tests/award_helper_test.py | 2 +- .../tests/playoff_advancement_helper_test.py | 12 ++-- src/backend/common/models/event.py | 2 +- src/backend/common/models/event_details.py | 2 +- src/backend/web/handlers/district.py | 2 +- src/backend/web/handlers/event.py | 12 ++-- src/backend/web/renderers/team_renderer.py | 4 +- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/old_py2/api/apiv3/api_event_controller.py b/old_py2/api/apiv3/api_event_controller.py index 86a48aa418..4aa0dad0e8 100644 --- a/old_py2/api/apiv3/api_event_controller.py +++ b/old_py2/api/apiv3/api_event_controller.py @@ -139,7 +139,7 @@ def _render(self, event_key): # Lazy handle the case when we haven't backfilled the event details if not bracket_table or not playoff_advancement: - bracket_table2, playoff_advancement2, _, _ = PlayoffAdvancementHelper.generatePlayoffAdvancement(event, matches) + bracket_table2, playoff_advancement2, _, _ = PlayoffAdvancementHelper.generate_playoff_advancement(event, matches) bracket_table = bracket_table or bracket_table2 playoff_advancement = playoff_advancement or playoff_advancement2 @@ -148,11 +148,11 @@ def _render(self, event_key): level_ranks = [] if playoff_advancement and playoff_advancement.get(level): if event.playoff_type == PlayoffType.AVG_SCORE_8_TEAM: - level_ranks = PlayoffAdvancementHelper.transform2015AdvancementLevelForApi(event, playoff_advancement, level) + level_ranks = PlayoffAdvancementHelper.transform_2015_advancement_level_for_api(event, playoff_advancement, level) else: - level_ranks = PlayoffAdvancementHelper.transformRoundRobinAdvancementLevelForApi(event, playoff_advancement, level) + level_ranks = PlayoffAdvancementHelper.transform_round_robin_advancement_level_for_api(event, playoff_advancement, level) elif bracket_table and bracket_table.get(level): - level_ranks = PlayoffAdvancementHelper.transformBracketLevelForApi(event, bracket_table, level) + level_ranks = PlayoffAdvancementHelper.transform_bracket_level_for_api(event, bracket_table, level) output.extend(level_ranks) return json.dumps(output, ensure_ascii=True, indent=2, sort_keys=True) diff --git a/old_py2/controllers/admin/admin_event_controller.py b/old_py2/controllers/admin/admin_event_controller.py index adb0d77364..5cae1b0365 100644 --- a/old_py2/controllers/admin/admin_event_controller.py +++ b/old_py2/controllers/admin/admin_event_controller.py @@ -124,7 +124,7 @@ def post(self): self.redirect("/admin/event/" + event.key_name) return parsed_advancement = CSVAdvancementParser.parse(advancement_csv, matches_per_team) - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancementFromCSV(event, parsed_advancement, comp_level) + advancement = PlayoffAdvancementHelper.generate_playoff_advancement_from_csv(event, parsed_advancement, comp_level) cleaned_matches = MatchHelper.delete_invalid_matches(event.matches, event) matches = MatchHelper.organized_matches(cleaned_matches) @@ -437,12 +437,12 @@ def get(self, event_key): event = Event.get_by_id(event_key) if not event: self.abort(404) - event.prepAwardsMatchesTeams() + event.prep_awards_matches_teams() reg_sitevar = Sitevar.get_by_id("cmp_registration_hacks") api_keys = ApiAuthAccess.query(ApiAuthAccess.event_list == ndb.Key(Event, event_key)).fetch() event_medias = Media.query(Media.references == event.key).fetch(500) - playoff_template = PlayoffAdvancementHelper.getPlayoffTemplate(event) + playoff_template = PlayoffAdvancementHelper.playoff_template(event) elim_bracket_html = jinja2_engine.render( "bracket_partials/bracket_table.html", { "bracket_table": event.playoff_bracket, diff --git a/old_py2/controllers/api/api_event_controller.py b/old_py2/controllers/api/api_event_controller.py index 83127151f4..fb2041385f 100644 --- a/old_py2/controllers/api/api_event_controller.py +++ b/old_py2/controllers/api/api_event_controller.py @@ -156,7 +156,7 @@ def _track_call(self, event_key): def _render(self,event_key): self._set_event(event_key) - award_dicts = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(self.event.awards)] + award_dicts = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(self.event.awards)] return json.dumps(award_dicts, ensure_ascii=True) diff --git a/old_py2/controllers/api/api_team_controller.py b/old_py2/controllers/api/api_team_controller.py index 4b3ba73d02..b868512c12 100644 --- a/old_py2/controllers/api/api_team_controller.py +++ b/old_py2/controllers/api/api_team_controller.py @@ -102,7 +102,7 @@ def _track_call(self, team_key, event_key): def _render(self, team_key, event_key): awards = TeamEventAwardsQuery(self.team_key, self.event_key).fetch() - awards_dicts = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(awards)] + awards_dicts = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(awards)] return json.dumps(awards_dicts, ensure_ascii=True) diff --git a/old_py2/controllers/backup_controller.py b/old_py2/controllers/backup_controller.py index 8042108118..379cf5b3b8 100644 --- a/old_py2/controllers/backup_controller.py +++ b/old_py2/controllers/backup_controller.py @@ -363,7 +363,7 @@ class TbaCSVBackupEventDo(webapp.RequestHandler): def get(self, event_key): event = Event.get_by_id(event_key) - event.prepAwardsMatchesTeams() + event.prep_awards_matches_teams() if event.awards: with cloudstorage.open(self.AWARDS_FILENAME_PATTERN.format(event.year, event_key, event_key), 'w') as awards_file: diff --git a/old_py2/controllers/cron_controller.py b/old_py2/controllers/cron_controller.py index 4b61ccaf4e..6a632fd7f7 100644 --- a/old_py2/controllers/cron_controller.py +++ b/old_py2/controllers/cron_controller.py @@ -738,7 +738,7 @@ def get(self, event_key): cleaned_matches = MatchHelper.delete_invalid_matches(matches, event) matches = MatchHelper.organized_matches(cleaned_matches) - bracket_table, playoff_advancement, _, _ = PlayoffAdvancementHelper.generatePlayoffAdvancement(event, matches) + bracket_table, playoff_advancement, _, _ = PlayoffAdvancementHelper.generate_playoff_advancement(event, matches) event_details = EventDetails( id=event.key_name, @@ -807,7 +807,7 @@ def get(self, event_key): if not event.remap_teams: return - event.prepAwardsMatchesTeams() + event.prep_awards_matches_teams() # Remap matches EventHelper.remapteams_matches(event.matches, event.remap_teams) diff --git a/old_py2/controllers/district_controller.py b/old_py2/controllers/district_controller.py index 3e57af6bbc..a2752d3ecf 100644 --- a/old_py2/controllers/district_controller.py +++ b/old_py2/controllers/district_controller.py @@ -83,7 +83,7 @@ def _render(self, district_abbrev, year=None, explicit_year=False): valid_districts.add((dist.display_name, dist.abbreviation)) valid_districts = sorted(valid_districts, key=lambda (name, _): name) - teams = TeamHelper.sortTeams(district_teams_future.get_result()) + teams = TeamHelper.sort_teams(district_teams_future.get_result()) team_keys = set([t.key.id() for t in teams]) num_teams = len(teams) diff --git a/old_py2/controllers/event_controller.py b/old_py2/controllers/event_controller.py index 88e0db1c73..47e9be387c 100644 --- a/old_py2/controllers/event_controller.py +++ b/old_py2/controllers/event_controller.py @@ -145,7 +145,7 @@ def _render(self, event_key): if not event: self.abort(404) - event.prepAwardsMatchesTeams() + event.prep_awards_matches_teams() event.prep_details() medias_future = media_query.EventTeamsPreferredMediasQuery(event_key).fetch_async() district_future = DistrictQuery(event.district_key.id()).fetch_async() if event.district_key else None @@ -161,10 +161,10 @@ def _render(self, event_key): parent_event_future = event.parent_event.get_async() event_codivisions_future = EventDivisionsQuery(event.parent_event.id()).fetch_async() - awards = AwardHelper.organizeAwards(event.awards) + awards = AwardHelper.organize_awards(event.awards) cleaned_matches = MatchHelper.delete_invalid_matches(event.matches, event) matches = MatchHelper.organized_matches(cleaned_matches) - teams = TeamHelper.sortTeams(event.teams) + teams = TeamHelper.sort_teams(event.teams) # Organize medias by team image_medias = MediaHelper.get_images([media for media in medias_future.get_result()]) @@ -195,12 +195,12 @@ def _render(self, event_key): bracket_table = event.playoff_bracket playoff_advancement = event.playoff_advancement - double_elim_matches = PlayoffAdvancementHelper.getDoubleElimMatches(event, matches) - playoff_template = PlayoffAdvancementHelper.getPlayoffTemplate(event) + double_elim_matches = PlayoffAdvancementHelper.double_elim_matches(event, matches) + playoff_template = PlayoffAdvancementHelper.playoff_template(event) # Lazy handle the case when we haven't backfilled the event details if not bracket_table or not playoff_advancement: - bracket_table2, playoff_advancement2, _, _ = PlayoffAdvancementHelper.generatePlayoffAdvancement(event, matches) + bracket_table2, playoff_advancement2, _, _ = PlayoffAdvancementHelper.generate_playoff_advancement(event, matches) bracket_table = bracket_table or bracket_table2 playoff_advancement = playoff_advancement or playoff_advancement2 diff --git a/old_py2/controllers/mytba_controller.py b/old_py2/controllers/mytba_controller.py index 0b76342fbd..4579e6bd2f 100644 --- a/old_py2/controllers/mytba_controller.py +++ b/old_py2/controllers/mytba_controller.py @@ -87,7 +87,7 @@ def get(self): team, event_team.status, status_str, - AwardHelper.organizeAwards(event_team_awards[event.key.id()][team.key.id()]) + AwardHelper.organize_awards(event_team_awards[event.key.id()][team.key.id()]) )) teams_and_statuses.sort(key=lambda x: x[0].team_number) past_events_with_teams.append((event, teams_and_statuses)) diff --git a/old_py2/datafeeds/parsers/fms_api/fms_api_match_parser.py b/old_py2/datafeeds/parsers/fms_api/fms_api_match_parser.py index 7a6cfeeba5..0a8621a873 100644 --- a/old_py2/datafeeds/parsers/fms_api/fms_api_match_parser.py +++ b/old_py2/datafeeds/parsers/fms_api/fms_api_match_parser.py @@ -212,7 +212,7 @@ def parse(self, response): # Should only happen for sf and f matches organized_matches = MatchHelper.organized_matches(parsed_matches) for level in ['sf', 'f']: - playoff_advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement2015(organized_matches) + playoff_advancement = PlayoffAdvancementHelper.generate_playoff_advancement_2015(organized_matches) if playoff_advancement[LAST_LEVEL[level]] != []: for match in organized_matches[level]: if 'frcNone' in match.team_key_names: diff --git a/old_py2/helpers/district_helper.py b/old_py2/helpers/district_helper.py index 4f3b76fae2..5e6f99d65e 100644 --- a/old_py2/helpers/district_helper.py +++ b/old_py2/helpers/district_helper.py @@ -211,7 +211,7 @@ def calc_elim_match_points_2015(cls, district_points, matches, POINTS_MULTIPLIER num_played[level][team] += 1 # qf and sf points - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement2015(matches) + advancement = PlayoffAdvancementHelper.generate_playoff_advancement_2015(matches) for last_level, level in [('qf', 'sf'), ('sf', 'f')]: for (teams, _, _, _) in advancement[last_level]: teams = ['frc{}'.format(t) for t in teams] diff --git a/old_py2/helpers/team_helper.py b/old_py2/helpers/team_helper.py index 96d1cfa2c0..aa127537ae 100644 --- a/old_py2/helpers/team_helper.py +++ b/old_py2/helpers/team_helper.py @@ -17,7 +17,7 @@ class TeamHelper(object): Helper to sort teams and stuff """ @classmethod - def sortTeams(self, team_list): + def sort_teams(self, team_list): """ Takes a list of Teams (not a Query object). """ diff --git a/old_py2/models/notifications/awards.py b/old_py2/models/notifications/awards.py index 75706a2335..09099a464c 100644 --- a/old_py2/models/notifications/awards.py +++ b/old_py2/models/notifications/awards.py @@ -60,8 +60,8 @@ def webhook_message_data(self): from helpers.award_helper import AwardHelper from helpers.model_to_dict import ModelToDict if self.team: - payload['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(self.team_awards)] + payload['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(self.team_awards)] else: - payload['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(self.event.awards)] + payload['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(self.event.awards)] return payload diff --git a/old_py2/notifications/awards_updated.py b/old_py2/notifications/awards_updated.py index 97c0b6637b..206e8ff367 100644 --- a/old_py2/notifications/awards_updated.py +++ b/old_py2/notifications/awards_updated.py @@ -21,5 +21,5 @@ def _build_dict(self): data['message_data'] = {} data['message_data']['event_name'] = self.event.name data['message_data']['event_key'] = self.event.key_name - data['message_data']['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(self.event.awards)] + data['message_data']['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(self.event.awards)] return data diff --git a/old_py2/tests/test_notification_awards.py b/old_py2/tests/test_notification_awards.py index 4124fb0fbc..350c3b213b 100644 --- a/old_py2/tests/test_notification_awards.py +++ b/old_py2/tests/test_notification_awards.py @@ -37,7 +37,7 @@ def test_build(self): expected['message_data'] = {} expected['message_data']['event_name'] = self.event.name expected['message_data']['event_key'] = self.event.key_name - expected['message_data']['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organizeAwards(self.event.awards)] + expected['message_data']['awards'] = [ModelToDict.awardConverter(award) for award in AwardHelper.organize_awards(self.event.awards)] data = self.notification._build_dict() diff --git a/src/backend/common/helpers/award_helper.py b/src/backend/common/helpers/award_helper.py index 856de41a1a..8841bbced9 100644 --- a/src/backend/common/helpers/award_helper.py +++ b/src/backend/common/helpers/award_helper.py @@ -8,7 +8,7 @@ class AwardHelper(object): @classmethod - def organizeAwards(cls, award_list: List[Award]) -> List[Award]: + def organize_awards(cls, award_list: List[Award]) -> List[Award]: """ Sorts awards first by sort_order and then alphabetically by name_str """ diff --git a/src/backend/common/helpers/playoff_advancement_helper.py b/src/backend/common/helpers/playoff_advancement_helper.py index 28414b50a8..864fc11c4d 100644 --- a/src/backend/common/helpers/playoff_advancement_helper.py +++ b/src/backend/common/helpers/playoff_advancement_helper.py @@ -83,11 +83,11 @@ class PlayoffAdvancementHelper(object): } @classmethod - def getPlayoffTemplate(cls, event: Event) -> Optional[str]: + def playoff_template(cls, event: Event) -> Optional[str]: return cls.PLAYOFF_TYPE_TO_TEMPLATE.get(event.playoff_type) @classmethod - def getDoubleElimMatches( + def double_elim_matches( cls, event: Event, matches: TOrganizedMatches ) -> Optional[TOrganizedDoubleElimMatches]: double_elim_matches = None @@ -96,25 +96,25 @@ def getDoubleElimMatches( return double_elim_matches @classmethod - def generatePlayoffAdvancement( + def generate_playoff_advancement( cls, event: Event, matches: TOrganizedMatches ) -> PlayoffAdvancement: - bracket_table = cls._generateBracket(matches, event, event.alliance_selections) + bracket_table = cls._generate_bracket(matches, event, event.alliance_selections) playoff_advancement = None - playoff_template = cls.getPlayoffTemplate(event) - double_elim_matches = cls.getDoubleElimMatches(event, matches) + playoff_template = cls.playoff_template(event) + double_elim_matches = cls.double_elim_matches(event, matches) if event.playoff_type == PlayoffType.AVG_SCORE_8_TEAM: - playoff_advancement = cls.generatePlayoffAdvancement2015( + playoff_advancement = cls.generate_playoff_advancement_2015( matches, event.alliance_selections ) for comp_level in [CompLevel.QF, CompLevel.SF]: if comp_level in bracket_table: del bracket_table[comp_level] elif event.playoff_type == PlayoffType.ROUND_ROBIN_6_TEAM: - playoff_advancement = cls.generatePlayoffAdvancementRoundRobin( + playoff_advancement = cls.generate_playoff_advancement_round_robin( matches, event.year, event.alliance_selections ) comp_levels = list(bracket_table.keys()) @@ -139,10 +139,10 @@ def generatePlayoffAdvancement( """ @classmethod - def generatePlayoffAdvancementFromCSV(cls, event, csv_advancement, comp_level): + def generate_playoff_advancement_from_csv(cls, event, csv_advancement, comp_level): \""" Generate properly formatted advancement info from the output of CSVAdvancementParser - The output will be of the same format as generatePlayoffAdvancementRoundRobin + The output will be of the same format as generate_playoff_advancement_round_robin \""" if event.playoff_type != PlayoffType.ROUND_ROBIN_6_TEAM: return {} @@ -182,7 +182,7 @@ def generatePlayoffAdvancementFromCSV(cls, event, csv_advancement, comp_level): """ @classmethod - def _generateBracket( + def _generate_bracket( cls, matches: TOrganizedMatches, event: Event, @@ -209,7 +209,7 @@ def _generateBracket( alliance = copy.copy(match.alliances[color]["teams"]) bracket_table[comp_level][set_key][ f"{color}_name" - ] = cls._getAllianceName(alliance, alliance_selections) + ] = cls._alliance_name(alliance, alliance_selections) for i, complete_alliance in enumerate( complete_alliances ): # search for alliance. could be more efficient @@ -223,7 +223,7 @@ def _generateBracket( i ] += backups # ensures that backup robots are listed last - for team_num in cls.getOrderedAlliance( + for team_num in cls.ordered_alliance( complete_alliances[i], alliance_selections ): if ( @@ -276,7 +276,7 @@ def _generateBracket( return bracket_table # pyre-ignore[7] @classmethod - def generatePlayoffAdvancement2015( + def generate_playoff_advancement_2015( cls, matches: TOrganizedMatches, alliance_selections: Optional[List[EventAlliance]] = None, @@ -290,7 +290,7 @@ def generatePlayoffAdvancement2015( if not match.has_been_played: continue for color in [AllianceColor.RED, AllianceColor.BLUE]: - alliance = cls.getOrderedAlliance( + alliance = cls.ordered_alliance( match.alliances[color]["teams"], alliance_selections ) alliance_index = None @@ -356,7 +356,7 @@ def generatePlayoffAdvancement2015( return advancement @classmethod - def generatePlayoffAdvancementRoundRobin( + def generate_playoff_advancement_round_robin( cls, matches: TOrganizedMatches, year: Year, @@ -375,11 +375,11 @@ def generatePlayoffAdvancementRoundRobin( if not match.has_been_played: any_unplayed = True for color in [AllianceColor.RED, AllianceColor.BLUE]: - alliance = cls.getOrderedAlliance( + alliance = cls.ordered_alliance( match.alliances[color]["teams"], alliance_selections ) alliance_name: str = ( - cls.getAllianceName( + cls.alliance_name( match.alliances[color]["teams"], alliance_selections ) or "" @@ -574,7 +574,7 @@ def generatePlayoffAdvancementRoundRobin( return cast(PlayoffAdvancementRoundRobinLevels, advancement) @classmethod - def getOrderedAlliance( + def ordered_alliance( cls, team_keys: List[TeamKey], alliance_selections: Optional[List[EventAlliance]], @@ -598,7 +598,7 @@ def getOrderedAlliance( return team_nums @classmethod - def _getAllianceName( + def _alliance_name( cls, team_keys: List[TeamKey], alliance_selections: Optional[List[EventAlliance]], @@ -616,7 +616,7 @@ def _getAllianceName( return None @classmethod - def getAllianceName( + def alliance_name( cls, team_keys: List[TeamKey], alliance_selections: Optional[List[EventAlliance]], @@ -635,7 +635,7 @@ def getAllianceName( """ @classmethod - def transformBracketLevelForApi(cls, event, bracket_table, comp_level): + def transform_bracket_level_for_api(cls, event, bracket_table, comp_level): level_ranks = [] for series_level, set_bracket in bracket_table[comp_level].iteritems(): series = int("".join(c for c in series_level if c.isdigit())) @@ -650,7 +650,7 @@ def transformBracketLevelForApi(cls, event, bracket_table, comp_level): } alliances = [ - cls._makeAllianceRankRow(c, set_bracket) for c in ["red", "blue"] + cls._make_alliance_rank_row(c, set_bracket) for c in ["red", "blue"] ] data["rankings"] = sorted( alliances, key=lambda a: a["record"]["wins"], reverse=True @@ -661,7 +661,7 @@ def transformBracketLevelForApi(cls, event, bracket_table, comp_level): return level_ranks @classmethod - def _makeAllianceRankRow(cls, color, bracket_set): + def _make_alliance_rank_row(cls, color, bracket_set): record = bracket_set["{}_record".format(color)] return { "team_keys": map( @@ -676,7 +676,7 @@ def _makeAllianceRankRow(cls, color, bracket_set): } @classmethod - def transform2015AdvancementLevelForApi( + def transform_2015_advancement_level_for_api( cls, event, playoff_advancement, comp_level ): level_order = Match.COMP_LEVELS_PLAY_ORDER[comp_level] @@ -704,12 +704,12 @@ def transform2015AdvancementLevelForApi( for i, alliance in enumerate(playoff_advancement[comp_level]): rank = i + 1 data["rankings"].append( - cls._make2015AllianceAdvancementRow(event, alliance, rank, comp_level) + cls._make_2015_alliance_advancement_row(event, alliance, rank, comp_level) ) return [data] @classmethod - def transformRoundRobinAdvancementLevelForApi( + def transform_round_robin_advancement_level_for_api( cls, event, playoff_advancement, comp_level ): data = { @@ -733,12 +733,12 @@ def transformRoundRobinAdvancementLevelForApi( for i, alliance in enumerate(playoff_advancement[comp_level]): rank = i + 1 data["rankings"].append( - cls._makeAllianceAdvancementRow(event, alliance, rank) + cls._make_alliance_advancement_row(event, alliance, rank) ) return [data] @classmethod - def _makeAllianceAdvancementRow(cls, event, alliance, rank): + def _make_alliance_advancement_row(cls, event, alliance, rank): record = alliance[8] row = { "team_keys": map(lambda t: "frc{}".format(t), alliance[0]), @@ -753,11 +753,11 @@ def _makeAllianceAdvancementRow(cls, event, alliance, rank): return row @classmethod - def _make2015AllianceAdvancementRow(cls, event, alliance, rank, comp_level): + def _make_2015_alliance_advancement_row(cls, event, alliance, rank, comp_level): team_keys = map(lambda t: "frc{}".format(t), alliance[0]) row = { "team_keys": team_keys, - "alliance_name": cls._getAllianceName(team_keys, event.alliance_selections), + "alliance_name": cls._alliance_name(team_keys, event.alliance_selections), "rank": rank, "matches_played": alliance[3], "sort_orders": [alliance[2]], diff --git a/src/backend/common/helpers/team_helper.py b/src/backend/common/helpers/team_helper.py index 667e8a8ce3..28b9c31ed0 100644 --- a/src/backend/common/helpers/team_helper.py +++ b/src/backend/common/helpers/team_helper.py @@ -5,7 +5,7 @@ class TeamHelper(object): @classmethod - def sortTeams(cls, team_list: List[Union[Team, None]]) -> List[Team]: + def sort_teams(cls, team_list: List[Union[Team, None]]) -> List[Team]: """ Takes a list of Teams (not a Query object). """ diff --git a/src/backend/common/helpers/tests/award_helper_test.py b/src/backend/common/helpers/tests/award_helper_test.py index 697b9fc1b6..e6a07babda 100644 --- a/src/backend/common/helpers/tests/award_helper_test.py +++ b/src/backend/common/helpers/tests/award_helper_test.py @@ -20,7 +20,7 @@ def test_organize_awards() -> None: award_type_enum=AwardType.WINNER, name_str="Winner", ) - assert AwardHelper.organizeAwards([a1, a2, a3]) == [a2, a3, a1] + assert AwardHelper.organize_awards([a1, a2, a3]) == [a2, a3, a1] @pytest.mark.parametrize( diff --git a/src/backend/common/helpers/tests/playoff_advancement_helper_test.py b/src/backend/common/helpers/tests/playoff_advancement_helper_test.py index 4ca74dc1ec..d70881d447 100644 --- a/src/backend/common/helpers/tests/playoff_advancement_helper_test.py +++ b/src/backend/common/helpers/tests/playoff_advancement_helper_test.py @@ -38,7 +38,7 @@ def test_standard_bracket(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) with open( @@ -59,7 +59,7 @@ def test_2015_event(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) with open( @@ -80,7 +80,7 @@ def test_round_robin_2018(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) @@ -102,7 +102,7 @@ def test_round_robin_2019(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) @@ -121,7 +121,7 @@ def test_best_of_3_finals(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) assert advancement.bracket_table is not None @@ -137,7 +137,7 @@ def test_best_of_5_finals(test_data_importer) -> None: ) organized_matches = MatchHelper.organized_matches(matches)[1] - advancement = PlayoffAdvancementHelper.generatePlayoffAdvancement( + advancement = PlayoffAdvancementHelper.generate_playoff_advancement( event, organized_matches ) assert advancement.bracket_table is not None diff --git a/src/backend/common/models/event.py b/src/backend/common/models/event.py index 090f32e8e7..bdec5ba34a 100644 --- a/src/backend/common/models/event.py +++ b/src/backend/common/models/event.py @@ -406,7 +406,7 @@ def teams(self) -> List["Team"]: return none_throws(self._teams) @ndb.toplevel - def prepAwardsMatchesTeams( + def prep_awards_matches_teams( self, ) -> Generator[ Tuple[ diff --git a/src/backend/common/models/event_details.py b/src/backend/common/models/event_details.py index 6e959143ab..c3477012a1 100644 --- a/src/backend/common/models/event_details.py +++ b/src/backend/common/models/event_details.py @@ -47,7 +47,7 @@ class EventDetails(CachedModel): rankings = ndb.JsonProperty() # deprecated rankings2: List[EventRanking] = ndb.JsonProperty() - # Based on the output of PlayoffAdvancementHelper.generatePlayoffAdvancement + # Based on the output of PlayoffAdvancementHelper.generate_playoff_advancement # Dict with keys for: bracket, playoff_advancement playoff_advancement = ndb.JsonProperty() diff --git a/src/backend/web/handlers/district.py b/src/backend/web/handlers/district.py index c737342444..16c6614988 100644 --- a/src/backend/web/handlers/district.py +++ b/src/backend/web/handlers/district.py @@ -72,7 +72,7 @@ def district_detail( valid_districts.append((dist.display_name, dist.abbreviation)) valid_districts = sorted(valid_districts, key=itemgetter(0)) - teams = TeamHelper.sortTeams(district_teams_future.get_result()) + teams = TeamHelper.sort_teams(district_teams_future.get_result()) team_keys = set([t.key.id() for t in teams]) num_teams = len(teams) diff --git a/src/backend/web/handlers/event.py b/src/backend/web/handlers/event.py index 6fbb8d0a9e..fb78b61252 100644 --- a/src/backend/web/handlers/event.py +++ b/src/backend/web/handlers/event.py @@ -81,7 +81,7 @@ def event_detail(event_key: EventKey) -> Response: abort(404) event = none_throws(event) # for pyre - event.prepAwardsMatchesTeams() + event.prep_awards_matches_teams() event.prep_details() medias_future = media_query.EventTeamsPreferredMediasQuery(event_key).fetch_async() district_future = ( @@ -105,11 +105,11 @@ def event_detail(event_key: EventKey) -> Response: none_throws(none_throws(event.parent_event).string_id()) ).fetch_async() - awards = AwardHelper.organizeAwards(event.awards) + awards = AwardHelper.organize_awards(event.awards) cleaned_matches = event.matches # MatchHelper.delete_invalid_matches(event.matches, event) match_count, matches = MatchHelper.organized_matches(cleaned_matches) - teams = TeamHelper.sortTeams(event.teams) + teams = TeamHelper.sort_teams(event.teams) # Organize medias by team image_medias = MediaHelper.get_images( @@ -146,8 +146,8 @@ def event_detail(event_key: EventKey) -> Response: bracket_table = event.playoff_bracket playoff_advancement = event.playoff_advancement - double_elim_matches = PlayoffAdvancementHelper.getDoubleElimMatches(event, matches) - playoff_template = PlayoffAdvancementHelper.getPlayoffTemplate(event) + double_elim_matches = PlayoffAdvancementHelper.double_elim_matches(event, matches) + playoff_template = PlayoffAdvancementHelper.playoff_template(event) # Lazy handle the case when we haven't backfilled the event details if not bracket_table or not playoff_advancement: @@ -156,7 +156,7 @@ def event_detail(event_key: EventKey) -> Response: playoff_advancement2, _, _, - ) = PlayoffAdvancementHelper.generatePlayoffAdvancement(event, matches) + ) = PlayoffAdvancementHelper.generate_playoff_advancement(event, matches) bracket_table = bracket_table or bracket_table2 playoff_advancement = playoff_advancement or playoff_advancement2 diff --git a/src/backend/web/renderers/team_renderer.py b/src/backend/web/renderers/team_renderer.py index 9e1295a836..032b3435a9 100644 --- a/src/backend/web/renderers/team_renderer.py +++ b/src/backend/web/renderers/team_renderer.py @@ -117,7 +117,7 @@ def render_team_details( matches_upcoming = None for event in events_sorted: event_matches = matches_by_event_key.get(event.key, []) - event_awards = AwardHelper.organizeAwards( + event_awards = AwardHelper.organize_awards( awards_by_event_key.get(event.key, []) ) match_count, matches_organized = MatchHelper.organized_matches( @@ -370,7 +370,7 @@ def render_team_history(cls, team: Team, is_canonical: bool) -> Dict: """ if event.key_name in awards_by_event: - sorted_awards = AwardHelper.organizeAwards( + sorted_awards = AwardHelper.organize_awards( awards_by_event[event.key_name] ) else: