From ab608c7544751b2af5cca77e56dba76dc39521b3 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 10 Sep 2020 18:32:17 -0400
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20serialize=20scope=5F?=
 =?UTF-8?q?id=20by=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/addon/serializers/application.js   | 21 +++----------
 addons/api/addon/serializers/auth-method.js   | 13 --------
 addons/api/addon/serializers/group.js         |  8 -----
 addons/api/addon/serializers/host-catalog.js  | 13 --------
 addons/api/addon/serializers/host-set.js      |  8 -----
 addons/api/addon/serializers/host.js          | 13 --------
 addons/api/addon/serializers/role.js          |  8 -----
 addons/api/addon/serializers/scope.js         | 11 -------
 addons/api/addon/serializers/target.js        |  8 -----
 addons/api/addon/serializers/user.js          | 13 --------
 addons/api/app/serializers/auth-method.js     |  1 -
 addons/api/app/serializers/host-catalog.js    |  1 -
 addons/api/app/serializers/host.js            |  1 -
 addons/api/app/serializers/scope.js           |  1 -
 addons/api/app/serializers/user.js            |  1 -
 .../unit/serializers/application-test.js      | 28 ++---------------
 .../unit/serializers/auth-method-test.js      | 24 --------------
 .../unit/serializers/host-catalog-test.js     | 23 --------------
 .../api/tests/unit/serializers/host-test.js   | 23 --------------
 .../api/tests/unit/serializers/scope-test.js  | 31 -------------------
 .../api/tests/unit/serializers/user-test.js   | 23 --------------
 21 files changed, 7 insertions(+), 266 deletions(-)
 delete mode 100644 addons/api/addon/serializers/auth-method.js
 delete mode 100644 addons/api/addon/serializers/host-catalog.js
 delete mode 100644 addons/api/addon/serializers/host.js
 delete mode 100644 addons/api/addon/serializers/scope.js
 delete mode 100644 addons/api/addon/serializers/user.js
 delete mode 100644 addons/api/app/serializers/auth-method.js
 delete mode 100644 addons/api/app/serializers/host-catalog.js
 delete mode 100644 addons/api/app/serializers/host.js
 delete mode 100644 addons/api/app/serializers/scope.js
 delete mode 100644 addons/api/app/serializers/user.js
 delete mode 100644 addons/api/tests/unit/serializers/auth-method-test.js
 delete mode 100644 addons/api/tests/unit/serializers/host-catalog-test.js
 delete mode 100644 addons/api/tests/unit/serializers/host-test.js
 delete mode 100644 addons/api/tests/unit/serializers/scope-test.js
 delete mode 100644 addons/api/tests/unit/serializers/user-test.js

diff --git a/addons/api/addon/serializers/application.js b/addons/api/addon/serializers/application.js
index cea8c06a0..65743c707 100644
--- a/addons/api/addon/serializers/application.js
+++ b/addons/api/addon/serializers/application.js
@@ -8,18 +8,6 @@ import { copy } from 'ember-copy';
  */
 export default class ApplicationSerializer extends RESTSerializer {
 
-  // =attributes
-
-  attrs = {
-    scope: { serialize: false }
-  };
-
-  /**
-   * Whether or not to serialize the scope ID into scope_id.
-   * @type {boolean}
-   */
-  serializeScopeID = false;
-
   // =methods
 
   /**
@@ -81,10 +69,11 @@ export default class ApplicationSerializer extends RESTSerializer {
    */
   serialize(snapshot) {
     const serialized = super.serialize(...arguments);
-    if (this.serializeScopeID) {
-      const scope_id = snapshot?.attr('scope')?.attr('scope_id');
-      if (scope_id) serialized.scope_id = scope_id;
-    }
+    // Delete `scope` field
+    delete serialized.scope;
+    // And serialize `scope_id`
+    const scope_id = snapshot?.attr('scope')?.attr('scope_id');
+    if (scope_id) serialized.scope_id = scope_id;
     return serialized;
   }
 
diff --git a/addons/api/addon/serializers/auth-method.js b/addons/api/addon/serializers/auth-method.js
deleted file mode 100644
index d0c3c9312..000000000
--- a/addons/api/addon/serializers/auth-method.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class AuthMethodSerializer extends ApplicationSerializer {
-
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-  
-}
diff --git a/addons/api/addon/serializers/group.js b/addons/api/addon/serializers/group.js
index 2c7327a84..bbccc068f 100644
--- a/addons/api/addon/serializers/group.js
+++ b/addons/api/addon/serializers/group.js
@@ -2,14 +2,6 @@ import ApplicationSerializer from './application';
 
 export default class GroupSerializer extends ApplicationSerializer {
 
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-  
   // =methods
 
   /**
diff --git a/addons/api/addon/serializers/host-catalog.js b/addons/api/addon/serializers/host-catalog.js
deleted file mode 100644
index 766dff5d6..000000000
--- a/addons/api/addon/serializers/host-catalog.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class HostCatalogSerializer extends ApplicationSerializer {
-
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
-}
diff --git a/addons/api/addon/serializers/host-set.js b/addons/api/addon/serializers/host-set.js
index 697e7748d..3ce7c7161 100644
--- a/addons/api/addon/serializers/host-set.js
+++ b/addons/api/addon/serializers/host-set.js
@@ -2,14 +2,6 @@ import ApplicationSerializer from './application';
 
 export default class HostSetSerializer extends ApplicationSerializer {
 
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-  
   // =methods
 
   /**
diff --git a/addons/api/addon/serializers/host.js b/addons/api/addon/serializers/host.js
deleted file mode 100644
index 06a7b91d3..000000000
--- a/addons/api/addon/serializers/host.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class HostSerializer extends ApplicationSerializer {
-
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
-}
diff --git a/addons/api/addon/serializers/role.js b/addons/api/addon/serializers/role.js
index 5c858bc1f..89d10353d 100644
--- a/addons/api/addon/serializers/role.js
+++ b/addons/api/addon/serializers/role.js
@@ -3,14 +3,6 @@ import { get } from '@ember/object';
 
 export default class RoleSerializer extends ApplicationSerializer {
 
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
   // =methods
 
   /**
diff --git a/addons/api/addon/serializers/scope.js b/addons/api/addon/serializers/scope.js
deleted file mode 100644
index 5e336e65f..000000000
--- a/addons/api/addon/serializers/scope.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class ScopeSerializer extends ApplicationSerializer {
-
-  /**
-   * Serialize the scope ID into scope_id.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
-}
diff --git a/addons/api/addon/serializers/target.js b/addons/api/addon/serializers/target.js
index eb7fa1155..eae3ad5b1 100644
--- a/addons/api/addon/serializers/target.js
+++ b/addons/api/addon/serializers/target.js
@@ -2,14 +2,6 @@ import ApplicationSerializer from './application';
 
 export default class TargetSerializer extends ApplicationSerializer {
 
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
   // =methods
 
   /**
diff --git a/addons/api/addon/serializers/user.js b/addons/api/addon/serializers/user.js
deleted file mode 100644
index 7e9e54c21..000000000
--- a/addons/api/addon/serializers/user.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import ApplicationSerializer from './application';
-
-export default class UserSerializer extends ApplicationSerializer {
-
-  // =attributes
-
-  /**
-   * Serialized the scope ID into the `scope_id` field.
-   * @type {boolean}
-   */
-  serializeScopeID = true;
-
-}
diff --git a/addons/api/app/serializers/auth-method.js b/addons/api/app/serializers/auth-method.js
deleted file mode 100644
index 39dadcf9d..000000000
--- a/addons/api/app/serializers/auth-method.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/auth-method';
diff --git a/addons/api/app/serializers/host-catalog.js b/addons/api/app/serializers/host-catalog.js
deleted file mode 100644
index e2818e2c7..000000000
--- a/addons/api/app/serializers/host-catalog.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/host-catalog';
diff --git a/addons/api/app/serializers/host.js b/addons/api/app/serializers/host.js
deleted file mode 100644
index 33844fbaf..000000000
--- a/addons/api/app/serializers/host.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/host';
diff --git a/addons/api/app/serializers/scope.js b/addons/api/app/serializers/scope.js
deleted file mode 100644
index cdc15f3a2..000000000
--- a/addons/api/app/serializers/scope.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/scope';
diff --git a/addons/api/app/serializers/user.js b/addons/api/app/serializers/user.js
deleted file mode 100644
index 5c5a92643..000000000
--- a/addons/api/app/serializers/user.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'api/serializers/user';
diff --git a/addons/api/tests/unit/serializers/application-test.js b/addons/api/tests/unit/serializers/application-test.js
index 07385b071..df6dca9db 100644
--- a/addons/api/tests/unit/serializers/application-test.js
+++ b/addons/api/tests/unit/serializers/application-test.js
@@ -30,11 +30,9 @@ module('Unit | Serializer | application', function (hooks) {
     });
   });
 
-  test('it does not serialize scope_id when serializeScopeID is false', function (assert) {
-    assert.expect(2);
+  test('it serializes scope_id when scope is set', function (assert) {
+    assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('user');
-    serializer.serializeScopeID = false;
     const record = store.createRecord('user', {
       name: 'User',
       description: 'Description',
@@ -44,28 +42,6 @@ module('Unit | Serializer | application', function (hooks) {
       }
     });
     const serializedRecord = record.serialize();
-    assert.equal(serializer.serializeScopeID, false);
-    assert.deepEqual(serializedRecord, {
-      name: 'User',
-      description: 'Description'
-    });
-  });
-
-  test('it does serialize scope_id when serializeScopeID is true', function (assert) {
-    assert.expect(2);
-    const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('user');
-    serializer.serializeScopeID = true;
-    const record = store.createRecord('user', {
-      name: 'User',
-      description: 'Description',
-      scope: {
-        scope_id: 'global',
-        type: 'global'
-      }
-    });
-    const serializedRecord = record.serialize();
-    assert.equal(serializer.serializeScopeID, true);
     assert.deepEqual(serializedRecord, {
       name: 'User',
       description: 'Description',
diff --git a/addons/api/tests/unit/serializers/auth-method-test.js b/addons/api/tests/unit/serializers/auth-method-test.js
deleted file mode 100644
index 3ea3b3a32..000000000
--- a/addons/api/tests/unit/serializers/auth-method-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Serializer | auth method', function(hooks) {
-  setupTest(hooks);
-
-  // Replace this with your real tests.
-  test('it exists', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let serializer = store.serializerFor('auth-method');
-
-    assert.ok(serializer);
-  });
-
-  test('it serializes records', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let record = store.createRecord('auth-method', {});
-
-    let serializedRecord = record.serialize();
-
-    assert.ok(serializedRecord);
-  });
-  
-});
diff --git a/addons/api/tests/unit/serializers/host-catalog-test.js b/addons/api/tests/unit/serializers/host-catalog-test.js
deleted file mode 100644
index 64a20b044..000000000
--- a/addons/api/tests/unit/serializers/host-catalog-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Serializer | host catalog', function(hooks) {
-  setupTest(hooks);
-
-  // Replace this with your real tests.
-  test('it exists', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let serializer = store.serializerFor('host-catalog');
-
-    assert.ok(serializer);
-  });
-
-  test('it serializes records', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let record = store.createRecord('host-catalog', {});
-
-    let serializedRecord = record.serialize();
-
-    assert.ok(serializedRecord);
-  });
-});
diff --git a/addons/api/tests/unit/serializers/host-test.js b/addons/api/tests/unit/serializers/host-test.js
deleted file mode 100644
index c31a5ce4e..000000000
--- a/addons/api/tests/unit/serializers/host-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Serializer | host', function(hooks) {
-  setupTest(hooks);
-
-  // Replace this with your real tests.
-  test('it exists', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let serializer = store.serializerFor('host');
-
-    assert.ok(serializer);
-  });
-
-  test('it serializes records', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let record = store.createRecord('host', {});
-
-    let serializedRecord = record.serialize();
-
-    assert.ok(serializedRecord);
-  });
-});
diff --git a/addons/api/tests/unit/serializers/scope-test.js b/addons/api/tests/unit/serializers/scope-test.js
deleted file mode 100644
index d8b783344..000000000
--- a/addons/api/tests/unit/serializers/scope-test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Serializer | scope', function(hooks) {
-  setupTest(hooks);
-
-  test('it serializes scope_id into payloads', function (assert) {
-    assert.expect(2);
-    const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('scope');
-    serializer.serializeScopeID = true;
-    const record = store.createRecord('scope', {
-      name: 'My Scope',
-      description: 'Foo',
-      type: 'org',
-      scope: {
-        scope_id: 'global',
-        type: 'global'
-      }
-    });
-    const serializedRecord = record.serialize();
-    assert.equal(serializer.serializeScopeID, true);
-    assert.deepEqual(serializedRecord, {
-      name: 'My Scope',
-      description: 'Foo',
-      type: 'org',
-      scope_id: 'global'
-    });
-  });
-
-});
diff --git a/addons/api/tests/unit/serializers/user-test.js b/addons/api/tests/unit/serializers/user-test.js
deleted file mode 100644
index b96a53b13..000000000
--- a/addons/api/tests/unit/serializers/user-test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Serializer | user', function(hooks) {
-  setupTest(hooks);
-
-  // Replace this with your real tests.
-  test('it exists', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let serializer = store.serializerFor('user');
-
-    assert.ok(serializer);
-  });
-
-  test('it serializes records', function(assert) {
-    let store = this.owner.lookup('service:store');
-    let record = store.createRecord('user', {});
-
-    let serializedRecord = record.serialize();
-
-    assert.ok(serializedRecord);
-  });
-});