feat: moved interface to handler

Author: gsoares85

.mockery.yaml

@@ -35,9 +35,9 @@ packages:
   github.com/rsksmart/liquidity-provider-server/internal/usecases/liquidity_provider:
     interfaces:
       DefaultCredentialsProvider:
-  github.com/rsksmart/liquidity-provider-server/internal/usecases/reports:
+  github.com/rsksmart/liquidity-provider-server/internal/adapters/entrypoints/rest/handlers:
     interfaces:
-      AssetsReportUseCase:
+      GetAssetsReportUseCase:
   github.com/rsksmart/liquidity-provider-server/internal/entities/liquidity_provider:
     interfaces:
       LiquidityProviderRepository:

internal/adapters/entrypoints/rest/handlers/get_reports_assets.go

@@ -1,18 +1,30 @@
 package handlers
 
 import (
+	"context"
 	"github.com/rsksmart/liquidity-provider-server/internal/adapters/entrypoints/rest"
+	"github.com/rsksmart/liquidity-provider-server/internal/entities"
 	"github.com/rsksmart/liquidity-provider-server/internal/usecases/reports"
 	"github.com/rsksmart/liquidity-provider-server/pkg"
 	"net/http"
 )
 
+type GetAssetsReportUseCase interface {
+	Run(ctx context.Context) (reports.GetAssetsReportResponse, error)
+	GetRBTCLiquidity(ctx context.Context) (*entities.Wei, error)
+	GetBTCLiquidity(ctx context.Context) (*entities.Wei, error)
+	GetBTCLocked(ctx context.Context) (*entities.Wei, error)
+	GetRBTCLocked(ctx context.Context) (*entities.Wei, error)
+	GetRBTCBalance(ctx context.Context) (*entities.Wei, error)
+	GetBtcBalance() (*entities.Wei, error)
+}
+
 // NewGetReportsAssetsHandler
 // @Title Get asset Reports
 // @Description Get the asset information for the LPS.
 // @Success 200 pkg.GetAssetsReportDTO
 // @Route /reports/assets [get]
-func NewGetReportsAssetsHandler(useCase reports.AssetsReportUseCase) http.HandlerFunc {
+func NewGetReportsAssetsHandler(useCase GetAssetsReportUseCase) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
 		response, err := useCase.Run(req.Context())
 		if err != nil {

internal/adapters/entrypoints/rest/handlers/get_reports_assets_test.go

@@ -1,12 +1,16 @@
-package handlers
+package handlers_test
 
 import (
-	"context"
 	"fmt"
+	"github.com/rsksmart/liquidity-provider-server/internal/adapters/entrypoints/rest/handlers"
 	"github.com/rsksmart/liquidity-provider-server/internal/usecases/reports"
 	"github.com/rsksmart/liquidity-provider-server/test/mocks"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"math/big"
+	"net/http"
+	"net/http/httptest"
+	"strings"
 	"testing"
 )
 
@@ -35,26 +39,28 @@ func TestNewGetReportsAssetsHandler(t *testing.T) {
 	}
 
 	t.Run("should return 200 on success", func(t *testing.T) {
-		ctx := context.Background()
-		useCase := mocks.NewAssetsReportUseCaseMock(t)
+		useCase := new(mocks.GetAssetsReportUseCaseMock)
+		useCase.EXPECT().Run(mock.Anything).Return(successReturn, nil)
 
-		useCase.On("Run", ctx).Return(successReturn, nil)
-
-		handler := NewGetReportsAssetsHandler(useCase)
-		assert.HTTPSuccess(t, handler, verb, path, nil)
+		handler := handlers.NewGetReportsAssetsHandler(useCase)
+		reqBody := `{}`
+		req := httptest.NewRequest(http.MethodPost, "/reports/assets", strings.NewReader(reqBody))
+		req.Header.Set("Content-Type", "application/json")
+		w := httptest.NewRecorder()
+		handler(w, req)
+		assert.Equal(t, http.StatusOK, w.Code)
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"btcBalance":%d`, successReturn.BtcBalance))
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"rbtcBalance":%d`, successReturn.RbtcBalance))
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"btcLocked":%d`, successReturn.BtcLocked))
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"rbtcLocked":%d`, successReturn.RbtcLocked))
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"btcLiquidity":%d`, successReturn.BtcLiquidity))
 		assert.HTTPBodyContains(t, handler, verb, path, nil, fmt.Sprintf(`"rbtcLiquidity":%d`, successReturn.RbtcLiquidity))
+		useCase.AssertExpectations(t)
 	})
 	t.Run("Should return an error when use case fail", func(t *testing.T) {
-		ctx := context.Background()
-		useCase := mocks.NewAssetsReportUseCaseMock(t)
-
-		useCase.On("Run", ctx).Return(failReturn, assert.AnError)
-		handler := NewGetReportsAssetsHandler(useCase)
+		useCase := new(mocks.GetAssetsReportUseCaseMock)
+		useCase.EXPECT().Run(mock.Anything).Return(failReturn, assert.AnError)
+		handler := handlers.NewGetReportsAssetsHandler(useCase)
 		assert.HTTPError(t, handler, verb, path, nil)
 		assert.HTTPBodyContains(t, handler, verb, path, nil, `{"error":"assert.AnError general error for testing"}`)
 	})

internal/adapters/entrypoints/rest/registry/registry.go

@@ -39,5 +39,5 @@ type UseCaseRegistry interface {
 	GetPeginReportUseCase() *reports.GetPeginReportUseCase
 	GetPegoutReportUseCase() *reports.GetPegoutReportUseCase
 	GetRevenueReportUseCase() *reports.GetRevenueReportUseCase
-	GetAssetsReportUseCase() reports.AssetsReportUseCase
+	GetAssetsReportUseCase() *reports.GetAssetsReportUseCase
 }

internal/configuration/registry/usecase.go

@@ -62,7 +62,7 @@ type UseCaseRegistry struct {
 	getPeginReportUseCase         *reports.GetPeginReportUseCase
 	getPegoutReportUseCase        *reports.GetPegoutReportUseCase
 	getRevenueReportUseCase       *reports.GetRevenueReportUseCase
-	getAssetsReportUseCase        reports.AssetsReportUseCase
+	getAssetsReportUseCase        *reports.GetAssetsReportUseCase
 }
 
 // NewUseCaseRegistry
@@ -382,6 +382,6 @@ func (registry *UseCaseRegistry) GetRevenueReportUseCase() *reports.GetRevenueRe
 	return registry.getRevenueReportUseCase
 }
 
-func (registry *UseCaseRegistry) GetAssetsReportUseCase() reports.AssetsReportUseCase {
+func (registry *UseCaseRegistry) GetAssetsReportUseCase() *reports.GetAssetsReportUseCase {
 	return registry.getAssetsReportUseCase
 }

internal/usecases/reports/get_assets_report.go

@@ -9,16 +9,6 @@ import (
 	"math/big"
 )
 
-type AssetsReportUseCase interface {
-	Run(ctx context.Context) (GetAssetsReportResponse, error)
-	GetRBTCLiquidity(ctx context.Context) (*entities.Wei, error)
-	GetBTCLiquidity(ctx context.Context) (*entities.Wei, error)
-	GetBTCLocked(ctx context.Context) (*entities.Wei, error)
-	GetRBTCLocked(ctx context.Context) (*entities.Wei, error)
-	GetRBTCBalance(ctx context.Context) (*entities.Wei, error)
-	GetBtcBalance() (*entities.Wei, error)
-}
-
 type GetAssetsReportResponse struct {
 	BtcBalance    *big.Int `json:"btcBalance" validate:"required"`
 	RbtcBalance   *big.Int `json:"rbtcBalance" validate:"required"`
@@ -46,7 +36,7 @@ func NewGetAssetsReportUseCase(
 	pegoutProvider liquidity_provider.PegoutLiquidityProvider,
 	peginRepository quote.PeginQuoteRepository,
 	pegoutRepository quote.PegoutQuoteRepository,
-) AssetsReportUseCase {
+) *GetAssetsReportUseCase {
 	return &GetAssetsReportUseCase{
 		btcWallet:        wallet,
 		rsk:              rsk,