Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.prebid.server.bidder.cpmstar;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.response.Bid;
Expand Down Expand Up @@ -79,7 +81,17 @@ private Imp createImp(ExtImpCpmStar extImpCpmStar, Imp imp) {
if (extImpCpmStar == null) {
throw new PreBidException("imp id=%s: bidder.ext is null".formatted(imp.getId()));
}
return imp.toBuilder().ext(mapper.mapper().valueToTree(extImpCpmStar)).build();

final ObjectNode impExt = imp.getExt() != null
? imp.getExt().deepCopy()
: mapper.mapper().createObjectNode();

final JsonNode bidderNode = impExt.remove("bidder");
if (bidderNode != null && bidderNode.isObject()) {
bidderNode.fields().forEachRemaining(entry -> impExt.set(entry.getKey(), entry.getValue()));
}

return imp.toBuilder().ext(impExt).build();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.prebid.server.bidder.cpmstar;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.Audio;
import com.iab.openrtb.request.Banner;
import com.iab.openrtb.request.BidRequest;
Expand Down Expand Up @@ -87,6 +88,41 @@ public void makeHttpRequestsShouldSkipInvalidImpressionAndAddError() {
assertThat(result.getValue()).isEmpty();
}

@Test
public void makeHttpRequestsShouldPreserveExistingExtFieldsWhenFlatteningBidder() throws JsonProcessingException {
// given:
final ObjectNode ext = mapper.createObjectNode();
ext.set("bidder", mapper.valueToTree(ExtImpCpmStar.of(12, 123)));
ext.put("gpid", "abc-123");

final Imp imp = Imp.builder()
.id("123")
.banner(Banner.builder().w(300).h(250).build())
.ext(ext)
.build();

final BidRequest bidRequest = BidRequest.builder()
.imp(singletonList(imp))
.build();

final CpmStarBidder target = new CpmStarBidder("https://test.endpoint.com", jacksonMapper);

// when
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);

// then
assertThat(result.getErrors()).isEmpty();

final BidRequest outgoing = result.getValue().getFirst().getPayload();
final ObjectNode outgoingExt = outgoing.getImp().getFirst().getExt();

assertThat(outgoingExt.has("gpid")).isTrue();
assertThat(outgoingExt.get("gpid").asText()).isEqualTo("abc-123");
assertThat(outgoingExt.has("bidder")).isFalse();
assertThat(outgoingExt.get("placementId").asInt()).isEqualTo(12);
assertThat(outgoingExt.get("subpoolId").asInt()).isEqualTo(123);
}

@Test
public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() {
// given
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
"gdpr": 0
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
"h": 250
},
"ext": {
"tid": "${json-unit.any-string}",
"placementId": 1234,
"subpoolId": 1234
}
}
],
"source": {
"tid": "${json-unit.any-string}"
},
"site": {
"domain": "www.example.com",
"page": "http://www.example.com",
Expand All @@ -36,6 +34,9 @@
"cur": [
"USD"
],
"source": {
"tid": "${json-unit.any-string}"
},
"regs": {
"ext": {
"gdpr": 0
Expand All @@ -52,3 +53,4 @@
}
}
}

Loading