Add ListPrivateUsers

Author: gedorinku

api/contribution_conllections.validator.pb.go

@@ -18,6 +18,11 @@ service UserService {
       get: "/users"
     };
   }
+  rpc ListPrivateUsers (ListUsersRequest) returns (ListUsersResponse) {
+    option (google.api.http) = {
+      get: "/private/users"
+    };
+  }
   rpc GetUser (GetUserRequest) returns (User) {
     option (google.api.http) = {
       get: "/users/{user_name}"
@@ -77,6 +82,7 @@ enum ProfileScope {
 message ListUsersRequest {
   uint32 page_token = 1;
   int32 page_size = 2;
+  bool include_private_users = 3;
 }
 
 message ListUsersResponse {

api/entries.validator.pb.go

@@ -15,6 +15,45 @@
     "application/json"
   ],
   "paths": {
+    "/private/users": {
+      "get": {
+        "operationId": "ListPrivateUsers",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/prolab_accountsListUsersResponse"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "page_token",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int64"
+          },
+          {
+            "name": "page_size",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int32"
+          },
+          {
+            "name": "include_private_users",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "format": "boolean"
+          }
+        ],
+        "tags": [
+          "UserService"
+        ]
+      }
+    },
     "/user": {
       "get": {
         "operationId": "GetCurrentUser",
@@ -124,6 +163,13 @@
             "required": false,
             "type": "integer",
             "format": "int32"
+          },
+          {
+            "name": "include_private_users",
+            "in": "query",
+            "required": false,
+            "type": "boolean",
+            "format": "boolean"
           }
         ],
         "tags": [

api/invitations.validator.pb.go

@@ -60,6 +60,19 @@ var (
 )
 
 func (s *userServiceServerImpl) ListPublicUsers(ctx context.Context, req *api_pb.ListUsersRequest) (*api_pb.ListUsersResponse, error) {
+	return s.listUsers(ctx, req, false)
+}
+
+func (s *userServiceServerImpl) ListPrivateUsers(ctx context.Context, req *api_pb.ListUsersRequest) (*api_pb.ListUsersResponse, error) {
+	_, ok := interceptor.GetCurrentUserID(ctx)
+	if !ok {
+		return nil, util.ErrUnauthenticated
+	}
+
+	return s.listUsers(ctx, req, true)
+}
+
+func (s *userServiceServerImpl) listUsers(ctx context.Context, req *api_pb.ListUsersRequest, includePrivateUsers bool) (*api_pb.ListUsersResponse, error) {
 	size := req.GetPageSize()
 	if size < 0 || 100 < size {
 		return nil, ErrPageSizeOutOfRange
@@ -69,7 +82,16 @@ func (s *userServiceServerImpl) ListPublicUsers(ctx context.Context, req *api_pb
 	}
 
 	us := s.UserStore(ctx)
-	u, next, err := us.ListPublicUsers(model.UserID(req.GetPageToken()), int(size))
+	var (
+		u    []*record.User
+		next model.UserID
+		err  error
+	)
+	if includePrivateUsers {
+		u, next, err = us.ListPrivateUsers(model.UserID(req.GetPageToken()), int(size))
+	} else {
+		u, next, err = us.ListPublicUsers(model.UserID(req.GetPageToken()), int(size))
+	}
 	if err != nil {
 		return nil, err
 	}

api/protos/users.proto

@@ -105,7 +105,7 @@ func (s *userStoreImpl) ListPublicUsers(minUserID model.UserID, limit int) ([]*r
 	mods := []qm.QueryMod{
 		qm.Load("Profile.Role"),
 		qm.Load("Profile.Department"),
-		qm.Select("profiles.*", s.selectQuery(model.Public)),
+		qm.Select("profiles.*"),
 		qm.InnerJoin("profiles on profiles.id = users.profile_id"),
 		qm.Where("? <= users.id", minUserID),
 		qm.Where("profiles.profile_scope = ?", model.Public),
@@ -124,6 +124,26 @@ func (s *userStoreImpl) ListPublicUsers(minUserID model.UserID, limit int) ([]*r
 	return u[:limit], model.UserID(u[limit].ID), nil
 }
 
+func (s *userStoreImpl) ListPrivateUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error) {
+	mods := []qm.QueryMod{
+		qm.Load("Profile.Role"),
+		qm.Load("Profile.Department"),
+		qm.Where("? <= users.id", minUserID),
+		qm.Limit(limit + 1),
+		qm.OrderBy("users.id"),
+	}
+
+	u, err := record.Users(mods...).All(s.ctx, s.db)
+	if err != nil {
+		return nil, 0, errors.WithStack(err)
+	}
+
+	if len(u) <= limit {
+		return u, 0, nil
+	}
+	return u[:limit], model.UserID(u[limit].ID), nil
+}
+
 func (s *userStoreImpl) UpdateFullName(userID model.UserID, fullName string) (*record.User, error) {
 	var u *record.User
 	err := s.db.Watch(s.ctx, func(ctx context.Context, tx *sql.Tx) error {

api/users.pb.go

@@ -13,6 +13,7 @@ type UserStore interface {
 	GetUserByEmail(email string) (*record.User, error)
 	GetUserWithPrivate(userID model.UserID) (*record.User, error)
 	ListPublicUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error)
+	ListPrivateUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error)
 	UpdateFullName(userID model.UserID, fullName string) (*record.User, error)
 	UpdateIcon(userID model.UserID, icon []byte) (*record.User, error)
 }