fixeed payment history

stakwork · May 7, 2024 · 66008d9 · 66008d9
1 parent 12ee59e
commit 66008d9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/db/structs.go b/db/structs.go
@@ -552,17 +552,17 @@ type WorkspaceUsersData struct {
 }
 
 type WorkspaceFeatures struct {
-	ID             uint       `json:"id"`
-	Uuid           string     `json:"uuid"`
-	WorkspaceUuid  string     `json:"workspace_uuid"`
-	Name           string     `json:"name"`
-	Brief          string     `json:"brief"`
-	Requirements   string     `json:"requirements"`
-	Architecture   string     `json:"architecture"`
-	Created        *time.Time `json:"created"`
-	Updated        *time.Time `json:"updated"`
-	CreatedBy      string     `json:"created_by"`
-	UpdatedBy      string     `json:"updated_by"`
+	ID            uint       `json:"id"`
+	Uuid          string     `json:"uuid"`
+	WorkspaceUuid string     `json:"workspace_uuid"`
+	Name          string     `json:"name"`
+	Brief         string     `json:"brief"`
+	Requirements  string     `json:"requirements"`
+	Architecture  string     `json:"architecture"`
+	Created       *time.Time `json:"created"`
+	Updated       *time.Time `json:"updated"`
+	CreatedBy     string     `json:"created_by"`
+	UpdatedBy     string     `json:"updated_by"`
 }
 
 type BountyRoles struct {
@@ -689,11 +689,11 @@ type NewPaymentHistory struct {
 }
 
 type PaymentHistoryData struct {
-	PaymentHistory NewPaymentHistory
-	SenderName     string `json:"sender_name"`
-	ReceiverName   string `json:"receiver_name"`
-	SenderImg      string `json:"sender_img"`
-	ReceiverImg    string `json:"receiver_img"`
+	NewPaymentHistory
+	SenderName   string `json:"sender_name"`
+	ReceiverName string `json:"receiver_name"`
+	SenderImg    string `json:"sender_img"`
+	ReceiverImg  string `json:"receiver_img"`
 }
 
 type PaymentData struct {

diff --git a/handlers/workspaces.go b/handlers/workspaces.go
@@ -640,11 +640,11 @@ func GetPaymentHistory(w http.ResponseWriter, r *http.Request) {
 		sender := db.DB.GetPersonByPubkey(payment.SenderPubKey)
 		receiver := db.DB.GetPersonByPubkey(payment.ReceiverPubKey)
 		paymentData := db.PaymentHistoryData{
-			PaymentHistory: payment,
-			SenderName:     sender.UniqueName,
-			SenderImg:      sender.Img,
-			ReceiverName:   receiver.UniqueName,
-			ReceiverImg:    receiver.Img,
+			NewPaymentHistory: payment,
+			SenderName:        sender.UniqueName,
+			SenderImg:         sender.Img,
+			ReceiverName:      receiver.UniqueName,
+			ReceiverImg:       receiver.Img,
 		}
 		paymentHistoryData = append(paymentHistoryData, paymentData)
 	}