DigixGlobal#70 resend transaction mutation test + fixed watched trans…

…action resolver

app/graphql/mutations/resend_transaction_mutation.rb

@@ -30,18 +30,15 @@ class ResendTransactionMutation < Types::Base::BaseMutation
     def resolve(id:, transaction_object:, signed_transaction:)
       key = :watched_transaction
 
-      unless (old = WatchingTransaction.find(id))
-        return form_error(key, 'transaction_object', 'Previous transaction not found')
-      end
-
+      old = WatchingTransaction.find(id)
       old_data = JSON.parse(old.transaction_object)
       data = JSON.parse(transaction_object)
 
-      unless old_data.nonce == data.nonce
+      unless old_data['nonce'] == data['nonce']
         return form_error(key, 'id', 'Nonce is not the same as the previous')
       end
 
-      result, tx_or_errors = WatchingTransaction.resend(
+      result, tx_or_errors = WatchingTransaction.watch(
         context.fetch(:current_user),
         transaction_object,
         signed_transaction,
@@ -54,6 +51,8 @@ def resolve(id:, transaction_object:, signed_transaction:)
       when :ok
         model_result(key, tx_or_errors)
       end
+    rescue ActiveRecord::RecordNotFound
+      return form_error(key, 'transaction_object', 'Previous transaction not found')
     end
 
     def self.authorized?(object, context)

app/graphql/resolvers/watched_transaction_resolver.rb

@@ -9,7 +9,8 @@ class WatchedTransactionResolver < Resolvers::Base
              description: 'Find the last watched transaction in the group with that txhash'
 
     def resolve(txhash:)
-      WatchingTransaction.find_by(txhash: txhash) # TODO or get group_id from this one and find latter by it?
+      tx = WatchingTransaction.find_by(txhash: txhash)
+      WatchingTransaction.find_by(group_id: tx.group_id).last
     end
 
     def self.authorized?(object, context)

app/graphql/schema.graphql

@@ -467,26 +467,6 @@ type CommentUpdatedPayload {
   comment: UpdatedComment!
 }
 
-"""
-Country for KYC Registration
-"""
-type WatchedTransaction {
-  """
-  UUID of the watched transaction
-  """
-  id: ID!
-
-  """
-  Signer of the transaction
-  """
-  user: User!
-
-  """
-  The JSONified transaction data object
-  """
-  transactionObject: String
-}
-
 """
 Country for KYC Registration
 """
@@ -1148,18 +1128,18 @@ type Mutation {
   """
   postComment(input: PostCommentMutationInput!): PostCommentMutationPayload
 
-  """
-  Given a transaction, save it to the database to be resent.
-  """
-  watchTransaction(input: WatchTransactionMutationInput!): WatchTransactionMutationPayload
-
   """
   As a KYC officer, reject a pending KYC with a reason.
 
   Role: KYC Officer
   """
   rejectKyc(input: RejectKycMutationInput!): RejectKycMutationPayload
 
+  """
+  Given an old transaction, resend it with new parameters or gas prices
+  """
+  resendTransaction(input: ResendTransactionMutationInput!): ResendTransactionMutationPayload
+
   """
   As the current user, submit a KYC to access more features of the app.
 
@@ -1196,6 +1176,11 @@ type Mutation {
   Can only unpost a comment you posted.
   """
   unpostComment(input: UnpostCommentMutationInput!): UnpostCommentMutationPayload
+
+  """
+  Given a transaction, save it to the database to be resent
+  """
+  watchTransaction(input: WatchTransactionMutationInput!): WatchTransactionMutationPayload
 }
 
 """
@@ -1280,36 +1265,6 @@ type PostCommentMutationPayload {
   errors: [UserError!]!
 }
 
-"""
-Autogenerated input type of WatchTransactionMutation
-"""
-input WatchTransactionMutationInput {
-  """
-  The JSONified transaction data object
-  """
-  transactionObject: String!
-
-  """
-  Signed transaction in HEX format
-  """
-  signedTransaction: String!
-}
-
-"""
-Autogenerated return type of PostCommentMutation
-"""
-type WatchTransactionMutationPayload {
-  """
-  Newly created transaction
-  """
-  watchedTransaction: WatchedTransaction
-
-  """
-  Mutation errors
-  """
-  errors: [UserError!]!
-}
-
 """
 DAO proposals/projects to be voted and funded for
 """
@@ -1642,6 +1597,16 @@ type Query {
     """
     id: String!
   ): AuthorizedUser
+
+  """
+  Given a transaction txhash, find the last watched transaction in the group with that txhash.
+  """
+  watchedTransaction(
+    """
+    Find the last watched transaction in the group with that txhash
+    """
+    txhash: String!
+  ): WatchedTransaction
 }
 
 """
@@ -1707,6 +1672,55 @@ A rejection rason represented by a string that comes form `RejectionReason.value
 """
 scalar RejectionReasonValue
 
+"""
+Autogenerated input type of ResendTransactionMutation
+"""
+input ResendTransactionMutationInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  ID of the transaction to be resent
+  """
+  id: String!
+
+  """
+  Signed transaction in HEX format
+  """
+  signedTransaction: String!
+
+  """
+  The JSONified transaction data object
+  """
+  transactionObject: String!
+}
+
+"""
+Autogenerated return type of ResendTransactionMutation
+"""
+type ResendTransactionMutationPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Mutation errors
+
+  Operation Errors:
+  - Previous transaction not found
+  - Nonce is not the same as the previous
+  """
+  errors: [UserError!]!
+
+  """
+  Newly created transaction
+  """
+  watchedTransaction: WatchedTransaction
+}
+
 """
 Customer residence proof for KYC submission
 """
@@ -2469,3 +2483,63 @@ enum VotingStageEnum {
   """
   REVEAL
 }
+
+"""
+Autogenerated input type of WatchTransactionMutation
+"""
+input WatchTransactionMutationInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Signed transaction in HEX format
+  """
+  signedTransaction: String!
+
+  """
+  The JSONified transaction data object
+  """
+  transactionObject: String!
+}
+
+"""
+Autogenerated return type of WatchTransactionMutation
+"""
+type WatchTransactionMutationPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Mutation errors
+  """
+  errors: [UserError!]!
+
+  """
+  Newly created transaction
+  """
+  watchedTransaction: WatchedTransaction
+}
+
+"""
+Transactions that are being watched in the blockchain
+"""
+type WatchedTransaction {
+  """
+  UUID of the watched transaction
+  """
+  id: ID!
+
+  """
+  The JSONified transaction data object
+  """
+  transactionObject: String!
+
+  """
+  Signer of the transaction
+  """
+  user: User!
+}