refactor: starting refactors in scrappy

scrappy/base/api.go

@@ -9,7 +9,8 @@ type basesAPI struct {
 	api.APIrequest
 }
 
-func (a basesAPI) New() api.APIinterface {
+func NewBaseApi() api.APIinterface {
+	a := basesAPI{}
 	a.Init(settings.Config.ScrappyBaseUrl)
 	return a
 }

scrappy/base/mock_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestRegenerateBaseData(t *testing.T) {
 	utils.RegenerativeTest(func() error {
-		data, _ := basesAPI{}.New().GetData()
+		data, _ := NewBaseApi().GetData()
 		path_testdata := tests.FixtureCreateTestDataFolder()
 		path_testfile := path.Join(path_testdata, "basedata.json")
 		err := ioutil.WriteFile(path_testfile, data, os.ModePerm)

scrappy/base/storage.go

@@ -39,6 +39,6 @@ func (b *BaseStorage) Update() {
 
 func (b *BaseStorage) New() *BaseStorage {
 	b.parser = baseParser{}
-	b.Api = basesAPI{}.New()
+	b.Api = NewBaseApi()
 	return b
 }

scrappy/player/api.go

@@ -9,7 +9,8 @@ type PlayerAPI struct {
 	api.APIrequest
 }
 
-func (a PlayerAPI) New() api.APIinterface {
+func NewPlayerAPI() api.APIinterface {
+	a := PlayerAPI{}
 	a.Init(settings.Config.ScrappyPlayerUrl)
 	return a
 }

scrappy/player/mock.go

@@ -3,20 +3,21 @@ package player
 import (
 	"darkbot/scrappy/shared/api"
 	"darkbot/scrappy/tests"
+	"darkbot/settings/logus"
 	"darkbot/settings/utils"
 	"darkbot/settings/utils/logger"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
 )
 
 func TestRegeneratePlayerData(t *testing.T) {
 	utils.RegenerativeTest(func() error {
-		data, err := PlayerAPI{}.New().GetData()
+		data, err := NewPlayerAPI().GetData()
+		logus.CheckError(err, "new player api get data errored")
 		path_testdata := tests.FixtureCreateTestDataFolder()
 		path_testfile := path.Join(path_testdata, "playerdata.json")
-		err = ioutil.WriteFile(path_testfile, data, os.ModePerm)
+		err = os.WriteFile(path_testfile, data, os.ModePerm)
 		logger.CheckPanic(err, "unable to write file")
 		return nil
 	})
@@ -34,7 +35,7 @@ func (a APIPlayerSpy) New() api.APIinterface {
 func (a APIPlayerSpy) GetData() ([]byte, error) {
 	path_testdata := tests.FixtureCreateTestDataFolder()
 	path_testfile := path.Join(path_testdata, "playerdata.json")
-	data, err := ioutil.ReadFile(path_testfile)
+	data, err := os.ReadFile(path_testfile)
 	logger.CheckPanic(err, "unable to read file")
 	return data, nil
 }

scrappy/player/storage.go

@@ -38,6 +38,6 @@ func (b *PlayerStorage) Update() {
 
 func (b *PlayerStorage) New() *PlayerStorage {
 	b.parser = playerParser{}
-	b.Api = PlayerAPI{}.New()
+	b.Api = NewPlayerAPI()
 	return b
 }

scrappy/shared/api/interface.go

@@ -6,5 +6,4 @@ package api
 
 type APIinterface interface {
 	GetData() ([]byte, error)
-	New() APIinterface
 }