Merge pull request #1145 from traPtitech/fix/add_admins_nilpointer

admin追加時のぬるぽ修正

Author: ikura-hamu

src/service/v2/admin_auth.go

@@ -40,7 +40,8 @@ func (aa *AdminAuth) AddAdmin(ctx context.Context, session *domain.OIDCSession,
 		for _, activeUser := range activeUsers {
 			activeUsersMap[activeUser.GetID()] = activeUser
 		}
-		if _, ok := activeUsersMap[userID]; !ok {
+		newAdminInfo, ok := activeUsersMap[userID]
+		if !ok {
 			return service.ErrInvalidUserID
 		}
 
@@ -62,11 +63,13 @@ func (aa *AdminAuth) AddAdmin(ctx context.Context, session *domain.OIDCSession,
 
 		adminInfos = make([]*service.UserInfo, 0, len(adminIDs)+1)
 		for _, adminID := range adminIDs {
-			if activeUsersMap[adminID].GetStatus() == values.TrapMemberStatusActive {
-				adminInfos = append(adminInfos, activeUsersMap[adminID])
+			activeAdmin, ok := activeUsersMap[adminID]
+			if !ok {
+				continue
 			}
+			adminInfos = append(adminInfos, activeAdmin)
 		}
-		adminInfos = append(adminInfos, activeUsersMap[userID])
+		adminInfos = append(adminInfos, newAdminInfo)
 		return nil
 	})
 

src/service/v2/admin_auth_test.go

@@ -54,6 +54,7 @@ func TestAddAdmin(t *testing.T) {
 	userID1 := values.NewTrapMemberID(uuid.New())
 	userID2 := values.NewTrapMemberID(uuid.New())
 	userID3 := values.NewTrapMemberID(uuid.New())
+	userID4 := values.NewTrapMemberID(uuid.New()) // 凍結済みユーザー
 
 	userInfo1 := service.NewUserInfo(userID1, "ikura-hamu", values.TrapMemberStatusActive)
 	userInfo2 := service.NewUserInfo(userID2, "mazrean", values.TrapMemberStatusActive)
@@ -74,6 +75,18 @@ func TestAddAdmin(t *testing.T) {
 			executeAddAdmin:  true,
 			expectedAdmins:   []*service.UserInfo{userInfo2, userInfo1},
 		},
+		{
+			description: "GetAdminsの結果に凍結済みユーザーがいてもエラー無し",
+			authSession: domain.NewOIDCSession(
+				"access token",
+				time.Now().Add(time.Hour),
+			),
+			userID:           userID1,
+			executeGetAdmins: true,
+			beforeAdmins:     []values.TraPMemberID{userID2, userID4},
+			executeAddAdmin:  true,
+			expectedAdmins:   []*service.UserInfo{userInfo2, userInfo1},
+		},
 		{
 			description: "全ユーザーの取得に失敗したのでエラー",
 			authSession: domain.NewOIDCSession(