From 696c34daba34973b8fc0b64689efb6fd05b6ead1 Mon Sep 17 00:00:00 2001
From: momothereal <momothereal.mc@gmail.com>
Date: Fri, 22 Jun 2018 22:37:27 -0400
Subject: Updated team lists, jam team list, added buttons to team view

---
 pysite/views/main/jams/jam_team_list.py  | 50 ++++++++++++++++++++++++++++++++
 pysite/views/main/jams/teams_list.py     | 39 -------------------------
 pysite/views/main/jams/user_team_list.py | 40 +++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 39 deletions(-)
 create mode 100644 pysite/views/main/jams/jam_team_list.py
 delete mode 100644 pysite/views/main/jams/teams_list.py
 create mode 100644 pysite/views/main/jams/user_team_list.py

(limited to 'pysite')

diff --git a/pysite/views/main/jams/jam_team_list.py b/pysite/views/main/jams/jam_team_list.py
new file mode 100644
index 00000000..474c8f77
--- /dev/null
+++ b/pysite/views/main/jams/jam_team_list.py
@@ -0,0 +1,50 @@
+import logging
+
+from rethinkdb import ReqlNonExistenceError
+from werkzeug.exceptions import NotFound
+
+from pysite.base_route import RouteView
+from pysite.mixins import DBMixin, OAuthMixin
+
+log = logging.getLogger(__name__)
+
+
+class JamsUserTeamListView(RouteView, DBMixin, OAuthMixin):
+    path = "/jams/teams/<int:jam_id>"
+    name = "jams.jam_team_list"
+
+    table_name = "code_jam_teams"
+    jams_table = "code_jams"
+
+    def get(self, jam_id):
+        try:
+            query = self.db.query(self.jams_table).get(jam_id).merge(
+                lambda jam_obj: {
+                    "teams":
+                        self.db.query(self.table_name)
+                            .filter(lambda team_row: jam_obj["teams"].contains(team_row["id"]))
+                            .pluck(["id", "name", "members"])
+                            .merge(
+                            lambda team: {
+                                "members":
+                                    self.db.query("users")
+                                        .filter(lambda user: team["members"].contains(user["user_id"]))
+                                        .coerce_to("array")
+                            }).coerce_to("array")
+                }
+            )
+
+            jam_data = self.db.run(query)
+        except ReqlNonExistenceError:
+            log.exception("Failed RethinkDB query")
+            raise NotFound()
+
+        return self.render(
+            "main/jams/team_list.html",
+            jam=jam_data,
+            teams=jam_data["teams"],
+            member_ids=self.member_ids
+        )
+
+    def member_ids(self, members):
+        return [member["user_id"] for member in members]
diff --git a/pysite/views/main/jams/teams_list.py b/pysite/views/main/jams/teams_list.py
deleted file mode 100644
index 46ac081d..00000000
--- a/pysite/views/main/jams/teams_list.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import rethinkdb
-
-from pysite.base_route import RouteView
-from pysite.mixins import DBMixin, OAuthMixin
-
-
-class JamsTeamsListView(RouteView, DBMixin, OAuthMixin):
-    path = "/jams/teams"
-    name = "jams.teams_list"
-
-    def get(self):
-        # list teams a user is (or was) a part of
-        if not self.user_data:
-            return self.redirect_login()
-
-        query = self.db.query("code_jam_teams").filter(
-            lambda team: team["members"].contains(self.user_data["user_id"])
-        ).merge(
-            lambda team: {
-                "members":
-                    self.db.query("users")
-                        .filter(lambda user: team["members"].contains(user["user_id"]))
-                        .merge(lambda user: {
-                            "gitlab_username":
-                                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]
-            }
-        ).order_by(rethinkdb.desc("jam.number"))
-        teams = self.db.run(query)
-
-        return self.render(
-            "main/jams/teams_list.html",
-            teams=teams
-        )
diff --git a/pysite/views/main/jams/user_team_list.py b/pysite/views/main/jams/user_team_list.py
new file mode 100644
index 00000000..272c0a74
--- /dev/null
+++ b/pysite/views/main/jams/user_team_list.py
@@ -0,0 +1,40 @@
+import rethinkdb
+
+from pysite.base_route import RouteView
+from pysite.mixins import DBMixin, OAuthMixin
+
+
+class JamsUserTeamListView(RouteView, DBMixin, OAuthMixin):
+    path = "/jams/my_teams"
+    name = "jams.user_team_list"
+
+    def get(self):
+        # list teams a user is (or was) a part of
+        if not self.user_data:
+            return self.redirect_login()
+
+        query = self.db.query("code_jam_teams").filter(
+            lambda team: team["members"].contains(self.user_data["user_id"])
+        ).merge(
+            lambda team: {
+                "members":
+                    self.db.query("users")
+                        .filter(lambda user: team["members"].contains(user["user_id"]))
+                        .merge(lambda user: {
+                            "gitlab_username":
+                                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]
+            }
+        ).order_by(rethinkdb.desc("jam.number"))
+        teams = self.db.run(query)
+
+        return self.render(
+            "main/jams/team_list.html",
+            user_teams=True,
+            teams=teams
+        )
-- 
cgit v1.2.3