Convert more models

app/models/commitment.ts

@@ -0,0 +1,6 @@
+import DS from 'ember-data';
+
+export default class Commitment extends DS.Model.extend({
+  slot: DS.belongsTo('slot', { async: false }),
+  person: DS.belongsTo('person')
+}) {}

app/models/institution.js → app/models/institution.ts

@@ -2,7 +2,7 @@ import { computed, get } from '@ember/object';
 import DS from 'ember-data';
 import dollars from 'prison-rideshare-ui/utils/dollars';
 
-export default DS.Model.extend({
+export default class Institution extends DS.Model.extend({
   name: DS.attr(),
   rate: DS.attr('number', {defaultValue: 0}),
 
@@ -11,10 +11,10 @@ export default DS.Model.extend({
   validationErrors: computed('errors.[]', function() {
     const attributes = get(this.constructor, 'attributes');
 
-    return attributes._keys.list.reduce((response, key) => {
+    return attributes._keys.list.reduce((response: ValidationDictionary, key: string) => {
       const errors = this.get(`errors.${key}`) || [];
       response[key] = errors.mapBy('message');
       return response;
     }, {});
   })
-});
+}) {}

app/models/person.js → app/models/person.ts

@@ -1,7 +1,7 @@
 import { computed, get } from '@ember/object';
 import DS from 'ember-data';
 
-export default DS.Model.extend({
+export default class Person extends DS.Model.extend({
   name: DS.attr(),
 
   email: DS.attr('string'),
@@ -14,7 +14,7 @@ export default DS.Model.extend({
   notes: DS.attr('string'),
   selfNotes: DS.attr('string'),
 
-  reimbursements: DS.hasMany(),
+  reimbursements: DS.hasMany('reimbursement'),
 
   drivings: DS.hasMany('ride', {inverse: 'driver'}),
   carOwnings: DS.hasMany('ride', {inverse: 'carOwner'}),
@@ -28,10 +28,10 @@ export default DS.Model.extend({
   validationErrors: computed('errors.[]', function() {
     const attributes = get(this.constructor, 'attributes');
 
-    return attributes._keys.list.reduce((response, key) => {
+    return attributes._keys.list.reduce((response: ValidationDictionary, key: string) => {
       const errors = this.get(`errors.${key}`) || [];
       response[key] = errors.mapBy('message');
       return response;
     }, {});
   })
-});
+}) {}

app/models/reimbursement.js → app/models/reimbursement.ts

@@ -1,18 +1,18 @@
 import DS from 'ember-data';
 import dollars from 'prison-rideshare-ui/utils/dollars';
 
-export default DS.Model.extend({
+export default class Reimbursement extends DS.Model.extend({
   foodExpenses: DS.attr('number', {defaultValue: 0}),
   carExpenses: DS.attr('number', {defaultValue: 0}),
 
-  person: DS.belongsTo(),
+  person: DS.belongsTo('person'),
   donation: DS.attr('boolean'),
   processed: DS.attr('boolean'),
 
   foodExpensesDollars: dollars('foodExpenses'),
   carExpensesDollars: dollars('carExpenses'),
 
-  ride: DS.belongsTo(),
+  ride: DS.belongsTo('ride'),
 
   insertedAt: DS.attr('date')
-});
+}) {}

app/utils/dollars.js → app/utils/dollars.ts

@@ -1,12 +1,12 @@
 import { computed } from '@ember/object';
 
-export default function(property) {
+export default function(property: string) {
   return computed(property, {
     get() {
       return this.get(property)/100;
     },
 
-    set(key, value) {
+    set(_key: string, value: number) {
       this.set(property, Math.floor(value*100));
       return value;
     }

types/prison-rideshare-ui/index.d.ts

@@ -9,6 +9,10 @@ declare global {
     id: String;
     date: Date;
   }
+
+  interface ValidationDictionary {
+    [index: string]: string;
+  }
 }
 
 export {};