Completely rework mojang textures queue implementation, split it across separate data providers

http/http_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/mock"
+
 	"github.com/elyby/chrly/api/mojang"
 
-	"github.com/elyby/chrly/tests"
 	"github.com/golang/mock/gomock"
 	testify "github.com/stretchr/testify/assert"
 
@@ -20,46 +21,57 @@ func TestParseUsername(t *testing.T) {
 	assert.Equal("test", parseUsername("test"), "Function should return string itself, if it not contains .png at end")
 }
 
-type mocks struct {
-	Skins *mock_interfaces.MockSkinsRepository
-	Capes *mock_interfaces.MockCapesRepository
-	Queue *tests.MojangTexturesQueueMock
-	Auth  *mock_interfaces.MockAuthChecker
-	Log   *mock_wd.MockWatchdog
+type mojangTexturesProviderMock struct {
+	mock.Mock
 }
 
-func setupMocks(ctrl *gomock.Controller) (
-	*Config,
-	*mocks,
-) {
+func (m *mojangTexturesProviderMock) GetForUsername(username string) (*mojang.SignedTexturesResponse, error) {
+	args := m.Called(username)
+	var result *mojang.SignedTexturesResponse
+	if casted, ok := args.Get(0).(*mojang.SignedTexturesResponse); ok {
+		result = casted
+	}
+
+	return result, args.Error(1)
+}
+
+type mocks struct {
+	Skins          *mock_interfaces.MockSkinsRepository
+	Capes          *mock_interfaces.MockCapesRepository
+	MojangProvider *mojangTexturesProviderMock
+	Auth           *mock_interfaces.MockAuthChecker
+	Log            *mock_wd.MockWatchdog
+}
+
+func setupMocks(ctrl *gomock.Controller) (*Config, *mocks) {
 	skinsRepo := mock_interfaces.NewMockSkinsRepository(ctrl)
 	capesRepo := mock_interfaces.NewMockCapesRepository(ctrl)
 	authChecker := mock_interfaces.NewMockAuthChecker(ctrl)
 	wd := mock_wd.NewMockWatchdog(ctrl)
-	texturesQueue := &tests.MojangTexturesQueueMock{}
+	texturesProvider := &mojangTexturesProviderMock{}
 
 	return &Config{
-		SkinsRepo:           skinsRepo,
-		CapesRepo:           capesRepo,
-		Auth:                authChecker,
-		MojangTexturesQueue: texturesQueue,
-		Logger:              wd,
-	}, &mocks{
-		Skins: skinsRepo,
-		Capes: capesRepo,
-		Auth:  authChecker,
-		Queue: texturesQueue,
-		Log:   wd,
-	}
+			SkinsRepo:              skinsRepo,
+			CapesRepo:              capesRepo,
+			Auth:                   authChecker,
+			MojangTexturesProvider: texturesProvider,
+			Logger:                 wd,
+		}, &mocks{
+			Skins:          skinsRepo,
+			Capes:          capesRepo,
+			Auth:           authChecker,
+			MojangProvider: texturesProvider,
+			Log:            wd,
+		}
 }
 
 func createTexturesResponse(includeSkin bool, includeCape bool) *mojang.SignedTexturesResponse {
 	timeZone, _ := time.LoadLocation("Europe/Minsk")
 	textures := &mojang.TexturesProp{
-		Timestamp: time.Date(2019, 4, 27, 23, 56, 12, 0, timeZone).Unix(),
-		ProfileID: "00000000000000000000000000000000",
+		Timestamp:   time.Date(2019, 4, 27, 23, 56, 12, 0, timeZone).Unix(),
+		ProfileID:   "00000000000000000000000000000000",
 		ProfileName: "mock_user",
-		Textures: &mojang.TexturesResponse{},
+		Textures:    &mojang.TexturesResponse{},
 	}
 
 	if includeSkin {
@@ -75,11 +87,11 @@ func createTexturesResponse(includeSkin bool, includeCape bool) *mojang.SignedTe
 	}
 
 	response := &mojang.SignedTexturesResponse{
-		Id: "00000000000000000000000000000000",
+		Id:   "00000000000000000000000000000000",
 		Name: "mock_user",
 		Props: []*mojang.Property{
 			{
-				Name: "textures",
+				Name:  "textures",
 				Value: mojang.EncodeTextures(textures),
 			},
 		},