Merge pull request #57 from gedorinku/improve_profile

プロフィールの項目の追加

Author: gedorinku

api/contribution_conllections.swagger.json

@@ -163,6 +163,12 @@
         },
         "profile_scope": {
           "$ref": "#/definitions/prolab_accountsProfileScope"
+        },
+        "atcoder_user_name": {
+          "type": "string"
+        },
+        "display_name": {
+          "type": "string"
         }
       }
     }

api/entries.swagger.json

@@ -196,6 +196,12 @@
         },
         "profile_scope": {
           "$ref": "#/definitions/prolab_accountsProfileScope"
+        },
+        "atcoder_user_name": {
+          "type": "string"
+        },
+        "display_name": {
+          "type": "string"
         }
       }
     }

api/protos/users.proto

@@ -78,6 +78,8 @@ message User {
   string github_user_name = 13;
   Department department = 14;
   ProfileScope profile_scope = 15;
+  string atcoder_user_name = 16;
+  string display_name = 17;
 }
 
 enum ProfileScope {
@@ -124,6 +126,8 @@ message UpdateUserProfileRequest {
   string github_user_name = 7 [(validator.field) = {regex: "^([a-z\\d]+-)*[a-z\\d]+$", length_lt: 40}];
   uint32 department_id = 8;
   ProfileScope profile_scope = 9 [(validator.field) = {is_in_enum : true}];
+  string atcoder_user_name = 10 [(validator.field) = {regex: "^[a-zA-Z][a-zA-Z0-9_]{2,15}$"}];
+  string display_name = 11 [(validator.field) = {length_lt: 51}];
 }
 
 message UpdateUserIconRequest {

api/roles.validator.pb.go

@@ -380,6 +380,12 @@
         },
         "profile_scope": {
           "$ref": "#/definitions/prolab_accountsProfileScope"
+        },
+        "atcoder_user_name": {
+          "type": "string"
+        },
+        "display_name": {
+          "type": "string"
         }
       }
     },
@@ -427,6 +433,12 @@
         },
         "profile_scope": {
           "$ref": "#/definitions/prolab_accountsProfileScope"
+        },
+        "atcoder_user_name": {
+          "type": "string"
+        },
+        "display_name": {
+          "type": "string"
         }
       }
     },

api/users.pb.go

@@ -248,6 +248,8 @@ func (s *userServiceServerImpl) UpdateUserProfile(ctx context.Context, req *api_
 		TwitterScreenName: null.StringFrom(req.GetTwitterScreenName()),
 		GithubUserName:    null.StringFrom(req.GetGithubUserName()),
 		ProfileScope:      null.IntFrom(int(req.GetProfileScope())),
+		AtcoderUserName:   null.StringFrom(req.GetAtcoderUserName()),
+		DisplayName:       null.StringFrom(req.GetDisplayName()),
 	}
 	if id := req.GetRoleId(); id == 0 {
 		p.RoleID = null.NewInt64(0, false)
@@ -333,6 +335,8 @@ func userToResponse(user *record.User, includePrivate bool, cfg *config.Config)
 		u.TwitterScreenName = p.TwitterScreenName.String
 		u.GithubUserName = p.GithubUserName.String
 		u.ProfileScope = profileScopeToResponse(model.ProfileScope(p.ProfileScope.Int))
+		u.AtcoderUserName = p.AtcoderUserName.String
+		u.DisplayName = p.DisplayName.String
 
 		if r := p.R; p.R != nil {
 			if role := r.Role; role != nil {

api/users.swagger.json

@@ -1,12 +1,14 @@
 create_table :profiles, force: :cascade do |t|
   t.timestamps
+  t.string :display_name
   t.text :description, null: false
   t.integer :grade, null: false
   t.boolean :left, default: false, null: false
   t.references :department, foreign_key: true
   t.references :role, foreign_key: true
   t.string :twitter_screen_name
   t.string :github_user_name
+  t.string :atcoder_user_name
   t.integer :profile_scope, defualt: 0
 end