Merge pull request #2218 from stakwork/feat/fix_7days_pending_bounties

Refactor: Fixed 7 days payment reversal

db/workspaces.go

@@ -741,11 +741,11 @@ func (db database) ProcessReversePayments(paymentId uint) error {
 		log.Println("DepositAmount =====", depositAmount)
 
 		var withdrawalAmount uint
-		tx.Model(&NewPaymentHistory{}).Where("workspace_uuid = ?", workspace_uuid).Where("status = ?", true).Where("payment_type != ?", "deposit").Select("SUM(amount)").Row().Scan(&withdrawalAmount)
+		tx.Model(&NewPaymentHistory{}).Where("workspace_uuid = ?", workspace_uuid).Where("status = ?", true).Where("payment_type = ?", "withdraw").Select("SUM(amount)").Row().Scan(&withdrawalAmount)
 
 		log.Println("WithdrawalAmount =====", withdrawalAmount)
 
-		if withdrawalAmount > depositAmount {
+		if withdrawalAmount >= depositAmount {
 			tx.Rollback()
 			return errors.New("cannot perform this reversal")
 		}
@@ -793,5 +793,7 @@ func (db database) ProcessReversePayments(paymentId uint) error {
 		tx.Rollback()
 	}
 
+	log.Println("Reversed Payment Successfully =====", paymentId)
+
 	return tx.Commit().Error
 }