Merge pull request #2054 from OpenBazaar/brian.notification-fixes

cpacia · web-flow · commit de8d0fb35a78 · 2020-04-20T19:28:51.000-04:00
Fix for orders that have dispute acceptance but fulfilled state still
diff --git a/wallet/listeners/transaction_listener.go b/wallet/listeners/transaction_listener.go
@@ -75,6 +75,18 @@ func (l *TransactionListener) cleanupOrderState(isSale bool, contract *pb.Ricard
 			log.Errorf("Error saving new order state: %s", err)
 		}
 	}
+
+	if contract.DisputeAcceptance != nil && state == pb.OrderState_FULFILLED {
+		log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_DECIDED)
+		if isSale {
+			err = l.db.Sales().Put(orderId, *contract, pb.OrderState_DECIDED, false)
+		} else {
+			err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_DECIDED, false)
+		}
+		if err != nil {
+			log.Errorf("Error saving new order state: %s", err)
+		}
+	}
 }
 
 func (l *TransactionListener) OnTransactionReceived(cb wallet.TransactionCallback) {

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,18 @@ func (l TransactionListener) cleanupOrderState(isSale bool, contract pb.Ricard`
`75`	`75`	`log.Errorf("Error saving new order state: %s", err)`
`76`	`76`	`}`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ if contract.DisputeAcceptance != nil && state == pb.OrderState_FULFILLED {`
	`80`	`+ log.Infof("Out of sync order. Found %s and should be %s\n", state, pb.OrderState_DECIDED)`
	`81`	`+ if isSale {`
	`82`	`+ err = l.db.Sales().Put(orderId, *contract, pb.OrderState_DECIDED, false)`
	`83`	`+ } else {`
	`84`	`+ err = l.db.Purchases().Put(orderId, *contract, pb.OrderState_DECIDED, false)`
	`85`	`+ }`
	`86`	`+ if err != nil {`
	`87`	`+ log.Errorf("Error saving new order state: %s", err)`
	`88`	`+ }`
	`89`	`+ }`
`78`	`90`	`}`
`79`	`91`
`80`	`92`	`func (l *TransactionListener) OnTransactionReceived(cb wallet.TransactionCallback) {`