Feature/detail enhance municipality button behavior

app/components/decision-card.hbs

@@ -31,17 +31,9 @@
     <c.footer>
       {{@item.session.dateFormatted}}
       -
-      {{#if @item.session.governingBody.name}}
-        {{@item.session.governingBody.name}}
-      {{else}}
-        Geen Bestuurorgaan
-      {{/if}}
+      {{@item.session.name}}
       -
-      {{#if @item.session.governingBody.administrativeUnit.name}}
-        {{@item.session.governingBody.administrativeUnit.name}}
-      {{else}}
-        Geen Bestuurseenheid
-      {{/if}}
+      {{@item.session.municipality}}
     </c.footer>
   </AuCard>
 </LinkTo>

app/controllers/detail.ts

@@ -11,4 +11,8 @@ export default class DetailController extends Controller {
   get hasVotes() {
     return this.model.agendaItem?.handledBy?.get('hasVotes')?.length > 0;
   }
+
+  get municipalityQuery() {
+    return { gemeentes: this.model.agendaItem.session.municipality };
+  }
 }

app/controllers/map.ts

@@ -78,8 +78,7 @@ export default class MapComponent extends Controller {
         this.agendaData.forEach((agendaItem: AgendaItemModel) => {
           const agendaItemLocation = agendaItem
             .get('session')
-            ?.get('governingBody')
-            ?.get('administrativeUnit')?.name;
+            ?.get('municipality');
           if (name === agendaItemLocation) {
             const datenow = new Date(Date.now()).setHours(0, 0, 0, 0);
             const f = agendaItem.session?.plannedStart;

app/models/administrative-unit.ts

@@ -1,4 +1,10 @@
-import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+import Model, {
+  attr,
+  belongsTo,
+  hasMany,
+  AsyncHasMany,
+  AsyncBelongsTo,
+} from '@ember-data/model';
 import GoverningBodyModel from './governing-body';
 import AdministrativeUnitClasssificationCodeModel from './location';
 import LocationModel from './location';
@@ -8,14 +14,14 @@ export default class AdministrativeUnitModel extends Model {
   declare name: string;
 
   @hasMany('governing-body', { async: true, inverse: 'administrativeUnit' })
-  declare governingBodies: GoverningBodyModel;
+  declare governingBodies: AsyncHasMany<GoverningBodyModel>;
 
   @belongsTo('administrative-unit-classification-code', {
     async: true,
     inverse: null,
   })
-  declare classification: AdministrativeUnitClasssificationCodeModel;
+  declare classification: AsyncBelongsTo<AdministrativeUnitClasssificationCodeModel>;
 
-  @belongsTo('location', { async: true, inverse: null })
+  @belongsTo('location', { async: false, inverse: null })
   declare location: LocationModel;
 }

app/models/agenda-item-handling.ts

@@ -1,13 +1,13 @@
-import Model, { attr, hasMany } from '@ember-data/model';
+import Model, { AsyncHasMany, attr, hasMany } from '@ember-data/model';
 import ResolutionModel from './resolution';
 import VoteModel from './vote';
 
 export default class AgendaItemHandlingModel extends Model {
   @attr('boolean') declare public?: boolean;
 
   @hasMany('vote', { async: true, inverse: null })
-  declare hasVotes?: VoteModel;
+  declare hasVotes?: AsyncHasMany<VoteModel>;
 
   @hasMany('resolution', { async: true, inverse: null })
-  declare resolutions?: ResolutionModel;
+  declare resolutions?: AsyncHasMany<ResolutionModel>;
 }

app/models/agenda-item.ts

@@ -1,4 +1,10 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
+import Model, {
+  attr,
+  belongsTo,
+  hasMany,
+  AsyncHasMany,
+  AsyncBelongsTo,
+} from '@ember-data/model';
 import AgendaItemHandlingModel from './agenda-item-handling';
 import SessionModel from './session';
 
@@ -8,9 +14,15 @@ export default class AgendaItemModel extends Model {
   @attr('string') declare alternateLink: string;
   @attr('boolean') declare plannedPublic: boolean;
 
-  @belongsTo('session', { async: true, inverse: 'agendaItems' })
-  declare session?: SessionModel;
+  @hasMany('session', { async: true, inverse: 'agendaItems' })
+  declare sessions?: AsyncHasMany<SessionModel>;
 
   @belongsTo('agenda-item-handling', { async: true, inverse: null })
-  declare handledBy?: AgendaItemHandlingModel;
+  declare handledBy?: AsyncBelongsTo<AgendaItemHandlingModel>;
+
+  get session() {
+    return this.sessions?.slice().find((session) => {
+      return session.hasMunicipality;
+    });
+  }
 }

app/models/governing-body.ts

@@ -1,4 +1,9 @@
-import Model, { attr, belongsTo, type AsyncBelongsTo } from '@ember-data/model';
+import Model, {
+  attr,
+  belongsTo,
+  hasMany,
+  AsyncHasMany,
+} from '@ember-data/model';
 import SessionModel from './session';
 import AdministrativeUnitModel from './administrative-unit';
 
@@ -11,6 +16,18 @@ export default class GoverningBodyModel extends Model {
   })
   declare administrativeUnit: AdministrativeUnitModel;
 
-  @belongsTo('session', { async: true, inverse: 'governingBody' })
-  declare session: AsyncBelongsTo<SessionModel>;
+  @hasMany('session', { async: true, inverse: 'governingBody' })
+  declare sessions: AsyncHasMany<SessionModel>;
+
+  @belongsTo('governing-body', {
+    async: false,
+    inverse: 'hasTimeSpecializations',
+  })
+  declare isTimeSpecializationOf: GoverningBodyModel;
+
+  @hasMany('governing-body', {
+    async: true,
+    inverse: 'isTimeSpecializationOf',
+  })
+  declare hasTimeSpecializations: AsyncHasMany<GoverningBodyModel>;
 }

app/models/mandatary.ts

@@ -1,4 +1,4 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
+import Model, { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
 import MembershipModel from './membership';
 import PersonModel from './person';
 
@@ -7,8 +7,8 @@ export default class MandataryModel extends Model {
   @attr('date') declare endDate: Date;
 
   @belongsTo('person', { async: true, inverse: null })
-  declare alias: PersonModel;
+  declare alias: AsyncBelongsTo<PersonModel>;
 
   @belongsTo('membership', { async: true, inverse: null })
-  declare hasMembership: MembershipModel;
+  declare hasMembership: AsyncBelongsTo<MembershipModel>;
 }

app/models/membership.ts

@@ -1,7 +1,7 @@
-import Model, { belongsTo } from '@ember-data/model';
+import Model, { AsyncBelongsTo, belongsTo } from '@ember-data/model';
 import parliamentaryGroupModel from './parliamentary-group';
 
 export default class MembershipModel extends Model {
   @belongsTo('parliamentary-group', { async: true, inverse: null })
-  declare innerGroup: parliamentaryGroupModel;
+  declare innerGroup: AsyncBelongsTo<parliamentaryGroupModel>;
 }

app/models/session.ts

@@ -14,34 +14,36 @@ export default class SessionModel extends Model {
   @attr('date') declare startedAt?: Date;
   @attr('date') declare endedAt?: Date;
 
-  @hasMany('agenda-item', { async: true, inverse: 'session' })
+  @hasMany('agenda-item', { async: true, inverse: 'sessions' })
   declare agendaItems: AsyncHasMany<AgendaItemModel>;
 
-  @belongsTo('governing-body', { async: false, inverse: 'session' })
+  @belongsTo('governing-body', { async: false, inverse: 'sessions' })
   declare governingBody: GoverningBodyModel;
 
   get name() {
-    return this.governingBody?.name ?? 'Ontbrekend bestuursorgaan';
+    return (
+      this.governingBody?.isTimeSpecializationOf?.name ||
+      this.governingBody?.name ||
+      'Ontbrekend bestuursorgaan'
+    );
   }
 
   get municipality() {
     return (
-      this.governingBody?.administrativeUnit?.name ??
+      this.governingBody?.isTimeSpecializationOf?.administrativeUnit?.location
+        ?.label ||
+      this.governingBody?.administrativeUnit?.location?.label ||
       'Ontbrekende bestuurseenheid'
     );
   }
 
-  get location() {
+  get hasMunicipality() {
     return (
-      this.governingBody?.administrativeUnit?.location?.label ??
-      'Ontbrekende locatie'
+      !!this.governingBody?.isTimeSpecializationOf?.administrativeUnit ||
+      !!this.governingBody?.administrativeUnit
     );
   }
 
-  get hasMunicipality() {
-    return !!this.governingBody?.administrativeUnit;
-  }
-
   get dateFormatted() {
     if (this.startedAt || this.endedAt) {
       return getFormattedDateRange(this.startedAt, this.endedAt);

app/models/vote.ts

@@ -1,4 +1,4 @@
-import Model, { attr, hasMany } from '@ember-data/model';
+import Model, { AsyncHasMany, attr, hasMany } from '@ember-data/model';
 import MandataryModel from './mandatary';
 
 export default class VoteModel extends Model {
@@ -8,11 +8,11 @@ export default class VoteModel extends Model {
   @attr('boolean') declare secret: boolean;
 
   @hasMany('mandatary', { async: true, inverse: null })
-  declare hasAbstainers: MandataryModel;
+  declare hasAbstainers: AsyncHasMany<MandataryModel>;
 
   @hasMany('mandatary', { async: true, inverse: null })
-  declare hasOpponents: MandataryModel;
+  declare hasOpponents: AsyncHasMany<MandataryModel>;
 
   @hasMany('mandatary', { async: true, inverse: null })
-  declare hasProponents: MandataryModel;
+  declare hasProponents: AsyncHasMany<MandataryModel>;
 }

app/routes/agenda-items.ts

@@ -31,26 +31,21 @@ const getQuery = ({
   plannedStartMin?: string;
   plannedStartMax?: string;
 }): AgendaItemsRequestInterface => ({
-  // exclude sessions without governing body and administrative unit
-  //todo investigate why filtering is not working
   include: [
-    'session',
-    'session.governing-body',
-    'session.governing-body.administrative-unit',
-    'session.governing-body.administrative-unit.location',
+    'sessions.governing-body.is-time-specialization-of.administrative-unit.location',
+    'sessions.governing-body.administrative-unit.location',
   ].join(','),
-  sort: '-session.planned-start',
+  sort: '-sessions.planned-start',
   filter: {
-    session: {
+    sessions: {
       ':gt:planned-start': plannedStartMin ? plannedStartMin : undefined,
       ':lt:planned-start': plannedStartMax ? plannedStartMax : undefined,
-      ':has:governing-body': true,
       'governing-body': {
-        ':has:administrative-unit': true,
-        'administrative-unit': {
-          ':has:name': true,
-          location: {
-            ':id:': locationIds ? locationIds : undefined,
+        'is-time-specialization-of': {
+          'administrative-unit': {
+            location: {
+              ':id:': locationIds ? locationIds : undefined,
+            },
           },
         },
       },
@@ -75,16 +70,14 @@ interface AgendaItemsRequestInterface {
   sort?: string;
   filter?: {
     ':or:'?: object;
-    session?: {
+    sessions?: {
       ':gt:planned-start'?: string;
       ':lt:planned-start'?: string;
-      ':has:governing-body'?: boolean;
       'governing-body'?: {
-        ':has:administrative-unit'?: boolean;
-        'administrative-unit': {
-          ':has:name'?: boolean;
-          name?: string;
-          location?: object;
+        'is-time-specialization-of'?: {
+          'administrative-unit': {
+            location?: object;
+          };
         };
       };
     };

app/routes/detail.ts

@@ -15,25 +15,16 @@ interface FormattedTableVote {
 }
 
 const agendaItemIncludes = [
-  'session',
-  // "session.governing-body",
-  'session.governing-body.administrative-unit',
-  // 'handled-by',
   'handled-by.has-votes',
   'handled-by.resolutions',
-  // 'session.governing-body',
-  'session.governing-body.administrative-unit',
-  // 'handled-by.has-votes.has-presents',
-  // 'handled-by.has-votes.has-abstainers',
   'handled-by.has-votes.has-abstainers.alias',
   'handled-by.has-votes.has-abstainers.has-membership.inner-group',
-  // 'handled-by.has-votes.has-voters',
-  // 'handled-by.has-votes.has-opponents',
   'handled-by.has-votes.has-opponents.alias',
   'handled-by.has-votes.has-opponents.has-membership.inner-group',
-  // 'handled-by.has-votes.has-proponents',
   'handled-by.has-votes.has-proponents.alias',
   'handled-by.has-votes.has-proponents.has-membership.inner-group',
+  'sessions.governing-body.is-time-specialization-of.administrative-unit.location',
+  'sessions.governing-body.administrative-unit.location',
 ].join(',');
 
 export default class DetailRoute extends Route {
@@ -50,7 +41,7 @@ export default class DetailRoute extends Route {
       ? await this.store.query('agenda-item', {
           include: agendaItemIncludes,
           filter: {
-            session: {
+            sessions: {
               [':id:']: sessionId,
             },
           },
@@ -110,11 +101,16 @@ export default class DetailRoute extends Route {
         size: 4,
       },
       municipality: agendaItem.session?.get('municipality') || undefined,
+      include: agendaItemIncludes,
       filter: {
-        session: {
+        sessions: {
           'governing-body': {
-            'administrative-unit': {
-              name: agendaItem.session?.get('municipality') || undefined,
+            'is-time-specialization-of': {
+              'administrative-unit': {
+                location: {
+                  label: agendaItem.session?.get('municipality') || undefined,
+                },
+              },
             },
           },
         },