Merge pull request #85 from ProgrammingLab/gedorinku/fix_update_profile

プロフィールの更新でrole_idがnullになるのを修正

Author: gedorinku

app/server/server_test.go

@@ -41,7 +41,7 @@ func CreateTestUsers(ctx context.Context, s di.StoreComponent) ([]*record.User,
 			ProfileScope: null.IntFrom(int(scope)),
 		}
 
-		err := ps.CreateOrUpdateProfile(model.UserID(u.ID), p)
+		err := ps.CreateOrUpdateProfile(model.UserID(u.ID), p, true)
 		if err != nil {
 			return nil, err
 		}

app/server/users_server.go

@@ -151,7 +151,7 @@ func (s *userServiceServerImpl) UpdateUserRole(ctx context.Context, req *api_pb.
 	}
 
 	ps := s.ProfileStore(ctx)
-	err = ps.CreateOrUpdateProfile(model.UserID(u.ID), p)
+	err = ps.CreateOrUpdateProfile(model.UserID(u.ID), p, true)
 	if err != nil {
 		return nil, err
 	}
@@ -254,18 +254,13 @@ func (s *userServiceServerImpl) UpdateUserProfile(ctx context.Context, req *api_
 		AtcoderUserName:   null.StringFrom(req.GetAtcoderUserName()),
 		DisplayName:       null.StringFrom(req.GetDisplayName()),
 	}
-	if id := req.GetRoleId(); id == 0 {
-		p.RoleID = null.NewInt64(0, false)
-	} else {
-		p.RoleID = null.Int64From(int64(id))
-	}
 	if id := req.GetDepartmentId(); id == 0 {
 		p.DepartmentID = null.NewInt64(0, false)
 	} else {
 		p.DepartmentID = null.Int64From(int64(id))
 	}
 
-	err = ps.CreateOrUpdateProfile(model.UserID(u.ID), p)
+	err = ps.CreateOrUpdateProfile(model.UserID(u.ID), p, false)
 	if err != nil {
 		return nil, err
 	}

infra/store/profile/profile_store.go

@@ -27,7 +27,7 @@ func NewProfileStore(ctx context.Context, db *sqlutil.DB) store.ProfileStore {
 	}
 }
 
-func (s *profileStoreImpl) CreateOrUpdateProfile(userID model.UserID, profile *record.Profile) error {
+func (s *profileStoreImpl) CreateOrUpdateProfile(userID model.UserID, profile *record.Profile, updateRole bool) error {
 	err := s.db.Watch(s.ctx, func(ctx context.Context, tx *sql.Tx) error {
 		if profile.ID == 0 {
 			err := profile.Insert(s.ctx, tx, boil.Infer())
@@ -43,7 +43,12 @@ func (s *profileStoreImpl) CreateOrUpdateProfile(userID model.UserID, profile *r
 				return errors.WithStack(err)
 			}
 		} else {
-			_, err := profile.Update(s.ctx, tx, boil.Infer())
+			cols := []string{"updated_at", "description", "grade", "left", "department_id", "twitter_screen_name", "github_user_name", "profile_scope", "display_name", "atcoder_user_name"}
+			if updateRole {
+				cols = append(cols, "role_id")
+			}
+			li := boil.Whitelist(cols...)
+			_, err := profile.Update(s.ctx, tx, li)
 			if err != nil {
 				return errors.WithStack(err)
 			}

infra/store/profile_store.go

@@ -7,5 +7,5 @@ import (
 
 // ProfileStore accesses profiles data
 type ProfileStore interface {
-	CreateOrUpdateProfile(userID model.UserID, profile *record.Profile) error
+	CreateOrUpdateProfile(userID model.UserID, profile *record.Profile, updateRole bool) error
 }