Add explicit inverse relationship names

emberjs/rfcs#739

app/models/administrative-unit.js

@@ -2,8 +2,23 @@ import { hasMany, belongsTo } from '@ember-data/model';
 import OrganizationModel from './organization';
 
 export default class AdministrativeUnitModel extends OrganizationModel {
-  @belongsTo('administrative-unit-classification-code') classification;
-  @belongsTo('location', { inverse: 'administrativeUnit' }) scope;
-  @hasMany('governing-body', { inverse: 'administrativeUnit' }) governingBodies;
-  @hasMany('local-involvement') involvedBoards;
+  @belongsTo('administrative-unit-classification-code', {
+    inverse: null,
+  })
+  classification;
+
+  @belongsTo('location', {
+    inverse: 'administrativeUnit',
+  })
+  scope;
+
+  @hasMany('governing-body', {
+    inverse: 'administrativeUnit',
+  })
+  governingBodies;
+
+  @hasMany('local-involvement', {
+    inverse: 'administrativeUnit',
+  })
+  involvedBoards;
 }

app/models/agent-in-position.js

@@ -3,7 +3,19 @@ import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 export default class AgentInPositionModel extends Model {
   @attr('date') agentStartDate;
   @attr('date') agentEndDate;
-  @belongsTo('post') position;
-  @belongsTo('person') person;
-  @hasMany('contact-point') contacts;
+
+  @belongsTo('post', {
+    inverse: 'agentsInPosition',
+  })
+  position;
+
+  @belongsTo('person', {
+    inverse: 'agentsInPosition',
+  })
+  person;
+
+  @hasMany('contact-point', {
+    inverse: null,
+  })
+  contacts;
 }

app/models/associated-legal-structure.js

@@ -2,7 +2,19 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class AssociatedLegalStructureModel extends Model {
   @attr name;
-  @belongsTo('identifier') registration;
-  @belongsTo('legal-form-type') legalType;
-  @belongsTo('address') address;
+
+  @belongsTo('identifier', {
+    inverse: null,
+  })
+  registration;
+
+  @belongsTo('legal-form-type', {
+    inverse: null,
+  })
+  legalType;
+
+  @belongsTo('address', {
+    inverse: null,
+  })
+  address;
 }

app/models/change-event.js

@@ -3,5 +3,9 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 export default class ChangeEventModel extends Model {
   @attr('date') date;
   @attr description;
-  @belongsTo('change-event-type') type;
+
+  @belongsTo('change-event-type', {
+    inverse: null,
+  })
+  type;
 }

app/models/contact-point.js

@@ -5,5 +5,9 @@ export default class ContactPointModel extends Model {
   @attr telephone;
   @attr fax;
   @attr website;
-  @belongsTo('address') contactAddress;
+
+  @belongsTo('address', {
+    inverse: null,
+  })
+  contactAddress;
 }

app/models/governing-body.js

@@ -3,14 +3,31 @@ import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 export default class GoverningBodyModel extends Model {
   @attr('date') startDate;
   @attr('date') endDate;
-  @belongsTo('administrative-unit') administrativeUnit;
-  @belongsTo('governing-body-classification-code', { inverse: null })
+
+  @belongsTo('administrative-unit', {
+    inverse: 'governingBodies',
+  })
+  administrativeUnit;
+
+  @belongsTo('governing-body-classification-code', {
+    inverse: null,
+  })
   classification;
-  @belongsTo('governing-body', { inverse: 'hasTimeSpecializations' })
+
+  @belongsTo('governing-body', {
+    inverse: 'hasTimeSpecializations',
+  })
   isTimeSpecializationOf;
-  @hasMany('governing-body', { inverse: 'isTimeSpecializationOf' })
+
+  @hasMany('governing-body', {
+    inverse: 'isTimeSpecializationOf',
+  })
   hasTimeSpecializations;
-  @hasMany('mandate') mandates;
+
+  @hasMany('mandate', {
+    inverse: 'governingBody',
+  })
+  mandates;
 
   get period() {
     let period = '';

app/models/identifier.js

@@ -2,5 +2,9 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class IdentifierModel extends Model {
   @attr idName;
-  @belongsTo('structured-identifier') structuredIdentifier;
+
+  @belongsTo('structured-identifier', {
+    inverse: null,
+  })
+  structuredIdentifier;
 }

app/models/local-involvement.js

@@ -2,8 +2,19 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class PublicInvolvementModel extends Model {
   @attr percentage;
-  @belongsTo('involvement-type') involvementType;
-  @belongsTo('worship-service') worshipService;
-  @belongsTo('administrative-unit', { inverse: 'involvedBoards' })
+
+  @belongsTo('involvement-type', {
+    inverse: null,
+  })
+  involvementType;
+
+  @belongsTo('worship-service', {
+    inverse: 'involvements',
+  })
+  worshipService;
+
+  @belongsTo('administrative-unit', {
+    inverse: 'involvedBoards',
+  })
   administrativeUnit;
 }

app/models/location.js

@@ -3,5 +3,9 @@ import Model, { attr, hasMany } from '@ember-data/model';
 export default class LocationModel extends Model {
   @attr label;
   @attr level;
-  @hasMany('administrative-unit', { inverse: 'scope' }) administrativeUnit;
+
+  @hasMany('administrative-unit', {
+    inverse: 'scope',
+  })
+  administrativeUnit;
 }

app/models/mandate.js

@@ -2,7 +2,18 @@ import { hasMany, belongsTo } from '@ember-data/model';
 import PostModel from './post';
 
 export default class MandateModel extends PostModel {
-  @belongsTo('board-position') roleBoard;
-  @belongsTo('governing-body', { inverse: 'mandates' }) governingBody;
-  @hasMany('mandatory', { inverse: 'mandate' }) heldBy;
+  @belongsTo('board-position', {
+    inverse: null,
+  })
+  roleBoard;
+
+  @belongsTo('governing-body', {
+    inverse: 'mandates',
+  })
+  governingBody;
+
+  @hasMany('mandatory', {
+    inverse: 'mandate',
+  })
+  heldBy;
 }

app/models/mandatory.js

@@ -3,8 +3,24 @@ import AgentInPositionModel from './agent-in-position';
 export default class MandatoryModel extends AgentInPositionModel {
   @attr('date') startDate;
   @attr('date') endDate;
-  @belongsTo('mandatory-status-code') status;
-  @belongsTo('person') governingAlias;
-  @belongsTo('mandate') mandate;
-  @hasMany('contact-point') contacts;
+
+  @belongsTo('mandatory-status-code', {
+    inverse: null,
+  })
+  status;
+
+  @belongsTo('person', {
+    inverse: 'mandatories',
+  })
+  governingAlias;
+
+  @belongsTo('mandate', {
+    inverse: 'heldBy',
+  })
+  mandate;
+
+  @hasMany('contact-point', {
+    inverse: null,
+  })
+  contacts;
 }

app/models/minister-condition.js

@@ -2,6 +2,14 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class MinisterConditionModel extends Model {
   @attr satisfied;
-  @belongsTo('minister-conditions-criterion') criterion;
-  @belongsTo('document-type-criterion') documentTypeCriterion;
+
+  @belongsTo('minister-conditions-criterion', {
+    inverse: null,
+  })
+  criterion;
+
+  @belongsTo('document-type-criterion', {
+    inverse: null,
+  })
+  documentTypeCriterion;
 }

app/models/minister-position.js

@@ -2,8 +2,18 @@ import { belongsTo } from '@ember-data/model';
 import PostModel from './post';
 
 export default class MinisterPositionModel extends PostModel {
-  @belongsTo('minister-position-function') function;
-  @belongsTo('worship-service', { inverse: 'ministerPositions' })
+  @belongsTo('minister-position-function', {
+    inverse: null,
+  })
+  function;
+
+  @belongsTo('worship-service', {
+    inverse: 'ministerPositions',
+  })
   worshipService;
-  @belongsTo('representative-body') representativeBody;
+
+  @belongsTo('representative-body', {
+    inverse: 'ministerPositions',
+  })
+  representativeBody;
 }

app/models/minister.js

@@ -2,7 +2,18 @@ import { hasMany, belongsTo } from '@ember-data/model';
 import AgentInPositionModel from './agent-in-position';
 
 export default class MinisterModel extends AgentInPositionModel {
-  @belongsTo('minister-position') ministerPosition;
-  @belongsTo('financing-code') financing;
-  @hasMany('minister-condition') conditions;
+  @belongsTo('minister-position', {
+    inverse: null,
+  })
+  ministerPosition;
+
+  @belongsTo('financing-code', {
+    inverse: null,
+  })
+  financing;
+
+  @hasMany('minister-condition', {
+    inverse: null,
+  })
+  conditions;
 }

app/models/organization.js

@@ -3,18 +3,59 @@ import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 export default class OrganizationModel extends Model {
   @attr name;
   @attr alternativeName;
-  @belongsTo('site') primarySite;
-  @belongsTo('organization-status-code') organizationStatus;
-  @hasMany('identifier', { inverse: null }) identifiers;
-  @hasMany('site', { inverse: null }) sites;
-  @hasMany('change-event', { inverse: null }) changedBy;
-  @hasMany('change-event', { inverse: null }) resultedFrom;
-  @hasMany('post', { inverse: null }) positions;
-  @hasMany('organization', { inverse: 'isSubOrganizationOf' }) subOrganizations;
-  @belongsTo('organization', { inverse: 'subOrganizations' })
+
+  @belongsTo('site', {
+    inverse: null,
+  })
+  primarySite;
+
+  @belongsTo('organization-status-code', {
+    inverse: null,
+  })
+  organizationStatus;
+
+  @hasMany('identifier', {
+    inverse: null,
+  })
+  identifiers;
+
+  @hasMany('site', {
+    inverse: null,
+  })
+  sites;
+
+  @hasMany('change-event', {
+    inverse: null,
+  })
+  changedBy;
+
+  @hasMany('change-event', {
+    inverse: null,
+  })
+  resultedFrom;
+
+  @hasMany('post', {
+    inverse: null,
+  })
+  positions;
+
+  @hasMany('organization', {
+    inverse: 'isSubOrganizationOf',
+  })
+  subOrganizations;
+
+  @belongsTo('organization', {
+    inverse: 'subOrganizations',
+  })
   isSubOrganizationOf;
-  @hasMany('organization', { inverse: 'isAssociatedWith' })
+
+  @hasMany('organization', {
+    inverse: 'isAssociatedWith',
+  })
   associatedOrganizations;
-  @belongsTo('organization', { inverse: 'associatedOrganizations' })
+
+  @belongsTo('organization', {
+    inverse: 'associatedOrganizations',
+  })
   isAssociatedWith;
 }

app/models/person.js

@@ -4,9 +4,29 @@ export default class PersonModel extends Model {
   @attr givenName;
   @attr familyName;
   @attr firstNameUsed;
-  @hasMany('mandatory', { inverse: 'governingAlias' }) mandatories;
-  @hasMany('agent-in-position', { inverse: 'person' }) agentsInPosition;
-  @hasMany('nationality') nationalities;
-  @belongsTo('date-of-birth') dateOfBirth;
-  @belongsTo('gender-code') gender;
+
+  @hasMany('mandatory', {
+    inverse: 'governingAlias',
+  })
+  mandatories;
+
+  @hasMany('agent-in-position', {
+    inverse: 'person',
+  })
+  agentsInPosition;
+
+  @hasMany('nationality', {
+    inverse: null,
+  })
+  nationalities;
+
+  @belongsTo('date-of-birth', {
+    inverse: null,
+  })
+  dateOfBirth;
+
+  @belongsTo('gender-code', {
+    inverse: null,
+  })
+  gender;
 }