fix: link group invitations to join requests

server/db/mysql/tenant_groups.go

@@ -419,16 +419,37 @@ func (a *adapter) TenantGroupInvitationCreate(id t.TenantID, inv *t.GroupInvitat
 	if inv.ExpiresAt.IsZero() {
 		inv.ExpiresAt = now.Add(7 * 24 * time.Hour)
 	}
-	ctx, cancel := a.getContext()
+	ctx, cancel := a.getContextForTx()
 	if cancel != nil {
 		defer cancel()
 	}
-	_, err := a.db.ExecContext(ctx, `INSERT INTO im_group_invitations(invitation_id,topic,inviter_user_id,target_user_id,message,status,result,join_request_id,idempotency_key,expires_at,handled_at,created_at,updated_at)
+	tx, err := a.db.BeginTxx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	defer tx.Rollback()
+	_, err = tx.ExecContext(ctx, `INSERT INTO im_group_invitations(invitation_id,topic,inviter_user_id,target_user_id,message,status,result,join_request_id,idempotency_key,expires_at,handled_at,created_at,updated_at)
 		VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)`,
 		inv.InvitationID, inv.Topic, decodeUID(inv.InviterUserID), decodeUID(inv.TargetUserID), inv.Message, inv.Status, inv.Result, inv.JoinRequestID, inv.IdempotencyKey, inv.ExpiresAt, inv.HandledAt, now, now)
 	if err != nil {
 		return nil, err
 	}
+	if strings.TrimSpace(inv.JoinRequestID) != "" {
+		_, err = tx.ExecContext(ctx, `INSERT INTO im_group_join_requests(request_id,topic,applicant_user_id,inviter_user_id,source,qr_token_hash,message,status,reject_reason,expires_at,idempotency_key,version,created_at,updated_at)
+			VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)`,
+			inv.JoinRequestID, inv.Topic, decodeUID(inv.TargetUserID), nullableUID(inv.InviterUserID), "invitation", "", inv.Message, t.GroupJoinRequestStatusPending, "", inv.ExpiresAt, inv.IdempotencyKey, 1, now, now)
+		if err != nil {
+			return nil, err
+		}
+		if err = insertGroupEventTx(tx, inv.Topic, inv.TargetUserID, "group.join_request.created", map[string]any{
+			"request_id": inv.JoinRequestID, "applicant_user_id": inv.TargetUserID.UserId(), "source": "invitation", "invitation_id": inv.InvitationID,
+		}); err != nil {
+			return nil, err
+		}
+	}
+	if err = tx.Commit(); err != nil {
+		return nil, err
+	}
 	return inv, nil
 }
 
@@ -509,6 +530,14 @@ func (a *adapter) TenantGroupInvitationAccept(id t.TenantID, invitationID string
 		t.GroupInvitationStatusJoined, "joined", now, now, inv.InvitationID); err != nil {
 		return nil, err
 	}
+	if strings.TrimSpace(inv.JoinRequestID) != "" {
+		if _, err = tx.ExecContext(ctx, `UPDATE im_group_join_requests
+			SET status=?,handled_by=?,handled_at=?,updated_at=?,version=version+1
+			WHERE topic=? AND request_id=? AND status=?`,
+			t.GroupJoinRequestStatusAccepted, decodeUID(uid), now, now, inv.Topic, inv.JoinRequestID, t.GroupJoinRequestStatusPending); err != nil {
+			return nil, err
+		}
+	}
 	if err = insertGroupEventTx(tx, inv.Topic, uid, "group.member.joined", map[string]any{
 		"user_id": uid.UserId(), "source": "invitation", "invitation_id": inv.InvitationID,
 	}); err != nil {