Merge pull request #1954 from stakwork/fix/gorm_falsify

PR: Updated ProcessBountyPayment function
stakwork · Nov 15, 2024 · 27c7a69 · 27c7a69
2 parents d054a05 + 3aedcb4
commit 27c7a69
Show file tree

Hide file tree

Showing 6 changed files with 955 additions and 489 deletions.
diff --git a/db/db.go b/db/db.go
@@ -1337,6 +1337,21 @@ func (db database) GetBounty(id uint) NewBounty {
 	return b
 }
 
+func (db database) UpdateBountyPaymentStatuses(bounty NewBounty) (NewBounty, error) {
+
+	bountyUpdates := map[string]interface{}{
+		"paid":            bounty.Paid,
+		"payment_pending": bounty.PaymentPending,
+		"payment_failed":  bounty.PaymentFailed,
+		"completed":       bounty.Completed,
+		"paid_date":       bounty.PaidDate,
+		"completion_date": bounty.CompletionDate,
+	}
+
+	db.db.Model(&NewBounty{}).Where("created", bounty.Created).Updates(bountyUpdates)
+	return bounty, nil
+}
+
 func (db database) UpdateBounty(b NewBounty) (NewBounty, error) {
 	db.db.Where("created", b.Created).Updates(&b)
 	return b, nil

diff --git a/db/interface.go b/db/interface.go
@@ -51,6 +51,7 @@ type Database interface {
 	GetBountyByCreated(created uint) (NewBounty, error)
 	GetBounty(id uint) NewBounty
 	UpdateBounty(b NewBounty) (NewBounty, error)
+	UpdateBountyPaymentStatuses(bounty NewBounty) (NewBounty, error)
 	UpdateBountyPayment(b NewBounty) (NewBounty, error)
 	GetListedOffers(r *http.Request) ([]PeopleExtra, error)
 	UpdateBot(uuid string, u map[string]interface{}) bool

diff --git a/db/workspaces.go b/db/workspaces.go
@@ -477,8 +477,17 @@ func (db database) ProcessBountyPayment(payment NewPaymentHistory, bounty NewBou
 			return err
 		}
 
+		bountyUpdates := map[string]interface{}{
+			"paid":            bounty.Paid,
+			"payment_pending": bounty.PaymentPending,
+			"payment_failed":  bounty.PaymentFailed,
+			"completed":       bounty.Completed,
+			"paid_date":       bounty.PaidDate,
+			"completion_date": bounty.CompletionDate,
+		}
+
 		// updatge bounty status
-		if err = tx.Where("created", bounty.Created).Updates(&bounty).Error; err != nil {
+		if err = tx.Model(&NewBounty{}).Where("created", bounty.Created).Updates(bountyUpdates).Error; err != nil {
 			tx.Rollback()
 			return err
 		}

diff --git a/handlers/bounty.go b/handlers/bounty.go
@@ -691,12 +691,13 @@ func (h *bountyHandler) MakeBountyPayment(w http.ResponseWriter, r *http.Request
 
 			// if the payment has a completed status
 			if v2KeysendRes.Status == db.PaymentComplete {
-				bounty.Paid = true
 				bounty.PaymentFailed = false
 				bounty.PaymentPending = false
+				bounty.Paid = true
 				bounty.PaidDate = &now
 				bounty.Completed = true
 				bounty.CompletionDate = &now
+
 				paymentHistory.Status = true
 				paymentHistory.PaymentStatus = db.PaymentComplete
 				paymentHistory.Tag = v2KeysendRes.Tag
@@ -725,6 +726,7 @@ func (h *bountyHandler) MakeBountyPayment(w http.ResponseWriter, r *http.Request
 				bounty.PaidDate = &now
 				bounty.Completed = true
 				bounty.CompletionDate = &now
+
 				paymentHistory.Status = true
 				paymentHistory.PaymentStatus = db.PaymentPending
 				paymentHistory.Tag = v2KeysendRes.Tag
@@ -998,11 +1000,12 @@ func (h *bountyHandler) UpdateBountyPaymentStatus(w http.ResponseWriter, r *http
 			bounty.PaymentPending = false
 			bounty.PaymentFailed = false
 			bounty.Paid = true
+
 			bounty.PaidDate = &now
 			bounty.Completed = true
 			bounty.CompletionDate = &now
 
-			h.db.UpdateBounty(bounty)
+			h.db.UpdateBountyPaymentStatuses(bounty)
 
 			w.WriteHeader(http.StatusOK)
 			json.NewEncoder(w).Encode(msg)

diff --git a/handlers/v2_payments_cron.go b/handlers/v2_payments_cron.go
@@ -26,14 +26,15 @@ func InitV2PaymentsCron() {
 			if bounty.ID > 0 {
 				now := time.Now()
 
-				bounty.Paid = true
 				bounty.PaymentPending = false
 				bounty.PaymentFailed = false
+				bounty.Paid = true
+
 				bounty.PaidDate = &now
 				bounty.Completed = true
 				bounty.CompletionDate = &now
 
-				db.DB.UpdateBounty(bounty)
+				db.DB.UpdateBountyPaymentStatuses(bounty)
 			}
 		} else if tagResult.Status == db.PaymentFailed {
 			// Handle failed payments