Merge pull request #10 from cosmos-gaminghub/dev

Dev

graphql/index.js

@@ -1,5 +1,6 @@
 const express = require('express')
 const { graphqlHTTP } = require('express-graphql')
+const cors = require('cors')
 
 // database
 const schema = require('./schema')
@@ -9,6 +10,11 @@ const resolver = new Root(new Service()).init()
 
 // Create an express server and a GraphQL endpoint
 const app = express()
+const corsOpts = {
+  origin: '*'
+}
+
+app.use(cors(corsOpts))
 app.use('/graphql',
   graphqlHTTP({
     schema: schema,

graphql/schema.graphql

@@ -22,6 +22,8 @@ type Validator {
   moniker: String
   operator_address: String
   address: String
+  totalTxs: Int
+  totalPoints: Int
 }
 
 type TxCount {

package.json

@@ -15,6 +15,7 @@
     "@cosmjs/stargate": "^0.26.0",
     "@graphql-tools/graphql-file-loader": "^7.1.0",
     "@graphql-tools/load": "^7.3.2",
+    "cors": "^2.8.5",
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "express-graphql": "^0.12.0",

service/Service.js

@@ -1,5 +1,6 @@
 const { sequelize, Mission, Validator } = require('../models')
 const { QueryTypes } = require('sequelize')
+const ValidatorResponse = require('./types/validatorResponse')
 
 class Service {
   async fetchMissions () {
@@ -23,12 +24,37 @@ class Service {
     const validator = await Validator.findOne(
       { where: { id: args.validatorID } }
     )
-    return validator
+    // get total_txs data
+    const txResult = await sequelize.query(
+      'SELECT COUNT(*) as totalTxs FROM `TXS` WHERE ( SELECT address FROM `validators` WHERE id = ?)',
+      {
+        replacements: [args.validatorID],
+        type: QueryTypes.SELECT
+      }
+    )
+
+    // get mission clear point data
+    const pointResult = await sequelize.query(
+      'SELECT sum(point) as totalPoints FROM missions WHERE id in (SELECT mission_id FROM point_histories WHERE validator_id = ?)',
+      {
+        replacements: [args.validatorID],
+        type: QueryTypes.SELECT
+      }
+    )
+
+    const res = new ValidatorResponse()
+      .setOperatorAddress(validator.operator_address)
+      .setAddress(validator.address)
+      .setMoniker(validator.moniker)
+      .setTotalTxs(txResult[0].totalTxs)
+      .setTotalPoints(pointResult[0].totalPoints)
+
+    return res
   }
 
   async fetchTxCount (args) {
     const result = await sequelize.query(
-      'SELECT COUNT(*) as total_txs FROM `TXS` WHERE ( SELECT address FROM `validators` WHERE id = ?)',
+      'SELECT COUNT(*) as totalTxs FROM `TXS` WHERE ( SELECT address FROM `validators` WHERE id = ?)',
       {
         replacements: [args.validatorID],
         type: QueryTypes.SELECT
@@ -52,7 +78,7 @@ class Service {
 
   async fetchMyPoint (args) {
     const result = await sequelize.query(
-      'SELECT sum(point) as total_point FROM missions WHERE id in (SELECT mission_id FROM point_histories WHERE validator_id = ?)',
+      'SELECT sum(point) as totalPoints FROM missions WHERE id in (SELECT mission_id FROM point_histories WHERE validator_id = ?)',
       {
         replacements: [args.validatorID],
         type: QueryTypes.SELECT

service/types/validatorResponse.js

@@ -0,0 +1,28 @@
+class ValidatorResponse {
+  setMoniker (a) {
+    this.moniker = a
+    return this
+  }
+
+  setOperatorAddress (a) {
+    this.operator_address = a
+    return this
+  }
+
+  setAddress (a) {
+    this.address = a
+    return this
+  }
+
+  setTotalTxs (a) {
+    this.totalTxs = a
+    return this
+  }
+
+  setTotalPoints (a) {
+    this.totalPoints = a
+    return this
+  }
+}
+
+module.exports = ValidatorResponse

tests/__tests__/services/fetchMissionResult.js

@@ -14,6 +14,6 @@ describe('Mission Histories', () => {
   test('Total of point is 30', async () => {
     const q = { validatorID: 1 }
     const res = await service.fetchMyPoint(q)
-    expect(res.total_point).toBe(30)
+    expect(res.totalPoints).toBe(30)
   })
 })

tests/__tests__/services/fetchValidators.js

@@ -12,11 +12,11 @@ describe('Validators Model', () => {
 describe('Validators Model', () => {
   test('Check validators columns', async () => {
     const q = { validatorID: 1 }
-    const validator = await service.fetchValidator(q)
+    const res = await service.fetchValidator(q)
 
-    const columns = Object.keys(validator.rawAttributes)
-    expect(columns.indexOf('operator_address')).toBe(1)
-    expect(columns.indexOf('moniker')).toBe(2)
-    expect(columns.indexOf('address')).toBe(3)
+    expect(res.operator_address).toBe('cosmosvaloper156gqf9837u7d4c4678yt3rl4ls9c5vuursrrzf')
+    expect(res.moniker).toBe('Binance Staking')
+    expect(res.address).toBe('cosmos156gqf9837u7d4c4678yt3rl4ls9c5vuuxyhkw6')
+    expect(res.totalPoints).toBe(30)
   })
 })