publisher.ext.parentAccount to publisher.ext.prebid.parentAccount (pr…

…ebid#1044)

endpoints/openrtb2/auction.go

@@ -1175,8 +1175,8 @@ func effectivePubID(pub *openrtb.Publisher) string {
 		if pub.Ext != nil {
 			var pubExt openrtb_ext.ExtPublisher
 			err := json.Unmarshal(pub.Ext, &pubExt)
-			if err == nil && pubExt.ParentAccount != nil && *pubExt.ParentAccount != "" {
-				return *pubExt.ParentAccount
+			if err == nil && pubExt.Prebid != nil && pubExt.Prebid.ParentAccount != nil && *pubExt.Prebid.ParentAccount != "" {
+				return *pubExt.Prebid.ParentAccount
 			}
 		}
 		if pub.ID != "" {

endpoints/openrtb2/auction_test.go

@@ -853,7 +853,7 @@ func TestEffectivePubID(t *testing.T) {
 	assert.Equal(t, pbsmetrics.PublisherUnknown, effectivePubID(&pub), "effectivePubID failed for empty Publisher.")
 	pub.ID = "123"
 	assert.Equal(t, "123", effectivePubID(&pub), "effectivePubID failed for standard Publisher.")
-	pub.Ext = json.RawMessage(`{"parentAccount": "abc"}`)
+	pub.Ext = json.RawMessage(`{"prebid": {"parentAccount": "abc"} }`)
 	assert.Equal(t, "abc", effectivePubID(&pub), "effectivePubID failed for parentAccount.")
 }
 

openrtb_ext/publisher.go

@@ -2,7 +2,11 @@ package openrtb_ext
 
 // ExtPublisher defines the contract for ...publisher.ext (found in both bidrequest.site and bidrequest.app)
 type ExtPublisher struct {
+	Prebid *ExtPublisherPrebid `json:"prebid"`
+}
 
+// ExtPublisherPrebid defines the contract for publisher.ext.prebid
+type ExtPublisherPrebid struct {
 	// parentAccount would define the legal entity (publisher owner or network) that has the direct relationship with the PBS
 	// host. As such, the definition depends on the PBS hosting entity.
 	ParentAccount *string `json:"parentAccount,omitempty"`