Feat/upgrade to darkstat api

app/consoler/consoler_test.go

@@ -38,9 +38,9 @@ func TestSystemCommands(t *testing.T) {
 	configurator.FixtureMigrator(func(dbpath types.Dbpath) {
 		channelID, _ := configurator.FixtureChannel(dbpath)
 		cons := NewConsoler(dbpath)
-		result := cons.Execute(settings.Env.ConsolerPrefix+` player --help`, channelID)
+		result := cons.Execute(settings.Env.ConsolerPrefix+` base --help`, channelID)
 		_ = result
-		assert.Contains(t, result, "System commands")
+		assert.Contains(t, result, "Base commands")
 	})
 }
 

app/scrappy/base/fixture.go

@@ -0,0 +1,11 @@
+package base
+
+import "github.com/darklab8/fl-darkbot/app/scrappy/shared/api"
+
+func FixtureBaseApiMock() BaseApi {
+	return api.DarkstatHttp
+}
+
+func NewBaseApi() BaseApi {
+	return api.DarkstatHttp
+}

app/scrappy/base/parser.go

@@ -1,40 +1,18 @@
 package base
 
 import (
-	"encoding/json"
-
 	"github.com/darklab8/fl-darkbot/app/scrappy/shared/records"
-	"github.com/darklab8/fl-darkbot/app/settings/logus"
+	"github.com/darklab8/fl-darkstat/darkstat/configs_export"
 )
 
-type baseSerializer struct {
-	Affiliation string  `json:"affiliation"`
-	Health      float64 `json:"health"`
-	Tid         int     `json:"tid"`
-}
-
 type baseParser struct {
 }
 
-func (b baseParser) Parse(body []byte) (records.StampedObjects[Base], error) {
-	record := records.NewStampedObjects[Base]()
-
-	bases := map[string]baseSerializer{}
-	if err := json.Unmarshal(body, &bases); err != nil {
-		logus.Log.CheckWarn(err, "unable to unmarshal base request", logus.Body(body))
-		logus.Log.Warn("unable to marshal base body=")
-		return record, err
-	}
+func (b baseParser) Parse(pobs []*configs_export.PoB) (records.StampedObjects[*configs_export.PoB], error) {
+	record := records.NewStampedObjects[*configs_export.PoB]()
 
-	for name, serializer := range bases {
-		record.Add(
-			Base{
-				Name:        name,
-				Affiliation: serializer.Affiliation,
-				Health:      serializer.Health,
-				Tid:         serializer.Tid,
-			},
-		)
+	for _, base := range pobs {
+		record.Add(base)
 	}
 	return record, nil
 }

app/scrappy/base/storage.go

@@ -1,9 +1,9 @@
 package base
 
 import (
-	"github.com/darklab8/fl-darkbot/app/scrappy/shared/parser"
-	"github.com/darklab8/fl-darkbot/app/scrappy/shared/records"
+	"github.com/darklab8/fl-darkstat/darkstat/configs_export"
 
+	"github.com/darklab8/fl-darkbot/app/scrappy/shared/records"
 	"github.com/darklab8/fl-darkbot/app/settings/logus"
 )
 
@@ -14,29 +14,59 @@ type Base struct {
 	Name        string
 }
 
+// converted for old tests
+func NewPoB1(base Base) *configs_export.PoB {
+	return &configs_export.PoB{
+		PoBCore: configs_export.PoBCore{
+			Name:        base.Name,
+			FactionName: &base.Affiliation,
+			Health:      &base.Health,
+		},
+	}
+}
+
 type BaseStorage struct {
-	records.Records[records.StampedObjects[Base]]
-	api    IbaseAPI
-	parser parser.Parser[records.StampedObjects[Base]]
+	records.Records[records.StampedObjects[*configs_export.PoB]]
+	parser baseParser
+
+	api BaseApi
+
+	// pobs []*configs_export.PoB
+	// err  error
+}
+
+type BaseData struct {
+	List []*configs_export.PoB
+}
+
+type BaseApi interface {
+	GetPobs() ([]*configs_export.PoB, error)
 }
 
+// func (b *BaseStorage) GetLatestRecord() (BaseData, error) {
+// 	return BaseData{
+// 		List: b.pobs,
+// 	}, b.err
+// }
+// func (b *BaseStorage) Length() int {
+// 	return len(b.pobs)
+// }
+
 // Conveniently born some factory
 func (b *BaseStorage) Update() {
-	data, err := b.api.GetBaseData()
+	pobs, err := b.api.GetPobs()
 	if logus.Log.CheckWarn(err, "quering API with error in BaseStorage") {
+		err = err
 		return
 	}
-	record, err := b.parser.Parse(data)
-	if logus.Log.CheckWarn(err, "received bad parser parsing result in BaseStorage. Ignoring.") {
-		return
-	}
-	b.Add(record)
+
+	b.parser.Parse(pobs)
+
 	logus.Log.Info("updated base storage")
 }
 
-func NewBaseStorage(api IbaseAPI) *BaseStorage {
+func NewBaseStorage(api BaseApi) *BaseStorage {
 	b := &BaseStorage{}
-	b.parser = baseParser{}
 	b.api = api
 	return b
 }

app/scrappy/main.go

@@ -14,7 +14,7 @@ type ScrappyStorage struct {
 	baseAttackStorage *baseattack.BaseAttackStorage
 }
 
-func NewScrapyStorage(base_api base.IbaseAPI, base_attack baseattack.IbaseAttackAPI, opts ...StorageParam) *ScrappyStorage {
+func NewScrapyStorage(base_api base.BaseApi, base_attack baseattack.IbaseAttackAPI, opts ...StorageParam) *ScrappyStorage {
 	s := &ScrappyStorage{}
 	s.baseStorage = base.NewBaseStorage(base_api)
 	s.baseAttackStorage = baseattack.NewBaseAttackStorage(base_attack)

app/scrappy/shared/api/darkstat.go

@@ -0,0 +1,8 @@
+package api
+
+import (
+	"github.com/darklab8/fl-darkbot/app/settings"
+	"github.com/darklab8/fl-darkstat/darkapis/darkhttp"
+)
+
+var DarkstatHttp = darkhttp.NewClient(settings.Env.DarkstatApiUrl)

app/scrappy/shared/api/request.go

@@ -1,3 +1,7 @@
+/*
+Reusable API code to request []byte code of smth. Reusable for player and base.
+*/
+
 package api
 
 import (

app/settings/main.go

@@ -14,8 +14,7 @@ import (
 type DarkbotEnv struct {
 	utils_settings.UtilsEnvs
 
-	ScrappyBaseUrl       string
-	ScrappyPlayerUrl     string
+	DarkstatApiUrl       string
 	ScrappyBaseAttackUrl string
 
 	DiscorderBotToken string
@@ -51,9 +50,8 @@ func init() {
 func LoadEnv(envs *enverant.Enverant) {
 	Env = DarkbotEnv{
 		UtilsEnvs:            utils_settings.GetEnvs(),
-		DevEnvMockApi:        envs.GetBoolOr("DEV_ENV_MOCK_API", true),
-		ScrappyBaseUrl:       envs.GetStrOr("SCRAPPY_BASE_URL", ""),
-		ScrappyPlayerUrl:     envs.GetStrOr("SCRAPPY_PLAYER_URL", ""),
+		DevEnvMockApi:        envs.GetBoolOr("DEV_ENV_MOCK_API", false), // no longer point present with no private apis. TODO consider delete
+		DarkstatApiUrl:       envs.GetStrOr("DARKSTAT_API", "https://darkstat.dd84ai.com"),
 		ScrappyBaseAttackUrl: envs.GetStrOr("SCRAPPY_BASE_ATTACK_URL", "https://discoverygc.com/forums/showthread.php?tid=110046&action=lastpost"),
 
 		DiscorderBotToken: envs.GetStr("DISCORDER_BOT_TOKEN"),
@@ -74,15 +72,6 @@ func LoadEnv(envs *enverant.Enverant) {
 	}
 	Workdir = filepath.Dir(filepath.Dir(utils_os.GetCurrentFolder().ToString()))
 	Dbpath = NewDBPath(Env.ConfiguratorDbname)
-
-	if !Env.DevEnvMockApi {
-		if Env.ScrappyBaseUrl == "" {
-			log.Panic("DevEnvMockApi=false, Expected SCRAPPY_BASE_URL env var to be defined")
-		}
-		if Env.ScrappyPlayerUrl == "" {
-			log.Panic("DevEnvMockApi=false, Expected SCRAPPY_PLAYER_URL env var to be defined")
-		}
-	}
 }
 
 var Dbpath types.Dbpath