diff --git a/exchange/exchange_test.go b/exchange/exchange_test.go index 511fd84b71a..946a8587354 100644 --- a/exchange/exchange_test.go +++ b/exchange/exchange_test.go @@ -3592,7 +3592,7 @@ func TestApplyDealSupport(t *testing.T) { { description: "hb_pb_cat_dur should be modified", dealPriority: 5, - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), targ: map[string]string{ "hb_pb_cat_dur": "12.00_movies_30s", }, @@ -3603,7 +3603,7 @@ func TestApplyDealSupport(t *testing.T) { { description: "hb_pb_cat_dur should not be modified due to priority not exceeding min", dealPriority: 9, - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 10, "prefix": "tier"}, "placementId": 10433394}}`), + impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 10, "prefix": "tier"}, "placementId": 10433394}}}}`), targ: map[string]string{ "hb_pb_cat_dur": "12.00_medicine_30s", }, @@ -3614,7 +3614,7 @@ func TestApplyDealSupport(t *testing.T) { { description: "hb_pb_cat_dur should not be modified due to invalid config", dealPriority: 5, - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": ""}, "placementId": 10433394}}`), + impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": ""}, "placementId": 10433394}}}}`), targ: map[string]string{ "hb_pb_cat_dur": "12.00_games_30s", }, @@ -3625,7 +3625,7 @@ func TestApplyDealSupport(t *testing.T) { { description: "hb_pb_cat_dur should not be modified due to deal priority of 0", dealPriority: 0, - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), targ: map[string]string{ "hb_pb_cat_dur": "12.00_auto_30s", }, @@ -3695,11 +3695,11 @@ func TestApplyDealSupportMultiBid(t *testing.T) { Imp: []openrtb2.Imp{ { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, }, }, @@ -3741,11 +3741,11 @@ func TestApplyDealSupportMultiBid(t *testing.T) { Imp: []openrtb2.Imp{ { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, }, }, @@ -3792,11 +3792,11 @@ func TestApplyDealSupportMultiBid(t *testing.T) { Imp: []openrtb2.Imp{ { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, { ID: "imp_id1", - Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}`), + Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}, "placementId": 10433394}}}}`), }, }, }, @@ -3869,7 +3869,7 @@ func TestGetDealTiers(t *testing.T) { description: "One", request: openrtb2.BidRequest{ Imp: []openrtb2.Imp{ - {ID: "imp1", Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}}}`)}, + {ID: "imp1", Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier"}}}}}`)}, }, }, expected: map[string]openrtb_ext.DealTierBidderMap{ @@ -3880,8 +3880,8 @@ func TestGetDealTiers(t *testing.T) { description: "Many", request: openrtb2.BidRequest{ Imp: []openrtb2.Imp{ - {ID: "imp1", Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier1"}}}`)}, - {ID: "imp2", Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 8, "prefix": "tier2"}}}`)}, + {ID: "imp1", Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier1"}}}}}`)}, + {ID: "imp2", Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 8, "prefix": "tier2"}}}}}`)}, }, }, expected: map[string]openrtb_ext.DealTierBidderMap{ @@ -3893,8 +3893,8 @@ func TestGetDealTiers(t *testing.T) { description: "Many - Skips Malformed", request: openrtb2.BidRequest{ Imp: []openrtb2.Imp{ - {ID: "imp1", Ext: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier1"}}}`)}, - {ID: "imp2", Ext: json.RawMessage(`{"appnexus": {"dealTier": "wrong type"}}`)}, + {ID: "imp1", Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "tier1"}}}}}`)}, + {ID: "imp2", Ext: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": "wrong type"}}}}`)}, }, }, expected: map[string]openrtb_ext.DealTierBidderMap{ diff --git a/openrtb_ext/deal_tier.go b/openrtb_ext/deal_tier.go index ef85b9b1df8..45285d21663 100644 --- a/openrtb_ext/deal_tier.go +++ b/openrtb_ext/deal_tier.go @@ -27,20 +27,6 @@ func ReadDealTiersFromImp(imp openrtb2.Imp) (DealTierBidderMap, error) { return dealTiers, nil } - // imp.ext.{bidder} - var impExt map[string]struct { - DealTier *DealTier `json:"dealTier"` - } - if err := json.Unmarshal(imp.Ext, &impExt); err != nil { - return nil, err - } - for bidder, param := range impExt { - if param.DealTier != nil { - dealTiers[BidderName(bidder)] = *param.DealTier - } - } - - // imp.ext.prebid.{bidder} var impPrebidExt struct { Prebid struct { Bidders map[string]struct { diff --git a/openrtb_ext/deal_tier_test.go b/openrtb_ext/deal_tier_test.go index 6aaebbab687..0046b788ece 100644 --- a/openrtb_ext/deal_tier_test.go +++ b/openrtb_ext/deal_tier_test.go @@ -31,55 +31,50 @@ func TestReadDealTiersFromImp(t *testing.T) { expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext - with other params", - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "anyPrefix"}, "placementId": 12345}}`), - expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "anyPrefix", MinDealTier: 5}}, + description: "imp.ext - no prebid but with other params", + impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "anyPrefix"}, "placementId": 12345}, "tid": "1234"}`), + expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext - multiple", - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "appnexusPrefix"}, "placementId": 12345}, "rubicon": {"dealTier": {"minDealTier": 8, "prefix": "rubiconPrefix"}, "placementId": 12345}}`), - expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "appnexusPrefix", MinDealTier: 5}, BidderRubicon: {Prefix: "rubiconPrefix", MinDealTier: 8}}, + description: "imp.ext.prebid - nil", + impExt: json.RawMessage(`{"prebid": null}`), + expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext - no deal tier", - impExt: json.RawMessage(`{"appnexus": {"placementId": 12345}}`), + description: "imp.ext.prebid - empty", + impExt: json.RawMessage(`{"prebid": {}}`), expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext - error", - impExt: json.RawMessage(`{"appnexus": {"dealTier": "wrong type", "placementId": 12345}}`), - expectedError: "json: cannot unmarshal string into Go struct field .dealTier of type openrtb_ext.DealTier", + description: "imp.ext.prebid - no bidder but with other params", + impExt: json.RawMessage(`{"prebid": {"supportdeals": true}}`), + expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext.prebid", + description: "imp.ext.prebid.bidder - one", impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "anyPrefix"}, "placementId": 12345}}}}`), expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "anyPrefix", MinDealTier: 5}}, }, { - description: "imp.ext.prebid- multiple", + description: "imp.ext.prebid.bidder - one with other params", + impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "anyPrefix"}, "placementId": 12345}}, "supportdeals": true}, "tid": "1234"}`), + expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "anyPrefix", MinDealTier: 5}}, + }, + { + description: "imp.ext.prebid.bidder - multiple", impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "appnexusPrefix"}, "placementId": 12345}, "rubicon": {"dealTier": {"minDealTier": 8, "prefix": "rubiconPrefix"}, "placementId": 12345}}}}`), expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "appnexusPrefix", MinDealTier: 5}, BidderRubicon: {Prefix: "rubiconPrefix", MinDealTier: 8}}, }, { - description: "imp.ext.prebid - no deal tier", + description: "imp.ext.prebid.bidder - one without deal tier", impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"placementId": 12345}}}}`), expectedResult: DealTierBidderMap{}, }, { - description: "imp.ext.prebid - error", + description: "imp.ext.prebid.bidder - error", impExt: json.RawMessage(`{"prebid": {"bidder": {"appnexus": {"dealTier": "wrong type", "placementId": 12345}}}}`), expectedError: "json: cannot unmarshal string into Go struct field .prebid.bidder.dealTier of type openrtb_ext.DealTier", }, - { - description: "imp.ext.prebid wins over imp.ext", - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "impExt"}, "placementId": 12345}, "prebid": {"bidder": {"appnexus": {"dealTier": {"minDealTier": 8, "prefix": "impExtPrebid"}, "placementId": 12345}}}}`), - expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "impExtPrebid", MinDealTier: 8}}, - }, - { - description: "imp.ext.prebid coexists with imp.ext", - impExt: json.RawMessage(`{"appnexus": {"dealTier": {"minDealTier": 5, "prefix": "impExt"}, "placementId": 12345}, "prebid": {"bidder": {"rubicon": {"dealTier": {"minDealTier": 8, "prefix": "impExtPrebid"}, "placementId": 12345}}}}`), - expectedResult: DealTierBidderMap{BidderAppnexus: {Prefix: "impExt", MinDealTier: 5}, BidderRubicon: {Prefix: "impExtPrebid", MinDealTier: 8}}, - }, } for _, test := range testCases {