remove meeting user_ids

client/src/app/domain/models/meetings/meeting.ts

@@ -243,7 +243,6 @@ export class Meeting extends BaseModel<Meeting> {
 
     // Other relations
     public present_user_ids!: Id[]; // (user/is_present_in_meeting_ids)[];
-    public user_ids!: Id[]; // Calculated: All ids all users assigned to groups.
     public reference_projector_id!: Id; // projector/used_as_reference_projector_meeting_id;
     public default_projector_$_ids!: string[]; // projector/used_as_default_$_in_meeting_id;
 
@@ -451,7 +450,6 @@ export class Meeting extends BaseModel<Meeting> {
         `default_meeting_for_committee_id`,
         `organization_tag_ids`,
         `present_user_ids`,
-        `user_ids`,
         `reference_projector_id`,
         `list_of_speakers_countdown_id`,
         `poll_countdown_id`,

client/src/app/gateways/repositories/meeting-repository.service.ts

@@ -58,7 +58,6 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
             `is_active_in_organization_id`,
             `is_archived_organization_id`,
             `template_for_organization_id`,
-            `user_ids`,
             `description`,
             `location`,
             `organization_tag_ids`,
@@ -219,6 +218,7 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
     protected override createViewModel(model: Meeting): ViewMeeting {
         const viewModel = super.createViewModel(model);
         viewModel.getProjectorTitle = (projection: Projection) => this.getProjectorTitle(viewModel, projection);
+        viewModel.getUserIds = () => viewModel.groups.map(g => g.user_ids).flat();
         return viewModel;
     }
 

client/src/app/infrastructure/definitions/relations/relations.ts

@@ -683,16 +683,6 @@ export const RELATIONS: Relation[] = [
         generic: false,
         structured: true
     },
-    // meeting/user_ids -> user
-    {
-        ownViewModels: [ViewMeeting],
-        foreignViewModel: ViewUser,
-        ownField: `users`,
-        ownIdField: `user_ids`,
-        many: true,
-        generic: false,
-        structured: false
-    },
     // user/meeting_ids -> meeting
     {
         ownViewModels: [ViewUser],

client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts

@@ -17,17 +17,23 @@ export const getParticipantVoteInfoSubscriptionConfig: SubscriptionConfigGenerat
         ids: [id],
         follow: [
             {
-                idField: `user_ids`,
-                fieldset: [
-                    `default_vote_weight`,
-                    `is_physical_person`,
-                    `is_active`,
-                    `meeting_ids`,
-                    { templateField: `vote_delegated_$_to_id` },
-                    { templateField: `vote_delegations_$_from_ids` },
-                    { templateField: `vote_weight_$` },
-                    { templateField: `group_$_ids` },
-                    `is_present_in_meeting_ids`
+                idField: `group_ids`,
+                fieldset: [],
+                follow: [
+                    {
+                        idField: `user_ids`,
+                        fieldset: [
+                            `default_vote_weight`,
+                            `is_physical_person`,
+                            `is_active`,
+                            `meeting_ids`,
+                            { templateField: `vote_delegated_$_to_id` },
+                            { templateField: `vote_delegations_$_from_ids` },
+                            { templateField: `vote_weight_$` },
+                            { templateField: `group_$_ids` },
+                            `is_present_in_meeting_ids`
+                        ]
+                    }
                 ]
             }
         ]
@@ -40,7 +46,13 @@ export const getParticipantIsPresentSubscriptionConfig: SubscriptionConfigGenera
         viewModelCtor: ViewMeeting,
         fieldset: [],
         ids: [id],
-        follow: [{ idField: `user_ids`, additionalFields: [`is_present_in_meeting_ids`] }]
+        follow: [
+            {
+                idField: `group_ids`,
+                fieldset: [],
+                follow: [{ idField: `user_ids`, additionalFields: [`is_present_in_meeting_ids`] }]
+            }
+        ]
     },
     subscriptionName: PARTICIPANT_IS_PRESENT_LIST_SUBSCRIPTION
 });
@@ -49,7 +61,13 @@ export const getParticipantListSubscriptionConfig: SubscriptionConfigGenerator =
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
-        follow: [{ idField: `user_ids`, fieldset: `participantList` }]
+        follow: [
+            {
+                idField: `group_ids`,
+                fieldset: [],
+                follow: [{ idField: `user_ids`, fieldset: `participantList` }]
+            }
+        ]
     },
     subscriptionName: PARTICIPANT_LIST_SUBSCRIPTION
 });
@@ -58,7 +76,13 @@ export const getParticipantMinimalSubscriptionConfig: SubscriptionConfigGenerato
     modelRequest: {
         viewModelCtor: ViewMeeting,
         ids: [id],
-        follow: [{ idField: `user_ids`, fieldset: `participantListMinimal` }]
+        follow: [
+            {
+                idField: `group_ids`,
+                fieldset: [],
+                follow: [{ idField: `user_ids`, fieldset: `participantListMinimal` }]
+            }
+        ]
     },
     subscriptionName: PARTICIPANT_LIST_SUBSCRIPTION_MINIMAL
 });

client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts

@@ -22,6 +22,7 @@ import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
 import { UserService } from 'src/app/site/services/user.service';
 import { UserControllerService } from 'src/app/site/services/user-controller.service';
 
+import { GroupControllerService } from '../../../modules';
 import { ParticipantCommonServiceModule } from '../participant-common-service.module';
 
 export const MEETING_RELATED_FORM_CONTROLS = [
@@ -48,6 +49,7 @@ export class ParticipantControllerService extends BaseMeetingControllerService<V
         controllerServiceCollector: MeetingControllerServiceCollectorService,
         protected override repo: UserRepositoryService,
         public meetingController: MeetingControllerService,
+        public groupController: GroupControllerService,
         private userController: UserControllerService,
         private userDeleteDialog: UserDeleteDialogService,
         private presenter: GetUserScopePresenterService,
@@ -66,13 +68,21 @@ export class ParticipantControllerService extends BaseMeetingControllerService<V
                     meetingUserIds = meeting?.user_ids ?? [];
                     const meetingUsers =
                         meeting && meeting?.user_ids
-                            ? repo.getViewModelList().filter(user => meeting?.user_ids.includes(user.id))
+                            ? repo.getViewModelList().filter(user => meetingUserIds.includes(user.id))
                             : [];
                     this._participantListSubject.next(meetingUsers);
                 });
             }
         });
 
+        this.groupController.getViewModelListObservable().subscribe(_ => {
+            meetingUserIds = this.activeMeeting?.user_ids ?? [];
+            const meetingUsers = meetingUserIds.length
+                ? repo.getViewModelList().filter(user => meetingUserIds.includes(user.id))
+                : [];
+            this._participantListSubject.next(meetingUsers);
+        });
+
         repo.getViewModelListObservable().subscribe(users => {
             const meetingUsers = users.filter(
                 user => user.group_ids(this.activeMeetingId).length && meetingUserIds.includes(user.id)

client/src/app/site/pages/meetings/services/active-meeting.subscription.ts

@@ -18,7 +18,6 @@ export function getActiveMeetingSubscriptionConfig(id: Id, settingsKeys: string[
                 `is_active_in_organization_id`,
                 `is_archived_organization_id`,
                 `template_for_organization_id`,
-                `user_ids`,
                 `description`,
                 `location`,
                 `organization_tag_ids`,
@@ -44,7 +43,8 @@ export function getActiveMeetingSubscriptionConfig(id: Id, settingsKeys: string[
                         `default_group_for_meeting_id`,
                         `name`,
                         `permissions`,
-                        `weight`
+                        `weight`,
+                        `user_ids`
                     ]
                 },
                 {

client/src/app/site/pages/meetings/view-models/view-meeting.ts

@@ -1,4 +1,5 @@
 import { unix } from 'moment';
+import { Id } from 'src/app/domain/definitions/key-types';
 import { HasProjectorTitle } from 'src/app/domain/interfaces/has-projector-title';
 import { Meeting } from 'src/app/domain/models/meetings/meeting';
 
@@ -78,6 +79,10 @@ export class ViewMeeting extends BaseViewModel<Meeting> {
         return this.is_template || !!this.template_for_organization_id;
     }
 
+    public get user_ids(): Id[] {
+        return this.getUserIds();
+    }
+
     public get relatedTime(): RelatedTime {
         if ((this.start_time ?? this.end_time) === undefined) {
             return RelatedTime.Dateless;
@@ -94,6 +99,8 @@ export class ViewMeeting extends BaseViewModel<Meeting> {
         }
     }
 
+    public getUserIds!: () => Id[];
+
     public static COLLECTION = Meeting.COLLECTION;
     public static ACCESSIBILITY_FIELD: keyof Meeting = `description`;