fixes

Author: urmaul

migrations/20171029004746-claims.js

@@ -17,10 +17,10 @@ exports.setup = function(options, seedLink) {
 exports.up = function(db, callback) {
   db.createTable('claims', {
       id: {
-          type: 'int',
+          type: 'string',
+          length: 100,
           notNull: true,
-          primaryKey: true,
-          autoIncrement: true
+          primaryKey: true
       },
       user_id: {
           type: 'string',

package.json

@@ -29,6 +29,7 @@
     "nodemon": "^1.12.1",
     "solc": "^0.4.18",
     "sqlite3": "^3.1.13",
+    "uuid": "^3.1.0",
     "web3": "^1.0.0-beta.24"
   }
 }

src/claim/index.js

@@ -9,9 +9,8 @@ const Timestamps = require('../services/timestamps');
 
 router.post('/', function(req, res, next) {
   stats(req.googleApiClient, Timestamps.yesterday(), Timestamps.today()).then(yesterdaysResult => {
-    console.log('User', req.user);
-    console.log('User id', req.user.id);
     tryToClaim(req.user.id, yesterdaysResult.reward).then((claim) => {
+        console.log('User', req.user);
         console.log('Claim', claim);
         res.json(chain.claimCoinsForAddress(req.user.wallet, yesterdaysResult.reward, claim.id));
     }, (error) => {

src/models/claims.js

@@ -1,11 +1,13 @@
 const db = require("../services/sqlite");
 const Timestamps = require("../services/timestamps");
+const uuid = require("uuid/v4");
 
 function newClaim(userId, amount) {
     return {
+        id: uuid(),
         user_id: userId,
         amount: amount,
-        lastTimestamp: Timestamps.today(),
+        completed_timestamp: Timestamps.today(),
     };
 }
 
@@ -19,19 +21,20 @@ function findLastUserClaim(userId) {
 
 function createClaim(claim) {
     db.run(
-        "INSERT INTO claims (user_id, amount, completed_timestamp) VALUES (?, ?, ?)",
-        claim.userId,
+        "INSERT INTO claims (id, user_id, amount, completed_timestamp) VALUES (?, ?, ?, ?)",
+        claim.id,
+        claim.user_id,
         claim.amount,
-        claim.completedTimestamp
+        claim.completed_timestamp
     );
 }
 let tryToClaim = function(userId, amount) {
     return new Promise((resolve, reject) => {
         findLastUserClaim(userId).then(claim => {
             if (!claim || claim.completed_timestamp < Timestamps.today()) {
-                newClaim = newClaim(userId, amount)
-                createClaim(newClaim);
-                resolve(newClaim);
+                let nclaim = newClaim(userId, amount)
+                createClaim(nclaim);
+                resolve(nclaim);
             } else {
               reject('This claim exists')
             }

src/services/chain.js

@@ -27,8 +27,10 @@ class Chain {
         return false;
       }
       let promise = new Promise((resolve, reject) => {
-        let owner = this.mainContract.methods.owner().call({}, (error, owner) => {
+        this.mainContract.methods.owner().call({}, (error, owner) => {
+          console.log('Owner', owner);
           this.web3.eth.personal.unlockAccount(owner, local.password, (error, result) => {
+            id = Date.now();
             this.mainContract.methods.sendPersonalSportReward(address, amount, id).send(
               {from: owner},
               (error, result) => {