Merge branch 'release/v1.1.2'

dwarvesf · Jan 5, 2024 · a6009a4 · a6009a4
2 parents 8ae4e69 + 8ee1bb6
commit a6009a4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/pkg/controller/employee/earns.go b/pkg/controller/employee/earns.go
@@ -25,7 +25,7 @@ func (r *controller) GetEmployeeEarnTransactions(discordID string, input GetEmpl
 		Status:       mochipay.TransactionStatusSuccess,
 		TokenAddress: mochipay.ICYAddress,
 		ChainID:      mochipay.POLYGONChainID,
-		Participant:  profile.Id,
+		ProfileID:    profile.ID,
 		Platform:     mochipay.TransactionPlatformDiscord,
 		Page:         input.Page,
 		Size:         input.Size,
@@ -45,7 +45,7 @@ func (r *controller) GetEmployeeTotalEarn(discordID string) (string, float64, er
 		Status:       mochipay.TransactionStatusSuccess,
 		TokenAddress: mochipay.ICYAddress,
 		ChainID:      mochipay.POLYGONChainID,
-		Participant:  profile.Id,
+		ProfileID:    profile.ID,
 		Platform:     mochipay.TransactionPlatformDiscord,
 		Size:         math.MaxInt64,
 	})

diff --git a/pkg/controller/icy/icy.go b/pkg/controller/icy/icy.go
@@ -181,7 +181,7 @@ func (c *controller) offchainLockedIcyAmount() (*big.Int, error) {
 			return nil, err
 		}
 		for _, p := range res.Data {
-			profileIds = append(profileIds, p.Id)
+			profileIds = append(profileIds, p.ID)
 		}
 
 		hasNext := res.Pagination.Total/pageSize-page > 0

diff --git a/pkg/service/mochipay/mochipay.go b/pkg/service/mochipay/mochipay.go
@@ -70,10 +70,6 @@ func (m *client) GetListTransactions(req ListTransactionsRequest) (*ListTransact
 		queryParams.Add("token_address", req.TokenAddress)
 	}
 
-	if req.Participant != "" {
-		queryParams.Add("chain_id", req.ChainID)
-	}
-
 	if req.Platform != "" {
 		queryParams.Add("platform", string(req.Platform))
 	}
@@ -82,8 +78,8 @@ func (m *client) GetListTransactions(req ListTransactionsRequest) (*ListTransact
 		queryParams.Add("chain_id", req.ChainID)
 	}
 
-	if req.Participant != "" {
-		queryParams.Add("participant", req.Participant)
+	if req.ProfileID != "" {
+		queryParams.Add("profile_id", req.ProfileID)
 	}
 
 	url := fmt.Sprintf("%s/api/v1/transactions?", m.cfg.MochiPay.BaseURL) + queryParams.Encode()

diff --git a/pkg/service/mochipay/request.go b/pkg/service/mochipay/request.go
@@ -49,7 +49,7 @@ type ListTransactionsRequest struct {
 	Status       TransactionStatus   `json:"status"`
 	ActionList   []TransactionAction `json:"action_list"`
 	TokenAddress string              `json:"token_address"`
-	Participant  string              `json:"participant"`
+	ProfileID    string              `json:"profile_id"`
 	Platform     TransactionPlatform `json:"platform"`
 	ChainID      string              `json:"chain_id"`
 	Page         int64               `json:"page"`

diff --git a/pkg/service/mochiprofile/request.go b/pkg/service/mochiprofile/request.go
@@ -18,7 +18,7 @@ type GetMochiProfilesResponse struct {
 }
 
 type MochiProfile struct {
-	Id                 string               `json:"id"`
+	ID                 string               `json:"id"`
 	CreatedAt          string               `json:"created_at"`
 	UpdatedAt          string               `json:"updated_at"`
 	ProfileName        string               `json:"profile_name"`