AIDEM: Added use to macros library

adapters/aidem/aidem.go

@@ -4,37 +4,49 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"text/template"
 
 	"github.com/prebid/openrtb/v19/openrtb2"
-	"github.com/prebid/prebid-server/v2/adapters"
-	"github.com/prebid/prebid-server/v2/config"
-	"github.com/prebid/prebid-server/v2/errortypes"
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/adapters"
+	"github.com/prebid/prebid-server/config"
+	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/prebid/prebid-server/v2/macros"
 )
 
-type adapter struct {
-	endpoint string
+type AIDEMAdapter struct {
+	EndpointTemplate *template.Template
 }
 
-func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
+func (a *AIDEMAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
 
 	reqJson, err := json.Marshal(request)
 	if err != nil {
 		return nil, []error{err}
 	}
 
+	impExt, err := getImpressionExt(&request.Imp[0])
+	if err != nil {
+		return nil, []error{err}
+	}
+
 	headers := http.Header{}
 	headers.Add("Content-Type", "application/json;charset=utf-8")
 
+	url, err := a.buildEndpointURL(impExt)
+	if err != nil {
+		return nil, []error{err}
+	}
+
 	return []*adapters.RequestData{{
 		Method:  "POST",
-		Uri:     a.endpoint,
+		Uri:     url,
 		Body:    reqJson,
 		Headers: headers,
 	}}, nil
 }
 
-func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+func (a *AIDEMAdapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
 	var errs []error
 
 	if adapters.IsResponseStatusCodeNoContent(response) {
@@ -81,9 +93,15 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 
 // Builder builds a new instance of the AIDEM adapter for the given bidder with the given config.
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) {
-	return &adapter{
-		endpoint: config.Endpoint,
-	}, nil
+	urlTemplate, err := template.New("endpointTemplate").Parse(config.Endpoint)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse endpoint url template: %v", err)
+	}
+
+	bidder := &AIDEMAdapter{
+		EndpointTemplate: urlTemplate,
+	}
+	return bidder, nil
 }
 
 func getMediaTypeForBid(bid openrtb2.Bid) (openrtb_ext.BidType, error) {
@@ -100,3 +118,25 @@ func getMediaTypeForBid(bid openrtb2.Bid) (openrtb_ext.BidType, error) {
 		return "", fmt.Errorf("Unable to fetch mediaType in multi-format: %s", bid.ImpID)
 	}
 }
+
+func getImpressionExt(imp *openrtb2.Imp) (*openrtb_ext.ExtImpAIDEM, error) {
+	var bidderExt adapters.ExtImpBidder
+	if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
+		return nil, &errortypes.BadInput{
+			Message: err.Error(),
+		}
+	}
+	var AIDEMExt openrtb_ext.ExtImpAIDEM
+	if err := json.Unmarshal(bidderExt.Bidder, &AIDEMExt); err != nil {
+		return nil, &errortypes.BadInput{
+			Message: err.Error(),
+		}
+	}
+	return &AIDEMExt, nil
+}
+
+// Builds enpoint url based on adapter-specific pub settings from imp.ext
+func (a *AIDEMAdapter) buildEndpointURL(params *openrtb_ext.ExtImpAIDEM) (string, error) {
+	endpointParams := macros.EndpointTemplateParams{PublisherID: params.PublisherId}
+	return macros.ResolveMacros(a.EndpointTemplate, endpointParams)
+}

adapters/aidem/aidem_test.go

@@ -5,14 +5,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/prebid/prebid-server/v2/adapters/adapterstest"
-	"github.com/prebid/prebid-server/v2/config"
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/adapters/adapterstest"
+	"github.com/prebid/prebid-server/config"
+	"github.com/prebid/prebid-server/openrtb_ext"
 )
 
 func TestJsonSamples(t *testing.T) {
 	bidder, buildErr := Builder(openrtb_ext.BidderAidem, config.Adapter{
-		Endpoint: "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+		Endpoint: "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id={{.PublisherID}}",
 	}, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"})
 
 	if buildErr != nil {
@@ -26,5 +26,5 @@ func TestEndpointTemplateMalformed(t *testing.T) {
 	_, buildErr := Builder(openrtb_ext.BidderAidem, config.Adapter{
 		Endpoint: "{{Malformed}}"}, config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"})
 
-	assert.Nil(t, buildErr)
+	assert.Error(t, buildErr)
 }

adapters/aidem/aidemtest/exemplary/multi-format.json

@@ -35,7 +35,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/multi-imps-multi-bid.json

@@ -41,7 +41,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/multi-imps-single-bid.json

@@ -41,7 +41,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/no-bid.json

@@ -24,7 +24,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/optional-params.json

@@ -25,7 +25,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/simple-banner.json

@@ -24,7 +24,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/exemplary/simple-video.json

@@ -27,7 +27,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/supplemental/invalid-req-400-status-code-bad-request.json

@@ -41,7 +41,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "some-request-id",
                     "imp": [

adapters/aidem/aidemtest/supplemental/invalid-res-200-status-code-empty-bids.json

@@ -41,7 +41,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "some-request-id",
                     "imp": [

adapters/aidem/aidemtest/supplemental/invalid-resp-multi-imp-type.json

@@ -57,7 +57,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/supplemental/valid-req-200-bid-response-from-aidem.json

@@ -44,7 +44,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "id": "test-request-id",
                     "imp": [

adapters/aidem/aidemtest/supplemental/valid-req-204-response-from-aidem.json

@@ -28,7 +28,7 @@
     "httpCalls": [
         {
             "expectedRequest": {
-                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request",
+                "uri": "https://fakezero.aidemsrv.com/ortb/v2.6/bid/request?billing_id=1234",
                 "body": {
                     "app": {
                         "bundle": "com.example.app"

adapters/aidem/params_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/openrtb_ext"
 )
 
 // This file actually intends to test static/bidder-params/aidem.json TODO: MUST BE CREATED