From 399ee27af975ed71720bebb510e32798d3840a8d Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Sun, 15 Apr 2018 16:35:31 +0000
Subject: [PATCH] Revert "Adjust for new naming conventions"

---
 app/components/add-contributor/component.js  |  8 ++++----
 app/components/add-contributor/template.hbs  |  6 +++---
 app/components/contributor-list/template.hbs |  2 +-
 app/controllers/index.js                     |  6 ++++--
 app/lib/kredits/contracts/contributor.js     | 10 +++++++++-
 app/lib/kredits/contracts/operator.js        | 10 +++++++++-
 app/models/contributor.js                    |  3 ++-
 app/models/proposal.js                       |  2 +-
 app/services/kredits.js                      |  5 +++++
 app/templates/index.hbs                      |  2 +-
 10 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/components/add-contributor/component.js b/app/components/add-contributor/component.js
index 254ec95..13c83da 100644
--- a/app/components/add-contributor/component.js
+++ b/app/components/add-contributor/component.js
@@ -9,7 +9,7 @@ export default Component.extend({
 
   // Default attributes used by reset
   attributes: {
-    account: null,
+    address: null,
     name: null,
     kind: 'person',
     url: null,
@@ -24,9 +24,9 @@ export default Component.extend({
     this.reset();
   },
 
-  isValidAccount: computed('kredits.ethProvider', 'account', function() {
+  isValidAddress: computed('kredits.ethProvider', 'address', function() {
     // TODO: add proper address validation
-    return this.get('account') !== '';
+    return this.get('address') !== '';
   }),
   isValidName: isPresent('name'),
   isValidURL: isPresent('url'),
@@ -34,7 +34,7 @@ export default Component.extend({
   isValidGithubUsername: isPresent('github_username'),
   isValidWikiUsername: isPresent('wiki_username'),
   isValid: and(
-    'isValidAccount',
+    'isValidAddress',
     'isValidName',
     'isValidGithubUID'
   ),
diff --git a/app/components/add-contributor/template.hbs b/app/components/add-contributor/template.hbs
index c47fd92..ded7d47 100644
--- a/app/components/add-contributor/template.hbs
+++ b/app/components/add-contributor/template.hbs
@@ -9,11 +9,11 @@
     </label>
   </p>
   <p>
-    {{input name="account"
+    {{input name="address"
             type="text"
             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-            value=account
-            class=(if isValidAccount 'valid' '')}}
+            value=address
+            class=(if isValidAddress 'valid' '')}}
   </p>
   <p>
     <select required onchange={{action (mut kind) value="target.value"}}>
diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs
index c74ddcb..93feeb3 100644
--- a/app/components/contributor-list/template.hbs
+++ b/app/components/contributor-list/template.hbs
@@ -13,7 +13,7 @@
     <tr class="metadata {{if contributor.isCurrentUser 'current-user'}} {{if contributor.showMetadata 'visible'}}">
       <td colspan="2">
         <ul>
-          <li><a href="https://testnet.etherscan.io/address/{{contributor.account}}">Inspect Ethereum transactions</a></li>
+          <li><a href="https://testnet.etherscan.io/address/{{contributor.address}}">Inspect Ethereum transactions</a></li>
           {{#if contributor.ipfsHash}}
             <li><a href="https://ipfs.io/ipfs/{{contributor.ipfsHash}}">Inspect IPFS profile</a></li>
           {{/if}}
diff --git a/app/controllers/index.js b/app/controllers/index.js
index a82343a..1f5ca43 100644
--- a/app/controllers/index.js
+++ b/app/controllers/index.js
@@ -40,6 +40,7 @@ export default Controller.extend({
   proposalsOpenSorted: sort('proposalsOpen', 'proposalsSorting'),
 
   _handleProposalCreated(proposalId) {
+    // TODO: check if proposalId is already a string
     let proposal = this.get('proposals')
                        .findBy('id', proposalId.toString());
     if (proposal) {
@@ -52,6 +53,7 @@ export default Controller.extend({
   },
 
   _handleProposalExecuted(proposalId, recipientId, amount) {
+    // TODO: check if proposalId is already a string
     let proposal = this.get('proposals')
                        .findBy('id', proposalId.toString());
 
@@ -78,10 +80,10 @@ export default Controller.extend({
   _handleTransfer(from, to, value) {
     value = value.toNumber();
     this.get('contributors')
-        .findBy('account', from)
+        .findBy('address', from)
         .decrementProperty('balance', value);
     this.get('contributors')
-        .findBy('account', to)
+        .findBy('address', to)
         .incrementProperty('balance', value);
   },
 
diff --git a/app/lib/kredits/contracts/contributor.js b/app/lib/kredits/contracts/contributor.js
index b61cfc4..3e8ab1e 100644
--- a/app/lib/kredits/contracts/contributor.js
+++ b/app/lib/kredits/contracts/contributor.js
@@ -25,6 +25,14 @@ export default class Contributor extends Base {
     id = ethers.utils.bigNumberify(id);
 
     return this.functions.getContributorById(id)
+      .then((data) => {
+        // TODO: remove as soon as the contract provides the id
+        data.id = id;
+        // TODO: rename address to account
+        data.address = data.account;
+
+        return data;
+      })
       // Fetch IPFS data if available
       .then((data) => {
         return Kredits.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
@@ -39,7 +47,7 @@ export default class Contributor extends Base {
       .add(json)
       .then((ipfsHashAttr) => {
         let contributor = [
-          contributorAttr.account,
+          contributorAttr.address,
           ipfsHashAttr.ipfsHash,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
diff --git a/app/lib/kredits/contracts/operator.js b/app/lib/kredits/contracts/operator.js
index cd37573..0ad7f8d 100644
--- a/app/lib/kredits/contracts/operator.js
+++ b/app/lib/kredits/contracts/operator.js
@@ -24,7 +24,15 @@ export default class Operator extends Base {
   getById(id) {
     id = ethers.utils.bigNumberify(id);
 
-    return this.functions.getProposal(id)
+    return this.functions.proposals(id)
+      .then((data) => {
+        // TODO: remove as soon as the contract provides the id
+        data.id = id;
+        // TODO: rename creatorAddress to creator
+        data.creatorAddress = data.creator;
+
+        return data;
+      })
       // Fetch IPFS data if available
       .then((data) => {
         return Kredits.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
diff --git a/app/models/contributor.js b/app/models/contributor.js
index ba6b2ca..127f44f 100644
--- a/app/models/contributor.js
+++ b/app/models/contributor.js
@@ -5,7 +5,8 @@ import bignumber from 'kredits-web/utils/cps/bignumber';
 export default EmberObject.extend({
   // Contract
   id: bignumber('idRaw', 'toString'),
-  account: null,
+  // TODO: Should we rename it to account like in the contract?
+  address: null,
   balance: bignumber('balanceRaw', 'toNumber'),
   isCore: false,
   ipfsHash: null,
diff --git a/app/models/proposal.js b/app/models/proposal.js
index b193414..88594e4 100644
--- a/app/models/proposal.js
+++ b/app/models/proposal.js
@@ -5,7 +5,7 @@ import bignumber from 'kredits-web/utils/cps/bignumber';
 export default EmberObject.extend({
   // Contract
   id: bignumber('idRaw', 'toString'),
-  creatorAccount: null,
+  creatorAddress: null,
   recipientId: bignumber('recipientIdRaw', 'toString'),
   amount: bignumber('amountRaw', 'toNumber'),
   votesCount: bignumber('votesCountRaw', 'toNumber'),
diff --git a/app/services/kredits.js b/app/services/kredits.js
index 24abc07..8f4f477 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -79,6 +79,11 @@ export default Service.extend({
     debug('[kredits] build', name, attributes);
     let model = getOwner(this).lookup(`model:${name}`);
 
+    // coerce id to string
+    if (attributes.id) {
+      attributes.id = attributes.id.toString();
+    }
+
     model.setProperties(attributes);
     return model;
   },
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 0dd64ee..5ad6e8b 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -5,7 +5,7 @@
       {{#if kredits.currentUserIsCore }}
         (core)
       {{/if}}
-      Account: {{kredits.currentUser.account}}
+      Account: {{kredits.currentUser.address}}
     {{/if}}
   </section>
 {{/if}}