Merge pull request #84 from ProgrammingLab/gedorinku/forward_match_users

ユーザーの前方一致検索

Author: gedorinku

api/achievements.validator.pb.go

@@ -91,7 +91,8 @@ enum Authority {
 message ListUsersRequest {
   uint32 page_token = 1;
   int32 page_size = 2;
-  bool include_private_users = 3;
+  reserved 3;
+  string query = 4 [(validator.field) = {length_lt: 128}];
 }
 
 message ListUsersResponse {

api/entries.validator.pb.go

@@ -74,11 +74,10 @@
             "format": "int32"
           },
           {
-            "name": "include_private_users",
+            "name": "query",
             "in": "query",
             "required": false,
-            "type": "boolean",
-            "format": "boolean"
+            "type": "string"
           }
         ],
         "tags": [
@@ -181,11 +180,10 @@
             "format": "int32"
           },
           {
-            "name": "include_private_users",
+            "name": "query",
             "in": "query",
             "required": false,
-            "type": "boolean",
-            "format": "boolean"
+            "type": "string"
           }
         ],
         "tags": [

api/protos/users.proto

@@ -48,7 +48,7 @@ func githubJob(ctx context.Context, store di.StoreComponent, cfg *config.Config)
 	to := time.Now().UTC()
 	from := to.AddDate(0, 0, -contributionsFromDay).Round(time.Hour * 24)
 	for next != 0 {
-		users, nxt, err := us.ListPublicUsers(next, 100)
+		users, nxt, err := us.ListPublicUsers("", next, 100)
 		next = nxt
 		if err != nil {
 			return err

api/roles.validator.pb.go

@@ -91,9 +91,9 @@ func (s *userServiceServerImpl) listUsers(ctx context.Context, req *api_pb.ListU
 		err  error
 	)
 	if includePrivateUsers {
-		u, next, err = us.ListPrivateUsers(model.UserID(req.GetPageToken()), int(size))
+		u, next, err = us.ListPrivateUsers(req.GetQuery(), model.UserID(req.GetPageToken()), int(size))
 	} else {
-		u, next, err = us.ListPublicUsers(model.UserID(req.GetPageToken()), int(size))
+		u, next, err = us.ListPublicUsers(req.GetQuery(), model.UserID(req.GetPageToken()), int(size))
 	}
 	if err != nil {
 		return nil, err

api/users.pb.go

@@ -95,7 +95,7 @@ func (s *userStoreImpl) GetUserWithPrivate(userID model.UserID) (*record.User, e
 	return u, nil
 }
 
-func (s *userStoreImpl) ListPublicUsers(minUserID model.UserID, limit int) ([]*record.User, model.UserID, error) {
+func (s *userStoreImpl) ListPublicUsers(subName string, minUserID model.UserID, limit int) ([]*record.User, model.UserID, error) {
 	mods := []qm.QueryMod{
 		qm.Load("Profile.Role"),
 		qm.Load("Profile.Department"),
@@ -105,6 +105,7 @@ func (s *userStoreImpl) ListPublicUsers(minUserID model.UserID, limit int) ([]*r
 		qm.Limit(limit + 1),
 		qm.OrderBy("users.id"),
 	}
+	mods = append(mods, s.subNameQuery(subName)...)
 
 	u, err := record.Users(mods...).All(s.ctx, s.db)
 	if err != nil {
@@ -117,14 +118,15 @@ 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) {
+func (s *userStoreImpl) ListPrivateUsers(subName string, 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"),
 	}
+	mods = append(mods, s.subNameQuery(subName)...)
 
 	u, err := record.Users(mods...).All(s.ctx, s.db)
 	if err != nil {
@@ -203,3 +205,12 @@ func (s *userStoreImpl) selectQuery(scope model.ProfileScope) string {
 	}
 	return q
 }
+
+func (s *userStoreImpl) subNameQuery(subName string) []qm.QueryMod {
+	if len(subName) == 0 {
+		return nil
+	}
+	return []qm.QueryMod{
+		qm.Where("users.name LIKE ? || '%'", subName),
+	}
+}