De-Java some helpers (#3387)

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)

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,

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)
 
 

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)
 

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:

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)

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)

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
 

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))

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:

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]

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).
         """

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

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

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()
 

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
         """