Merge branch 'staging'

eoscostarica · Sep 3, 2021 · 8480562 · 8480562
2 parents 937370e + 7576bfd
commit 8480562
Show file tree

Hide file tree

Showing 10 changed files with 261 additions and 70 deletions.
diff --git a/hapi/src/index.js b/hapi/src/index.js
@@ -33,7 +33,7 @@ const init = async () => {
         if (!input) throw new Error('Invalid ratebp Input')
 
         const {
-          ratingInput: { user, producer }
+          ratingInput: { user, producer, transacction }
         } = input
         const isValidAccountName = accountValidation([
           { name: user, type: 'user account' },
@@ -44,7 +44,7 @@ const init = async () => {
           throw new Error(isValidAccountName.message)
 
         const resultEden = await updateBpStats(producer)
-        const result = await updateUserRatings(user, producer)
+        const result = await updateUserRatings(user, producer, transacction)
 
         return { resultEden: resultEden, ...result }
       } catch (error) {

diff --git a/hapi/src/libs/sync-user-rating.js b/hapi/src/libs/sync-user-rating.js
@@ -24,7 +24,7 @@ const getUserRatings = async () => {
 }
 
 // updates the postgresdb
-const updateUserRatings = async (userAccount, bpAccount) => {
+const updateUserRatings = async (userAccount, bpAccount, transaction) => {
   console.log('==== Updating user ratings ====')
 
   try {
@@ -51,15 +51,17 @@ const updateUserRatings = async (userAccount, bpAccount) => {
       uniq_rating: blockProducer.uniq_rating,
       user: blockProducer.user,
       bp: blockProducer.bp,
-      ratings: ratings
+      ratings: ratings,
+      tx_data: transaction
     })
 
     if (!result) {
       const insertResult = await (await massiveDB).user_ratings.insert({
         uniq_rating: blockProducer.uniq_rating,
         user: blockProducer.user,
         bp: blockProducer.bp,
-        ratings
+        ratings,
+        tx_data: transaction
       })
 
       if (!insertResult)

diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
@@ -7,6 +7,7 @@ type Mutation {
 input RatingInput {
   user: String!
   producer: String!
+  transacction: jsonb!
 }
 
 type RatingOutput {

diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json
@@ -151,7 +151,17 @@
     "core_liquid_balance": "Liquid Balance",
     "inactive": "Inactive",
     "logout": "Logout",
-    "title": "Profile for account"
+    "title": "Profile for account",
+    "yourRating": "Your Rating",
+    "unpublish": "REMOVE RATING",
+    "youRated": "You rated",
+    "infrastructure": "Infrastructure",
+    "transparency": "Transparency",
+    "trustiness": "Trustiness",
+    "community": "Community",
+    "development": "Development",
+    "voteWithoutLogin": "You need to login to execute this action",
+    "success" : "Success!"
   },
 
   "bpRatePage": {

diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json
@@ -151,7 +151,17 @@
     "core_liquid_balance": "Balance Líquido",
     "inactive": "Inactiva",
     "logout": "Cerrar Sesión",
-    "title": "Perfil para cuenta"
+    "title": "Perfil para cuenta",
+    "yourRating": "Su calificación",
+    "unpublish": "ANULAR CALIFICACIÓN",
+    "youRated": "Tu calificaste",
+    "infrastructure": "Infraestructura",
+    "transparency": "Transparencia",
+    "trustiness": "Lealtad",
+    "community": "Comunidad",
+    "development": "Desarrollo",
+    "voteWithoutLogin": "Necesitas iniciar sesión para ejecutar esta acción",
+    "success" : "¡Éxito!"
   },
 
   "bpRatePage": {
@@ -215,7 +225,7 @@
     "voteWithoutLogin": "Necesita iniciar sesión para votar por un proxy",
     "totalVotes": "Total de votos",
     "labelTool": "vota por",
-    "success" : "Éxito!",
+    "success" : "¡Éxito!",
     "title": "Calificaciones de productor de bloques EOS",
     "proxyProfile": "Reseñas sobre EOS proxy"
   },

diff --git a/webapp/src/models/BlockProducer/blockProducers.js b/webapp/src/models/BlockProducer/blockProducers.js
@@ -21,6 +21,7 @@ const initialState = {
   producer: null,
   userRate: null,
   edenRate: null,
+  transacction: null,
   showSortSelected: false
 }
 
@@ -108,6 +109,9 @@ const Proxies = {
     },
     addEdenRate(state, edenRate) {
       return { ...state, edenRate }
+    },
+    addTransacction(state, transacction) {
+      return { ...state, transacction }
     }
   },
   effects: (dispatch) => ({
@@ -122,6 +126,9 @@ const Proxies = {
         filters
       )
     },
+    async saveLastTransaction(transacction) {
+      this.addTransacction(transacction)
+    },
     async getBlockProducerByOwner(owner, state) {
       try {
         dispatch.isLoading.storeIsContentLoading(true)
@@ -215,7 +222,11 @@ const Proxies = {
           data: { rateProducer }
         } = await apolloClient.mutate({
           variables: {
-            ratingInput: { producer: bp, user }
+            ratingInput: {
+              producer: bp,
+              user,
+              transacction: state.blockProducers.transacction
+            }
           },
           mutation: MUTATION_UPDATE_RATING
         })

diff --git a/webapp/src/models/User/query_get_rates.js b/webapp/src/models/User/query_get_rates.js
@@ -2,11 +2,12 @@ import gql from 'graphql-tag'
 
 const QUERY_RATING = gql`
   query getRates($user: String) {
-    user_ratings(where: { user: { _eq: $user } }) {
+    user_ratings(where: { user: { _eq: $user } }, order_by: { tx_data: asc }) {
       bp
       ratings
       uniq_rating
       user
+      tx_data
     }
   }
 `