Update owner routes to use ember-data to retrieve owner model (travis…

…-ci#2017)

* Update owner route to use ember-data to retrieve owner model

* Remove redundant properties from user and organization models that can now be inherited from the owner model

app/adapters/owner.js

@@ -0,0 +1,14 @@
+import V3Adapter from 'travis/adapters/v3';
+
+export default V3Adapter.extend({
+  buildURL: function (modelName, id, snapshot, requestType, query) {
+    if (requestType === 'queryRecord' && query.login !== undefined) {
+      const prefix = this.urlPrefix();
+      const { login } = query;
+      return `${prefix}/owner/${login}`;
+    } else {
+      throw new Error(`The owner adapter only supports a
+        queryRecord request type with a query of login`);
+    }
+  },
+});

app/controllers/owner.js

@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
+import { reads } from '@ember/object/computed';
 import config from 'travis/config/environment';
 
 export default Controller.extend({
@@ -13,15 +14,5 @@ export default Controller.extend({
     return `${sourceEndpoint}/${login}`;
   }),
 
-  owner: computed('model', function () {
-    let model = this.get('model');
-    return {
-      login: model.login,
-      name: model.name,
-      avatar: model.avatar_url,
-      isSyncing: model.is_syncing,
-      avatarUrl: model.avatar_url,
-      syncedAt: model.synced_at
-    };
-  })
+  owner: reads('model'),
 });

app/models/organization.js

@@ -3,7 +3,5 @@ import attr from 'ember-data/attr';
 
 export default Owner.extend({
   type: 'organization',
-  isOrganization: true,
   allowMigration: attr(),
-  permissions: attr(),
 });

app/models/owner.js

@@ -2,7 +2,7 @@ import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo } from 'ember-data/relationships';
 import { computed } from '@ember/object';
-import { reads, or } from '@ember/object/computed';
+import { reads, or, equal } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import config from 'travis/config/environment';
 import dynamicQuery from 'travis/utils/dynamic-query';
@@ -22,6 +22,10 @@ export default Model.extend({
   githubId: attr('string'),
   education: attr('boolean'),
   fullName: or('name', 'login'),
+  permissions: attr(),
+  type: attr('string'),
+  isUser: equal('type', 'user'),
+  isOrganization: equal('type', 'organization'),
 
   // This is set by serializers:subscription
   subscriptionPermissions: attr(),

app/models/user.js

@@ -22,7 +22,6 @@ export default Owner.extend({
 
 
   type: 'user',
-  isUser: true,
 
   fullName: computed('name', 'login', function () {
     let name = this.get('name');

app/routes/owner.js

@@ -1,6 +1,5 @@
 import $ from 'jquery';
 import TravisRoute from 'travis/routes/basic';
-import config from 'travis/config/environment';
 import { inject as service } from '@ember/service';
 
 export default TravisRoute.extend({
@@ -15,18 +14,8 @@ export default TravisRoute.extend({
   },
 
   model(params) {
-    let options = {
-      headers: {
-        'Travis-API-Version': '3'
-      }
-    };
-    if (this.get('auth.signedIn')) {
-      options.headers.Authorization = `token ${this.get('auth.token')}`;
-    }
-    let { owner } = params;
-    let { apiEndpoint } = config;
-    let url = `${apiEndpoint}/owner/${owner}`;
-    return $.ajax(url, options);
+    const { owner } = params;
+    return this.store.queryRecord('owner', { login: owner });
   },
 
   renderTemplate() {
@@ -36,7 +25,7 @@ export default TravisRoute.extend({
 
   actions: {
     error(error, /* transition, originRoute*/) {
-      let is404 = error.status === 404;
+      const is404 = error.status === 404 || error.errors.firstObject.status === '404';
 
       if (!is404) {
         let message = 'There was an error while loading data, please try again.';

app/routes/owner/repositories.js

@@ -23,8 +23,7 @@ export default TravisRoute.extend({
   owner: null,
 
   model({ page, tab }, transition) {
-    let owner = { ...this.modelFor('owner') };
-    owner.isUser = owner['@type'] === 'user';
+    const owner = this.modelFor('owner');
 
     this.setProperties({ tab, page, owner });
 

app/serializers/owner.js

@@ -0,0 +1,8 @@
+import V3Serializer from 'travis/serializers/v3';
+
+export default V3Serializer.extend({
+  attrs: {
+    permissions: { key: '@permissions' },
+    type: { key: '@type' },
+  },
+});

app/templates/owner.hbs

@@ -1,7 +1,7 @@
 {{#travis-layout layoutName="layouts/center" class="owner"}}
 <header class="owner-header row">
   <div class="owner-avatar">
-    {{user-avatar url=owner.avatar name=owner.name size=75}}
+    {{user-avatar url=owner.avatarUrl name=owner.name size=75}}
   </div>
   <div class="owner-info">
     <h1 class="owner-title">{{owner.name}}</h1>