adapters. on test.

Author: RapidCodeLab

cmd/app/main.go

@@ -13,11 +13,12 @@ import (
 	zaplogger "github.com/RapidCodeLab/ZapLogger"
 	browscap_devicedetector "github.com/RapidCodeLab/rapid-prebid-server/device-detectors/browscap"
 	default_config_provider "github.com/RapidCodeLab/rapid-prebid-server/dsp-adapters/config-providers/default"
+	boltdb_entity_provider "github.com/RapidCodeLab/rapid-prebid-server/entity-providers/boltdb"
 	geoip2_detector "github.com/RapidCodeLab/rapid-prebid-server/geo-detectors/geoip2"
 	"github.com/RapidCodeLab/rapid-prebid-server/internal/application/core"
 	"github.com/RapidCodeLab/rapid-prebid-server/internal/application/interfaces"
 	"github.com/RapidCodeLab/rapid-prebid-server/internal/application/server"
-	inventoryapiboltdb "github.com/RapidCodeLab/rapid-prebid-server/inventory-api/boltdb"
+	inventorystorage_boltdb "github.com/RapidCodeLab/rapid-prebid-server/inventory-storage/boltdb"
 )
 
 type Config struct {
@@ -66,7 +67,7 @@ func main() {
 		config.ServerListeNetwork,
 		config.ServerListenAddr)
 
-	invStorager, err := inventoryapiboltdb.New(
+	invStorager, err := inventorystorage_boltdb.New(
 		ctx,
 		config.BoltDBPath,
 		l)
@@ -75,6 +76,10 @@ func main() {
 		os.Exit(1)
 	}
 
+	entityProvider := boltdb_entity_provider.New(
+		invStorager,
+	)
+
 	deviceDetector, err := browscap_devicedetector.New(
 		config.DeviceDBPath,
 	)
@@ -109,6 +114,7 @@ func main() {
 	err = app.Start(
 		ctx,
 		invStorager,
+		entityProvider,
 		deviceDetector,
 		geoDetector,
 		enabledDSPAdapters,

dsp-adapters/config-providers/default/main.go

@@ -60,7 +60,7 @@ func (i *provider) Read(
 	interfaces.DSPAdapterConfig,
 	error,
 ) {
-	return interfaces.DSPAdapterConfig{}, nil
+	return i.data[name], nil
 }
 
 func findFiles(root, ext string) ([]string, error) {

dsp-adapters/default/main.go

@@ -67,5 +67,9 @@ func NewDSPAdpater(
 		Name:       c.Name,
 		httpClient: &fasthttp.Client{},
 		endpintURI: c.Endpoint,
+		requestTimout: time.Duration(
+			time.Duration(c.RequestTimout) *
+				time.Millisecond,
+		),
 	}, nil
 }

dsp-configs/demo-dsp-1.json

@@ -1,4 +1,5 @@
 {
   "name":"demo-dsp-1",
-  "enpoint":"http:/127.0.0.1:8060/rtb"
+  "endpoint":"http://127.0.0.1:8060/rtb",
+  "request_timeout":500
 }

entity-providers/boltdb/main.go

@@ -0,0 +1,21 @@
+package boltdb_entity_provider
+
+import "github.com/RapidCodeLab/rapid-prebid-server/internal/application/interfaces"
+
+type provider struct {
+	storage interfaces.EntityReadStorager
+}
+
+func New(
+	s interfaces.EntityReadStorager,
+) interfaces.EntityProvider {
+	return &provider{
+		storage: s,
+	}
+}
+
+func (i *provider) Provide(
+	entityID string,
+) (interfaces.Entity, error) {
+	return i.storage.ReadEntity(entityID)
+}

geo-detectors/geoip2/detector.go

@@ -37,8 +37,13 @@ func (l *GeoLocator) Detect(
 	}
 
 	data.CountryCode = d.Country.IsoCode
-	data.Region = d.Subdivisions[0].Names[l.namesLanguage]
-	data.City = d.City.Names[l.namesLanguage]
+	if len(d.Subdivisions) > 0 {
+		data.Region = d.Subdivisions[0].Names[l.namesLanguage]
+	}
+	cityName, ok := d.City.Names[l.namesLanguage]
+	if ok {
+		data.City = cityName
+	}
 
 	return data, nil
 }

internal/application/core/core.go

@@ -10,6 +10,7 @@ type payloadHTTPServer interface {
 	Start(
 		context.Context,
 		interfaces.InventoryStorager,
+		interfaces.EntityProvider,
 		interfaces.DeviceDetector,
 		interfaces.GeoDetector,
 		[]interfaces.DSPName,
@@ -33,6 +34,7 @@ func New(s payloadHTTPServer,
 
 func (i *Core) Start(ctx context.Context,
 	invStorager interfaces.InventoryStorager,
+	entityProvider interfaces.EntityProvider,
 	deviceDetector interfaces.DeviceDetector,
 	geoDetector interfaces.GeoDetector,
 	enabledDSPAdapters []interfaces.DSPName,
@@ -41,6 +43,7 @@ func (i *Core) Start(ctx context.Context,
 	return i.payloadHTTPServer.Start(
 		ctx,
 		invStorager,
+		entityProvider,
 		deviceDetector,
 		geoDetector,
 		enabledDSPAdapters,

internal/application/handlers/payload/payload.go

@@ -37,6 +37,11 @@ func (h *Handler) Handle(ctx *fasthttp.RequestCtx) {
 		)
 	}
 
+	if len(entities) < 1 {
+		ctx.SetStatusCode(fasthttp.StatusNotFound)
+		return
+	}
+
 	deviceData := h.deviceDetector.Detect(
 		string(ctx.UserAgent()),
 	)
@@ -90,7 +95,7 @@ func (h *Handler) Handle(ctx *fasthttp.RequestCtx) {
 		}()
 	}
 
-	wg.Done()
+	wg.Wait()
 
 	winners := default_auction.Auction(responses)
 

internal/application/interfaces/dsp_adapter.go

@@ -18,8 +18,9 @@ type DSPAdapter interface {
 }
 
 type DSPAdapterConfig struct {
-	Name     DSPName `json:"name"`
-	Endpoint string  `json:"endpoint"`
+	Name          DSPName `json:"name"`
+	Endpoint      string  `json:"endpoint"`
+	RequestTimout int64   `json:"request_timeout"`
 }
 
 type NewDSPAdapter func(DSPAdapterConfig) (DSPAdapter, error)

internal/application/interfaces/inventory_api.go

@@ -48,9 +48,13 @@ type InventoryStorager interface {
 }
 
 type EntityStorager interface {
+	EntityReadStorager
 	ReadAllEntities() ([]Entity, error)
 	CreateEntity(Entity) error
-	ReadEntity(ID string) (Entity, error)
 	UpdateEntity(Entity) error
 	DeleteEntity(ID string) error
 }
+
+type EntityReadStorager interface {
+	ReadEntity(ID string) (Entity, error)
+}

internal/application/server/main.go

@@ -37,6 +37,7 @@ func New(l interfaces.Logger,
 func (i *Server) Start(
 	ctx context.Context,
 	invStorager interfaces.InventoryStorager,
+	entityProvider interfaces.EntityProvider,
 	deviceDetector interfaces.DeviceDetector,
 	geoDetector interfaces.GeoDetector,
 	enabledAdapters []interfaces.DSPName,
@@ -73,7 +74,7 @@ func (i *Server) Start(
 		i.logger,
 		deviceDetector,
 		geoDetector,
-		nil,
+		entityProvider,
 		adapters,
 	)
 	payloadHandler.LoadRoutes(r)

inventory-api/boltdb/entity.go inventory-storage/boltdb/entity.go

@@ -1,4 +1,4 @@
-package inventoryapiboltdb
+package inventorystorage_boltdb
 
 import (
 	"encoding/json"

inventory-api/boltdb/inventory.go inventory-storage/boltdb/inventory.go

@@ -1,4 +1,4 @@
-package inventoryapiboltdb
+package inventorystorage_boltdb
 
 import (
 	"encoding/json"

inventory-api/boltdb/main.go inventory-storage/boltdb/main.go

@@ -1,4 +1,4 @@
-package inventoryapiboltdb
+package inventorystorage_boltdb
 
 import (
 	"context"