Skip to content

Insticator: Add Bidder #3647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CTMBNara merged 4 commits into from
Jan 3, 2025
Merged

Insticator: Add Bidder #3647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e95dd8
Insticator: Add Bidder
AntoxaAntoxic Dec 20, 2024
02bc9df
Merge branch 'refs/heads/master' into insticator-adapter
AntoxaAntoxic Dec 27, 2024
07221db
Fix Comments
AntoxaAntoxic Dec 30, 2024
c79cb5a
Fix Comments
AntoxaAntoxic Jan 3, 2025
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
31 changes: 16 additions & 15 deletions src/main/java/org/prebid/server/bidder/insticator/InsticatorBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
}
}

final BidRequest modifiedRequest = modifyRequest(request, publisherId, errors);
final BidRequest modifiedRequest = modifyRequest(request, publisherId);
final List<HttpRequest<BidRequest>> requests = groupedImps.values().stream()
.map(imps -> modifiedRequest.toBuilder().imp(imps).build())
.map(finalRequest -> BidderUtil.defaultRequest(
Expand Down Expand Up @@ -153,11 +153,11 @@ private Price convertBidFloor(Price bidFloorPrice, BidRequest bidRequest) {
return Price.of(DEFAULT_BIDDER_CURRENCY, BidderUtil.roundFloor(convertedPrice));
}

private BidRequest modifyRequest(BidRequest request, String publisherId, List<BidderError> errors) {
private BidRequest modifyRequest(BidRequest request, String publisherId) {
return request.toBuilder()
.site(modifySite(request.getSite(), publisherId))
.app(modifyApp(request.getApp(), publisherId))
.ext(modifyExtRequest(request.getExt(), errors))
.ext(modifyExtRequest(request.getExt()))
.build();
}

Expand Down Expand Up @@ -185,18 +185,9 @@ private static Publisher modifyPublisher(Publisher publisher, String id) {
.build();
}

private ExtRequest modifyExtRequest(ExtRequest extRequest, List<BidderError> errors) {
private ExtRequest modifyExtRequest(ExtRequest extRequest) {
final ExtRequest modifiedExtRequest = extRequest == null ? ExtRequest.empty() : extRequest;
final InsticatorExtRequest existingInsticator;

try {
existingInsticator = mapper.mapper().convertValue(
modifiedExtRequest.getProperty(INSTICATOR_FIELD),
InsticatorExtRequest.class);
} catch (IllegalArgumentException e) {
errors.add(BidderError.badInput(e.getMessage()));
return modifiedExtRequest;
}
final InsticatorExtRequest existingInsticator = getInsticatorExtRequest(modifiedExtRequest);

modifiedExtRequest.addProperty(
INSTICATOR_FIELD,
Expand All @@ -205,14 +196,24 @@ private ExtRequest modifyExtRequest(ExtRequest extRequest, List<BidderError> err
return modifiedExtRequest;
}

private InsticatorExtRequest getInsticatorExtRequest(ExtRequest modifiedExtRequest) {
try {
return mapper.mapper().convertValue(
modifiedExtRequest.getProperty(INSTICATOR_FIELD),
InsticatorExtRequest.class);
} catch (IllegalArgumentException e) {
return null;
}
}
Copy link
Collaborator

@CTMBNara CTMBNara Jan 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, rollback this part of change. We need to inform about this error.


private static InsticatorExtRequest buildInsticator(InsticatorExtRequest existingInsticator) {
if (existingInsticator == null || CollectionUtils.isEmpty(existingInsticator.getCaller())) {
return InsticatorExtRequest.of(Collections.singletonList(DEFAULT_INSTICATOR_CALLER));
}

final List<InsticatorExtRequestCaller> callers = new ArrayList<>(existingInsticator.getCaller());
callers.add(DEFAULT_INSTICATOR_CALLER);
return InsticatorExtRequest.of(callers);
return InsticatorExtRequest.of(Collections.unmodifiableList(callers));
}

private static MultiMap makeHeaders(Device device) {
Expand Down
29 changes: 29 additions & 0 deletions src/test/java/org/prebid/server/bidder/insticator/InsticatorBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,35 @@ public void makeHttpRequestsShouldAddsToExtRequestInsticatorDefaultCaller() {
.containsExactly(expectedExtRequest);
}

@Test
public void makeHttpRequestsShouldAddsToExtRequestInsticatorDefaultCallerWhenExistingInsticatorCanNotBeParsed() {
// given
final ExtRequest givenExtRequest = ExtRequest.empty();
givenExtRequest.addProperty("insticator", mapper.createArrayNode());
final BidRequest bidRequest = givenBidRequest(imp -> imp.id("givenImp"))
.toBuilder()
.ext(givenExtRequest)
.build();

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

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

final ExtRequest expectedExtRequest = ExtRequest.empty();
expectedExtRequest.addProperty("insticator",
mapper.createObjectNode().set("caller",
mapper.createArrayNode().add(mapper.createObjectNode()
.put("name", "Prebid-Server")
.put("version", "n/a"))));

assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getPayload)
.flatExtracting(BidRequest::getExt)
.containsExactly(expectedExtRequest);
}

@Test
public void makeHttpRequestsShouldModifyAppWithPublisherIdOfTheFirstImp() {
// given
Expand Down
Loading