Refactoring reward contributor for passing in reward and reserved val…

.dockerignore

@@ -1,2 +1 @@
 db/*
-node_modules

.travis.yml

@@ -0,0 +1,40 @@
+sudo: required
+
+language: node_js
+
+node_js:
+- "7"
+
+services:
+  - docker
+
+env:
+  - DOCKER_COMPOSE_VERSION=1.11.2
+
+addons:
+  apt:
+    packages:
+    - linux-image-extra-$(uname -r)
+    - linux-image-extra-virtual
+    - apt-transport-https
+    - ca-certificates
+    - curl
+    - software-properties-common
+    - docker-ce=17.06.0~ce-0~ubuntu
+
+before_install:
+  # update is required to update the repositories to see the new packages for
+  # Docker.
+
+  # Print out the current docker-compose version. Once this reports 1.6+ then we
+  # do not need the following steps.
+  - docker-compose --version
+
+  # Update docker-compose version
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+
+  # Run docker-compose
+  - docker-compose up --build ./test/docker-compose.yml

dist/contract/deploy.js

@@ -32,7 +32,7 @@ function deploy(_ref) {
 
   return new _bluebird2.default(function (resolve, reject) {
 
-    var msgID = 'deploy_contract_' + new Date().getTime();
+    var msgID = 'deploy_contract_' + new Date().getTime() + '_' + tokenDetails['organization'];
 
     var payload = {
       id: msgID,

dist/contract/rewardContributor.js

@@ -22,26 +22,36 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /**
  * [rewardContributor description]
- * @param  {[type]} eventDetails [description]
- * @return [type]                [description]
+ * @param  {[type]} contributor   [description]
+ * @param  {[type]} event         [description]
+ * @param  {[type]} eventType     [description]
+ * @param  {[type]} rewardValue   [description]
+ * @param  {[type]} reservedValue [description]
+ * @param  {[type]} deliveryID    [description]
+ * @return [type]                 [description]
  */
 function rewardContributor(_ref) {
   var _this = this;
 
-  var eventDetails = _ref.eventDetails;
+  var contributor = _ref.contributor,
+      event = _ref.event,
+      eventType = _ref.eventType,
+      rewardValue = _ref.rewardValue,
+      reservedValue = _ref.reservedValue,
+      deliveryID = _ref.deliveryID;
 
   return new _bluebird2.default(function (resolve, reject) {
-    var msgID = 'reward_contributor_' + new Date().getTime();
+    var msgID = 'reward_' + contributor + '_' + new Date().getTime() + '_' + deliveryID;
 
-    _this.calculateRewardBonus({ eventDetails: eventDetails }).then(function (rewardBonus) {
-      var params = [eventDetails['contributor'], eventDetails['event'], eventDetails['action'], rewardBonus, eventDetails['delivery_id']];
+    try {
+      var params = [contributor, event, eventType, rewardValue, reservedValue, deliveryID];
 
       _this.signer.write((0, _stringify2.default)({
         id: msgID,
         event: 'sign_contract_transaction',
         data: {
           recoveryShare: _this.recoveryShare,
-          organization: eventDetails['organization'],
+          organization: organization,
           method: 'rewardContributor',
           params: params
         }
@@ -59,8 +69,8 @@ function rewardContributor(_ref) {
           reject(result);
         }
       });
-    }).catch(function (error) {
+    } catch (error) {
       reject(error);
-    });
+    }
   });
 }

dist/events/gollumEvent.js

@@ -0,0 +1,48 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = gollumEvent;
+
+var _bluebird = require('bluebird');
+
+var _bluebird2 = _interopRequireDefault(_bluebird);
+
+var _gittokenRewardValues = require('gittoken-reward-values');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * [gollumEvent description]
+ * @param  {[type]} payload [description]
+ * @param  {[type]} headers [description]
+ * @return [type]           [description]
+ */
+function gollumEvent(_ref) {
+  var _this = this;
+
+  var payload = _ref.payload,
+      headers = _ref.headers;
+
+  return new _bluebird2.default(function (resolve, reject) {
+    var pages = payload.pages;
+
+
+    _bluebird2.default.resolve(pages).map(function (page, i) {
+      return _this.rewardContributor({
+        contributor: payload['sender']['login'],
+        event: 'gollum',
+        eventType: payload[page.action],
+        rewardValue: _gittokenRewardValues.rewardValues['gollum'][page.action],
+        reservedValue: _gittokenRewardValues.reservedValues['gollum'][page.action],
+        deliveryID: headers['x-github-delivery'] + '-' + i,
+        organization: payload['organization']['login']
+      });
+    }).then(function (receipts) {
+      resolve(receipts);
+    }).catch(function (error) {
+      reject(error);
+    });
+  });
+}

dist/events/index.js

@@ -3,12 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pingEvent = undefined;
+exports.gollumEvent = exports.pingEvent = undefined;
 
 var _pingEvent = require('./pingEvent');
 
 var _pingEvent2 = _interopRequireDefault(_pingEvent);
 
+var _gollumEvent = require('./gollumEvent');
+
+var _gollumEvent2 = _interopRequireDefault(_gollumEvent);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-exports.pingEvent = _pingEvent2.default;
+exports.pingEvent = _pingEvent2.default;
+exports.gollumEvent = _gollumEvent2.default;

dist/events/pingEvent.js

@@ -3,11 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _stringify = require('babel-runtime/core-js/json/stringify');
-
-var _stringify2 = _interopRequireDefault(_stringify);
-
 exports.default = pingEvent;
 
 var _bluebird = require('bluebird');
@@ -25,27 +20,37 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function pingEvent(_ref) {
   var _this = this;
 
-  var eventDetails = _ref.eventDetails,
+  var payload = _ref.payload,
+      headers = _ref.headers,
       tokenDetails = _ref.tokenDetails;
 
   return new _bluebird2.default(function (resolve, reject) {
     var receipts = [];
 
     _this.deploy({ tokenDetails: tokenDetails }).then(function (txReceipt) {
       receipts.push(txReceipt);
-      return _this.rewardContributor({ eventDetails: eventDetails });
+      return _this.rewardContributor({
+        contributor: payload['sender']['login'],
+        event: 'ping',
+        eventType: '',
+        rewardValue: rewardValues['ping'],
+        reservedValue: reservedValues['ping'],
+        deliveryID: headers['x-github-delivery'],
+        organization: payload['organization']['login']
+      });
     }).then(function (txReceipt) {
       receipts.push(txReceipt);
 
-      var data = {
+      /*
+      NOTE: Consider removing Listener Service from Webhook process.
+       const data = {
         organization: tokenDetails['organization'],
         token: receipts[0]['contractAddress']
-      };
-
-      console.log('Sending Data ' + (0, _stringify2.default)(data) + ' to Event Listener');
-
-      // Setup Event Listener for newly deployed token
-      _this.watcher.eventListener.write((0, _stringify2.default)({ type: 'WATCH_TOKEN', data: data }));
+      }
+       console.log(`Sending Data ${JSON.stringify(data)} to Event Listener`)
+       // Setup Event Listener for newly deployed token
+      this.watcher.eventListener.write(JSON.stringify({ type: 'WATCH_TOKEN', data }))
+       */
 
       resolve(receipts);
     }).catch(function (error) {

dist/index.js

@@ -110,9 +110,9 @@ var GitTokenWebHookManager = function (_GitTokenSignerClient) {
     _this.webhookRouter = _index12.default.bind(_this);
     _this.handleWebHookEvent = _index8.handleWebHookEvent.bind(_this);
     _this.rewardContributor = _index10.rewardContributor.bind(_this);
-    _this.calculateRewardBonus = _index5.calculateRewardBonus.bind(_this);
     _this.deploy = _index10.deploy.bind(_this);
     _this.pingEvent = _index9.pingEvent.bind(_this);
+    _this.gollumEvent = _index9.gollumEvent.bind(_this);
 
     // Variables
     _this.signerIpcPath = signerIpcPath;