include join request user profiles

server/im_http.go

@@ -5641,7 +5641,12 @@ func serveIMGroupJoinRequests(wrt http.ResponseWriter, req *http.Request, topic
 			}
 			items = nil
 		}
-		writeIMSuccess(wrt, req, map[string]any{"topic": topic, "items": groupJoinRequestPayloads(items), "next_cursor": nextCursor})
+		payloads, err := groupJoinRequestPayloadsWithUsers(principal.TenantID, items)
+		if err != nil {
+			writeIMRelationError(wrt, req, err)
+			return
+		}
+		writeIMSuccess(wrt, req, map[string]any{"topic": topic, "items": payloads, "next_cursor": nextCursor})
 	}
 }
 
@@ -7782,6 +7787,68 @@ func groupJoinRequestPayloads(items []types.GroupJoinRequest) []map[string]any {
 	return out
 }
 
+func groupJoinRequestPayloadsWithUsers(tenantID types.TenantID, items []types.GroupJoinRequest) ([]map[string]any, error) {
+	payloads := groupJoinRequestPayloads(items)
+	if len(items) == 0 || store.Users == nil {
+		return payloads, nil
+	}
+	seen := make(map[types.Uid]struct{}, len(items)*2)
+	uids := make([]types.Uid, 0, len(items)*2)
+	for i := range items {
+		for _, uid := range []types.Uid{items[i].ApplicantUserID, items[i].InviterUserID} {
+			if uid.IsZero() {
+				continue
+			}
+			if _, ok := seen[uid]; ok {
+				continue
+			}
+			seen[uid] = struct{}{}
+			uids = append(uids, uid)
+		}
+	}
+	if len(uids) == 0 {
+		return payloads, nil
+	}
+	users, err := store.Users.GetAll(tenantID, uids...)
+	if err != nil {
+		return nil, err
+	}
+	byID := make(map[types.Uid]*types.User, len(users))
+	for i := range users {
+		uid := types.ParseUid(users[i].Id)
+		if uid.IsZero() {
+			uid = types.ParseUserId(users[i].Id)
+		}
+		if uid.IsZero() {
+			continue
+		}
+		byID[uid] = &users[i]
+	}
+	for i := range items {
+		enrichGroupJoinRequestUserPayload(payloads[i], "user", "", items[i].ApplicantUserID, byID)
+		enrichGroupJoinRequestUserPayload(payloads[i], "inviter", "inviter_", items[i].InviterUserID, byID)
+	}
+	return payloads, nil
+}
+
+func enrichGroupJoinRequestUserPayload(data map[string]any, objectKey, fieldPrefix string, uid types.Uid, users map[types.Uid]*types.User) {
+	if data == nil || uid.IsZero() {
+		return
+	}
+	user := users[uid]
+	summary := map[string]any{"user_id": uid.UserId(), "display_name": uid.UserId()}
+	if user != nil {
+		summary = userSummaryPayload(user, "")
+	}
+	data[objectKey] = summary
+	if displayName, ok := summary["display_name"]; ok {
+		data[fieldPrefix+"display_name"] = displayName
+	}
+	if avatarFileID, ok := summary["avatar_file_id"]; ok {
+		data[fieldPrefix+"avatar_file_id"] = avatarFileID
+	}
+}
+
 func groupAnnouncementPayload(ann *types.GroupAnnouncement) map[string]any {
 	if ann == nil {
 		return map[string]any{

server/im_http_test.go

@@ -4765,16 +4765,20 @@ func TestServeIMGroupInvitationCreatesApprovalRequest(t *testing.T) {
 	mockStore.EXPECT().GetUidString().Return("request")
 	oldSubs := store.Subs
 	oldGroupBusiness := store.GroupBusiness
+	oldUsers := store.Users
 	subs := mock_store.NewMockSubsPersistenceInterface(ctrl)
+	users := mock_store.NewMockUsersPersistenceInterface(ctrl)
 	groupStore := &testGroupBusinessStore{settings: &types.GroupSettings{
 		Topic: "grpAlpha", OwnerUserID: types.Uid(42), Name: "Alpha", GroupStatus: types.GroupStatusActive,
 		JoinApproval: true, MemberInvite: true, MaxAdminCount: groupMaxAdminCount, Version: 1,
 	}}
 	store.Subs = subs
+	store.Users = users
 	store.GroupBusiness = groupStore
 	defer func() {
 		store.Subs = oldSubs
 		store.GroupBusiness = oldGroupBusiness
+		store.Users = oldUsers
 	}()
 	owner := types.Uid(42)
 	target := types.Uid(43)
@@ -4817,6 +4821,10 @@ func TestServeIMGroupInvitationCreatesApprovalRequest(t *testing.T) {
 		t.Fatalf("unexpected summary response: %#v", summary)
 	}
 
+	users.EXPECT().GetAll(types.TenantID(7), target, owner).Return([]types.User{
+		{ObjHeader: types.ObjHeader{Id: target.String()}, Public: map[string]any{"display_name": "申请人", "avatar_file_id": "avatar-target.jpg"}},
+		{ObjHeader: types.ObjHeader{Id: owner.String()}, Public: map[string]any{"display_name": "邀请人", "avatar_file_id": "avatar-owner.jpg"}},
+	}, nil)
 	req = httptest.NewRequest(http.MethodGet, "/v1/im/groups/grpAlpha/join-requests?status=pending", nil)
 	req.Header.Set("Authorization", "Bearer token-1")
 	rec = httptest.NewRecorder()
@@ -4829,6 +4837,16 @@ func TestServeIMGroupInvitationCreatesApprovalRequest(t *testing.T) {
 	if len(requests) != 1 || requests[0].(map[string]any)["request_id"] != "gjr_request" {
 		t.Fatalf("unexpected join requests response: %#v", list)
 	}
+	requestItem := requests[0].(map[string]any)
+	if requestItem["display_name"] != "申请人" || requestItem["avatar_file_id"] != "avatar-target.jpg" {
+		t.Fatalf("join request applicant profile was not populated: %#v", requestItem)
+	}
+	if requestItem["inviter_display_name"] != "邀请人" || requestItem["inviter_avatar_file_id"] != "avatar-owner.jpg" {
+		t.Fatalf("join request inviter profile was not populated: %#v", requestItem)
+	}
+	if user := requestItem["user"].(map[string]any); user["display_name"] != "申请人" || user["avatar_file_id"] != "avatar-target.jpg" {
+		t.Fatalf("join request user object was not populated: %#v", user)
+	}
 }
 
 func TestServeIMGroupInvitationAccept(t *testing.T) {