feat: add GET /teams

pathwar · Apr 25, 2019 · af5c583 · af5c583
1 parent b0e7f90
commit af5c583
Show file tree

Hide file tree

Showing 9 changed files with 495 additions and 202 deletions.
diff --git a/entity/entity.pb.go b/entity/entity.pb.go
diff --git a/entity/entity.proto b/entity/entity.proto
@@ -172,6 +172,8 @@ message Team {
   repeated TeamMember members = 202 [(gogoproto.moretags) = "gorm:\"PRELOAD:false\""];
 }
 
+message TeamList { repeated Team items = 1; }
+
 message Level {
   Metadata metadata = 1 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
 

diff --git a/server/api.pub.teams.go b/server/api.pub.teams.go
@@ -0,0 +1,17 @@
+package server
+
+import (
+	"context"
+
+	"pathwar.pw/entity"
+)
+
+func (s *svc) Teams(ctx context.Context, _ *Void) (*entity.TeamList, error) {
+	var teams entity.TeamList
+	if err := s.db.Set("gorm:auto_preload", true).Find(&teams.Items).Error; err != nil {
+		return nil, err
+	}
+
+	// FIXME: filter-out
+	return &teams, nil
+}
diff --git a/server/api.pub.tournaments.go b/server/api.pub.tournaments.go
@@ -8,7 +8,7 @@ import (
 
 func (s *svc) Tournaments(ctx context.Context, _ *Void) (*entity.TournamentList, error) {
 	var tournaments entity.TournamentList
-	if err := s.db.Find(&tournaments.Items).Error; err != nil {
+	if err := s.db.Set("gorm:auto_preload", true).Find(&tournaments.Items).Error; err != nil {
 		return nil, err
 	}
 

diff --git a/server/api.pub.users.go b/server/api.pub.users.go
@@ -8,7 +8,7 @@ import (
 
 func (s *svc) Users(ctx context.Context, _ *Void) (*entity.UserList, error) {
 	var users entity.UserList
-	if err := s.db.Find(&users.Items).Error; err != nil {
+	if err := s.db.Set("gorm:auto_preload", true).Find(&users.Items).Error; err != nil {
 		return nil, err
 	}
 

diff --git a/server/server.pb.go b/server/server.pb.go
diff --git a/server/server.pb.gw.go b/server/server.pb.gw.go
diff --git a/server/server.proto b/server/server.proto
@@ -49,6 +49,12 @@ service Server {
     // FIXME: pagination & filters
   };
 
+  // List teams
+  rpc Teams(Void) returns (pathwar.entity.TeamList) {
+    option (google.api.http) = {get: "/teams"};
+    // FIXME: pagination & filters
+  };
+
   //
   // dev stuff (should be disabled in production)
   //

diff --git a/server/server.swagger.json b/server/server.swagger.json
@@ -91,6 +91,23 @@
         ]
       }
     },
+    "/teams": {
+      "get": {
+        "summary": "List teams",
+        "operationId": "Teams",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/entityTeamList"
+            }
+          }
+        },
+        "tags": [
+          "Server"
+        ]
+      }
+    },
     "/tournaments": {
       "get": {
         "summary": "List tournaments",
@@ -799,6 +816,17 @@
         }
       }
     },
+    "entityTeamList": {
+      "type": "object",
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/entityTeam"
+          }
+        }
+      }
+    },
     "entityTeamMember": {
       "type": "object",
       "properties": {