Merge pull request #11 from brienze1/develop

build/local/docker-compose.yml

@@ -26,6 +26,15 @@ services:
       volumes:
         - ./lambda-files:/lambda-files
       entrypoint: sh -c "cp crypto-robot-validator.zip /lambda-files"
+  biscoint-mock:
+    container_name: biscoint-mock
+    depends_on:
+      - awscli
+    image: lfbrienze/biscoint-mock:latest
+    ports:
+      - "8080:8085"
+    entrypoint: >
+      sh -c "java -jar application/target/biscoint-mock.jar"
   awscli:
     depends_on:
       - crypto-robot-validator

build/local/scripts/lambda/03-test-data-creation.sh

@@ -20,12 +20,18 @@ aws dynamodb put-item \
               "locked": {
                 "BOOL": false
               },
+              "cash_available": {
+                "N": "10000.00"
+              },
               "cash_amount": {
                 "N": "1000.00"
               },
               "cash_reserved": {
                 "N": "0"
               },
+              "crypto_available": {
+                "N": "1.000000"
+              },
               "crypto_amount": {
                 "N": "1.000000"
               },
@@ -53,6 +59,9 @@ aws dynamodb put-item \
               "month_stop_loss": {
                 "N": "500"
               },
+              "operation_amount_percentage": {
+                "N": "5.5"
+              },
               "month_sell_cap": {
                 "N": "25000"
               },

config/.env.development

@@ -13,6 +13,6 @@ AWS_SECRETS_MANAGER_CACHE_SECRET_NAME=crypto_robot.secrets.cache
 AWS_SECRETS_MANAGER_ENCRYPTION_SECRET_NAME=crypto_robot.secrets.encryption
 CACHE_KEY_PREFIX=crypto_robot.validator.lock.
 CACHE_KEY_TTL_SECONDS=60
-BISCOINT_CRYPTO_URL=http://localhost:8085/v1
-BISCOINT_CRYPTO_GET_CRYPTO_PATH=/ticker/price
-BISCOINT_CRYPTO_GET_BALANCE_PATH=/balance
+BISCOINT_CRYPTO_URL=http://localhost:8085/
+BISCOINT_CRYPTO_GET_CRYPTO_PATH=v1/ticker
+BISCOINT_CRYPTO_GET_BALANCE_PATH=v1/balance

config/.env.docker

@@ -13,6 +13,6 @@ AWS_SECRETS_MANAGER_CACHE_SECRET_NAME=crypto_robot.secrets.cache
 AWS_SECRETS_MANAGER_ENCRYPTION_SECRET_NAME=crypto_robot.secrets.encryption
 CACHE_KEY_PREFIX=crypto_robot.validator.lock.
 CACHE_KEY_TTL_SECONDS=60
-BISCOINT_CRYPTO_URL=http://localhost:8085/v1
-BISCOINT_CRYPTO_GET_CRYPTO_PATH=/ticker/price
-BISCOINT_CRYPTO_GET_BALANCE_PATH=/balance
+BISCOINT_CRYPTO_URL=http://localhost:8085/
+BISCOINT_CRYPTO_GET_CRYPTO_PATH=v1/ticker
+BISCOINT_CRYPTO_GET_BALANCE_PATH=v1/balance

config/.env.localstack

@@ -13,6 +13,6 @@ AWS_SECRETS_MANAGER_CACHE_SECRET_NAME=crypto_robot.secrets.cache
 AWS_SECRETS_MANAGER_ENCRYPTION_SECRET_NAME=crypto_robot.secrets.encryption
 CACHE_KEY_PREFIX=crypto_robot.validator.lock.
 CACHE_KEY_TTL_SECONDS=60
-BISCOINT_CRYPTO_URL=http://localhost:8085/v1
-BISCOINT_CRYPTO_GET_CRYPTO_PATH=/ticker/price
-BISCOINT_CRYPTO_GET_BALANCE_PATH=/balance
+BISCOINT_CRYPTO_URL=http://biscoint-mock:8080/
+BISCOINT_CRYPTO_GET_CRYPTO_PATH=v1/ticker
+BISCOINT_CRYPTO_GET_BALANCE_PATH=v1/balance

config/.env.test

@@ -13,6 +13,6 @@ AWS_SECRETS_MANAGER_CACHE_SECRET_NAME=crypto_robot.secrets.cache
 AWS_SECRETS_MANAGER_ENCRYPTION_SECRET_NAME=crypto_robot.secrets.encryption
 CACHE_KEY_PREFIX=crypto_robot.validator.lock.
 CACHE_KEY_TTL_SECONDS=60
-BISCOINT_CRYPTO_URL=http://localhost:8085/v1
-BISCOINT_CRYPTO_GET_CRYPTO_PATH=/v1/ticker/price
-BISCOINT_CRYPTO_GET_BALANCE_PATH=/v1/balance
+BISCOINT_CRYPTO_URL=http://localhost:8085/
+BISCOINT_CRYPTO_GET_CRYPTO_PATH=v1/ticker
+BISCOINT_CRYPTO_GET_BALANCE_PATH=v1/balance

internal/validator/integration/dto/operation.go

@@ -9,15 +9,15 @@ import (
 )
 
 type Operation struct {
-	Id        string                       `json:"operation_id"`
-	Status    status.Status                `json:"status"`
-	CreatedAt time.Time                    `json:"created_at"`
-	Locked    bool                         `json:"locked"`
-	Type      operation_type.OperationType `json:"type"`
-	Amount    float64                      `json:"amount"`
-	Base      symbol.Symbol                `json:"base"`
-	Quote     symbol.Symbol                `json:"quote"`
-	StopLoss  float64                      `json:"stop_loss"`
+	Id        string                       `dynamodbav:"operation_id"`
+	Status    status.Status                `dynamodbav:"status"`
+	CreatedAt time.Time                    `dynamodbav:"created_at"`
+	Locked    bool                         `dynamodbav:"locked"`
+	Type      operation_type.OperationType `dynamodbav:"type"`
+	Amount    float64                      `dynamodbav:"amount"`
+	Base      symbol.Symbol                `dynamodbav:"base"`
+	Quote     symbol.Symbol                `dynamodbav:"quote"`
+	StopLoss  float64                      `dynamodbav:"stop_loss"`
 }
 
 func OperationDto(operation *model.Operation) *Operation {

internal/validator/integration/utils/token_builder.go

@@ -6,6 +6,7 @@ import (
 	"github.com/brienze1/crypto-robot-validator/internal/validator/integration/adapters"
 	"github.com/brienze1/crypto-robot-validator/internal/validator/integration/exceptions"
 	"github.com/brienze1/crypto-robot-validator/pkg/custom_error"
+	"strings"
 )
 
 type tokenBuilder struct {
@@ -28,7 +29,7 @@ func (t *tokenBuilder) Build(apiSecret string, endpoint string, payload any, non
 		return "", t.abort(err, "Payload marshal failed")
 	}
 
-	strToBeSigned := endpoint + nonce + string(payloadString)
+	strToBeSigned := endpoint + nonce + strings.ReplaceAll(string(payloadString), "\"", "")
 
 	t.logger.Info("Build finished", endpoint, payload, nonce, payloadString, strToBeSigned)
 	return t.encryptionService.SHA384Encrypt(strToBeSigned, apiSecret), nil

internal/validator/integration/webservice/biscoint_web_service.go

@@ -92,7 +92,7 @@ func (b *biscointWebService) GetBalance(clientId string, useSimulation bool) (*m
 	if useSimulation {
 		biscointUrl = b.simulationUrl
 	}
-	request, err := http.NewRequest(http.MethodGet, biscointUrl+b.biscointGetBalancePath, nil)
+	request, err := http.NewRequest(http.MethodPost, biscointUrl+b.biscointGetBalancePath, nil)
 	if err != nil {
 		return nil, b.abort(err, "Error while trying to generate Biscoint get request")
 	}
@@ -111,7 +111,7 @@ func (b *biscointWebService) GetBalance(clientId string, useSimulation bool) (*m
 	}(response.Body)
 
 	if response.StatusCode != http.StatusOK {
-		return nil, b.abort(err, "Biscoint API status code not Ok: "+response.Status)
+		return nil, b.abort(err, "Biscoint API status code not Ok: "+response.Status, response.Body)
 	}
 
 	var balanceResponse dto.BalanceResponse

scripts/docker_compose_pull

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose pull

test/integrated/step_definitions_test.go

@@ -106,7 +106,7 @@ func biscointApiIsUp() error {
 	coinResponse, _ := json.Marshal(coin)
 	biscointApi.GetBalanceResponse = string(balanceResponse)
 	biscointApi.GetCryptoResponse = string(coinResponse)
-	properties.Properties().BiscointUrl = biscointApi.GetUrl()
+	properties.Properties().BiscointUrl = biscointApi.GetUrl() + "/"
 	return nil
 }
 

test/mocks/http_client.go

@@ -36,9 +36,9 @@ func (h *httpClient) SetupServer() {
 	h.Server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(h.StatusCode)
 		var response []byte
-		if r.URL.Path == properties.Properties().BiscointGetBalancePath {
+		if r.URL.Path == "/"+properties.Properties().BiscointGetBalancePath {
 			response = []byte(h.GetBalanceResponse)
-		} else if r.URL.Path == properties.Properties().BiscointGetCryptoPath {
+		} else if r.URL.Path == "/"+properties.Properties().BiscointGetCryptoPath {
 			response = []byte(h.GetCryptoResponse)
 		}
 

test/unit/internal/validator/integration/webservice/biscoint_web_service_test.go

@@ -27,8 +27,8 @@ func setup() {
 	logger.Reset()
 	client.Reset()
 	client.SetupServer()
-	properties.Properties().BiscointUrl = client.GetUrl()
-	properties.Properties().SimulationUrl = client.GetUrl()
+	properties.Properties().BiscointUrl = client.GetUrl() + "/"
+	properties.Properties().SimulationUrl = client.GetUrl() + "/"
 	headerBuilder.Reset()
 
 	biscointWebService = webservice.BiscointWebService(logger, client, headerBuilder)