update method naming

tonkeeper · Jul 27, 2023 · bb547de · bb547de
1 parent ff4b0d0
commit bb547de
Show file tree

Hide file tree

Showing 18 changed files with 165 additions and 168 deletions.
diff --git a/api/openapi.json b/api/openapi.json
@@ -5667,13 +5667,13 @@
     ]
    }
   },
-  "/v2/rates/charts": {
+  "/v2/rates/chart": {
    "get": {
-    "description": "Get charts by token",
-    "operationId": "getChartsRates",
+    "description": "Get chart by token",
+    "operationId": "getChartRates",
     "parameters": [
      {
-      "description": "accept jetton master addresses",
+      "description": "accept jetton master address",
       "in": "query",
       "name": "token",
       "required": true,
@@ -5697,19 +5697,19 @@
        "application/json": {
         "schema": {
          "properties": {
-          "charts": {
+          "points": {
            "additionalProperties": true,
            "example": {}
           }
          },
          "required": [
-          "charts"
+          "points"
          ],
          "type": "object"
         }
        }
       },
-      "description": "ton price"
+      "description": "chart"
      },
      "default": {
       "$ref": "#/components/responses/Error"

diff --git a/api/openapi.yml b/api/openapi.yml
@@ -1137,16 +1137,16 @@ paths:
                     example: { }
         'default':
           $ref: '#/components/responses/Error'
-  /v2/rates/charts:
+  /v2/rates/chart:
     get:
-      description: Get charts by token
-      operationId: getChartsRates
+      description: Get chart by token
+      operationId: getChartRates
       tags:
         - Rates
       parameters:
         - in: query
           name: token
-          description: accept jetton master addresses
+          description: accept jetton master address
           required: true
           schema:
             type: string
@@ -1158,15 +1158,15 @@ paths:
             example: usd
       responses:
         '200':
-          description: "charts"
+          description: "chart"
           content:
             application/json:
               schema:
                 type: object
                 required:
-                  - charts
+                  - points
                 properties:
-                  charts:
+                  points:
                     additionalProperties: true
                     example: { }
         'default':

diff --git a/client/oas_client_gen.go b/client/oas_client_gen.go
diff --git a/client/oas_json_gen.go b/client/oas_json_gen.go
diff --git a/client/oas_parameters_gen.go b/client/oas_parameters_gen.go
diff --git a/client/oas_response_decoders_gen.go b/client/oas_response_decoders_gen.go
diff --git a/client/oas_schemas_gen.go b/client/oas_schemas_gen.go
diff --git a/pkg/api/interfaces.go b/pkg/api/interfaces.go
@@ -137,7 +137,7 @@ type addressBook interface {
 
 type ratesSource interface {
 	GetRates(date time.Time) (map[string]float64, error)
-	GetRatesCharts(account tongo.AccountID, currency string) ([][]any, error)
+	GetRatesChart(account tongo.AccountID, currency string) ([][]any, error)
 }
 
 type metadataCache struct {

diff --git a/pkg/api/rates_handlers.go b/pkg/api/rates_handlers.go
@@ -13,23 +13,23 @@ import (
 	"github.com/tonkeeper/tongo"
 )
 
-func (h *Handler) GetChartsRates(ctx context.Context, params oas.GetChartsRatesParams) (*oas.GetChartsRatesOK, error) {
+func (h *Handler) GetChartRates(ctx context.Context, params oas.GetChartRatesParams) (*oas.GetChartRatesOK, error) {
 	accountID, err := tongo.ParseAccountID(params.Token)
 	if err != nil {
 		return nil, toError(http.StatusBadRequest, err)
 	}
 	if params.Currency.Value != "" {
 		params.Currency.Value = strings.ToUpper(params.Currency.Value)
 	}
-	charts, err := h.ratesSource.GetRatesCharts(accountID, params.Currency.Value)
+	charts, err := h.ratesSource.GetRatesChart(accountID, params.Currency.Value)
 	if err != nil {
 		return nil, toError(http.StatusInternalServerError, err)
 	}
 	bytesResp, err := json.Marshal(charts)
 	if err != nil {
 		return nil, toError(http.StatusInternalServerError, err)
 	}
-	return &oas.GetChartsRatesOK{Charts: bytesResp}, nil
+	return &oas.GetChartRatesOK{Points: bytesResp}, nil
 }
 
 func (h *Handler) GetRates(ctx context.Context, params oas.GetRatesParams) (*oas.GetRatesOK, error) {
@@ -80,8 +80,9 @@ func (h *Handler) GetRates(ctx context.Context, params oas.GetRatesParams) (*oas
 
 	ratesRes := make(map[string]tokenRates)
 	for _, token := range tokens {
-		if token == "ton" {
-			token = "TON"
+		_, err = tongo.ParseAccountID(token)
+		if err != nil {
+			token = strings.ToUpper(token)
 		}
 		for _, currency := range currencies {
 			todayCurrencyPrice, ok := todayRates[currency]