diff options
| author |  momothereal <[email protected]> | 2018-06-23 17:48:43 -0400 |
|---|---|---|
| committer | momothereal <[email protected]> | 2018-06-23 17:48:43 -0400 |
| commit | 6ce048d6b3c5518ada39022b164c4aec41c7f5c9 (patch) | |
| tree | a5230460f720f5536f0c4ee8dacab82a8a105f56 /pysite/views | |
| parent | [API] Check for DB-nuking empty data in users POST (diff) | |
[Jams/Teams] Simplify getting the code jam for a team (team -> jam)
Diffstat (limited to 'pysite/views')
| -rw-r--r-- | pysite/views/main/jams/team_edit_repo.py | 5 | ||||
| -rw-r--r-- | pysite/views/main/jams/team_view.py | 5 | ||||
| -rw-r--r-- | pysite/views/main/jams/user_team_list.py | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/pysite/views/main/jams/team_edit_repo.py b/pysite/views/main/jams/team_edit_repo.py index 03f23f17..03e752bc 100644 --- a/pysite/views/main/jams/team_edit_repo.py +++ b/pysite/views/main/jams/team_edit_repo.py @@ -33,10 +33,7 @@ class JamsTeamEditRepo(APIView, DBMixin, OAuthMixin): try: query = self.db.query(self.table_name).get(team_id).merge( lambda team: { - "jam": - self.db.query("code_jams").filter( - lambda jam: jam["teams"].contains(team["id"]) - ).coerce_to("array")[0] + "jam": self.db.query("code_jams").get(team["jam"]) } ) diff --git a/pysite/views/main/jams/team_view.py b/pysite/views/main/jams/team_view.py index 2d99828c..68308934 100644 --- a/pysite/views/main/jams/team_view.py +++ b/pysite/views/main/jams/team_view.py @@ -29,10 +29,7 @@ class JamsTeamView(RouteView, DBMixin, OAuthMixin): ).coerce_to("array")[0]["gitlab_username"] } ).coerce_to("array"), - "jam": - self.db.query("code_jams").filter( - lambda jam: jam["teams"].contains(team["id"]) - ).coerce_to("array")[0] + "jam": self.db.query("code_jams").get(team["jam"]) } ) diff --git a/pysite/views/main/jams/user_team_list.py b/pysite/views/main/jams/user_team_list.py index 272c0a74..226cc4b0 100644 --- a/pysite/views/main/jams/user_team_list.py +++ b/pysite/views/main/jams/user_team_list.py @@ -25,10 +25,7 @@ class JamsUserTeamListView(RouteView, DBMixin, OAuthMixin): self.db.query("code_jam_participants").filter({"id": user["user_id"]}) .coerce_to("array")[0]["gitlab_username"] }).coerce_to("array"), - "jam": - self.db.query("code_jams").filter( - lambda jam: jam["teams"].contains(team["id"]) - ).coerce_to("array")[0] + "jam": self.db.query("code_jams").get(team["jam"]) } ).order_by(rethinkdb.desc("jam.number")) teams = self.db.run(query) |