Skip to content
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

Jump to bottom

Aidem: Url resolution updates #2951

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Aidem: Url resolution updates #2951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a69c17
Added url resolution.
And1sS Feb 5, 2024
670a27a
Added unit test.
And1sS Feb 5, 2024
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
32 changes: 28 additions & 4 deletions src/main/java/org/prebid/server/bidder/aidem/AidemBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.prebid.server.bidder.aidem;

import com.fasterxml.jackson.core.type.TypeReference;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.response.Bid;
Expand All @@ -15,6 +16,8 @@
import org.prebid.server.exception.PreBidException;
import org.prebid.server.json.DecodeException;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.proto.openrtb.ext.ExtPrebid;
import org.prebid.server.proto.openrtb.ext.request.aidem.ExtImpAidem;
import org.prebid.server.proto.openrtb.ext.response.BidType;
import org.prebid.server.util.BidderUtil;
import org.prebid.server.util.HttpUtil;
Expand All @@ -27,6 +30,11 @@

public class AidemBidder implements Bidder<BidRequest> {

private static final TypeReference<ExtPrebid<?, ExtImpAidem>> AIDEM_EXT_TYPE_REFERENCE =
new TypeReference<>() {
};
private static final String PUBLISHER_ID_MACRO = "{{PublisherId}}";

private final String endpointUrl;
private final JacksonMapper mapper;

Expand All @@ -37,7 +45,24 @@ public AidemBidder(String endpointUrl, JacksonMapper mapper) {

@Override
public final Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequest) {
return Result.withValue(BidderUtil.defaultRequest(bidRequest, endpointUrl, mapper));
try {
final ExtImpAidem impExt = parseImpExt(bidRequest.getImp().get(0));
return Result.withValue(BidderUtil.defaultRequest(bidRequest, makeUrl(impExt), mapper));
} catch (PreBidException e) {
return Result.withError(BidderError.badInput(e.getMessage()));
}
}

private ExtImpAidem parseImpExt(Imp imp) {
try {
return mapper.mapper().convertValue(imp.getExt(), AIDEM_EXT_TYPE_REFERENCE).getBidder();
} catch (IllegalArgumentException e) {
throw new PreBidException("Missing bidder ext in impression with id: " + imp.getId());
}
}

private String makeUrl(ExtImpAidem extImpAidem) {
return endpointUrl.replace(PUBLISHER_ID_MACRO, extImpAidem.getPublisherId());
}

@Override
Expand Down Expand Up @@ -93,9 +118,8 @@ private static BidType resolveBidType(Bid bid) throws PreBidException {
case 2 -> BidType.video;
case 3 -> BidType.audio;
case 4 -> BidType.xNative;
default ->
throw new PreBidException("Unable to fetch mediaType in multi-format: %s"
.formatted(bid.getImpid()));
default -> throw new PreBidException("Unable to fetch mediaType in multi-format: %s"
.formatted(bid.getImpid()));
};
}
}
2 changes: 1 addition & 1 deletion src/main/resources/bidder-config/aidem.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
adapters:
aidem:
endpoint: https://zero.aidemsrv.com/ortb/v2.6/bid/request
endpoint: https://zero.aidemsrv.com/ortb/v2.6/bid/request?billing_id={{PublisherId}}
modifyingVastXmlAllowed: true
meta-info:
maintainer-email: [email protected]
Expand Down
19 changes: 5 additions & 14 deletions src/test/java/org/prebid/server/bidder/aidem/AidemBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

public class AidemBidderTest extends VertxTest {

private static final String ENDPOINT_URL = "https://randomurl.com";
private static final String ENDPOINT_URL = "https://randomurl.com?param={{PublisherId}}";

private final AidemBidder target = new AidemBidder(ENDPOINT_URL, jacksonMapper);

Expand All @@ -46,7 +46,9 @@ public void creationShouldFailOnInvalidEndpointUrl() {
@Test
public void makeHttpRequestsShouldCreateExpectedUrl() {
// given
final BidRequest bidRequest = givenBidRequest(identity());
final ExtImpAidem impExt = ExtImpAidem.of(null, "publisherId", null, null);
final BidRequest bidRequest = givenBidRequest(impBuilder ->
impBuilder.ext(mapper.valueToTree(ExtPrebid.of(null, impExt))));

// when
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);
Expand All @@ -55,7 +57,7 @@ public void makeHttpRequestsShouldCreateExpectedUrl() {
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getUri)
.containsExactly("https://randomurl.com");
.containsExactly("https://randomurl.com?param=publisherId");
}

@Test
Expand Down Expand Up @@ -210,13 +212,6 @@ private static BidRequest givenBidRequest(
.build();
}

private static BidResponse givenBidResponse(Function<Bid.BidBuilder, Bid.BidBuilder> bidCustomizer) {
return BidResponse.builder()
.seatbid(singletonList(SeatBid.builder().bid(singletonList(bidCustomizer.apply(Bid.builder()).build()))
.build()))
.build();
}

private static BidResponse givenBidResponse(Bid... bids) {
return BidResponse.builder()
.cur("USD")
Expand All @@ -235,10 +230,6 @@ private static Imp givenImp(Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomiz
.build();
}

private static Bid givenBid() {
return Bid.builder().impid("123").build();
}

private static BidderCall<BidRequest> givenHttpCall(BidRequest bidRequest, String body) {
return BidderCall.succeededHttp(
HttpRequest.<BidRequest>builder().payload(bidRequest).build(),
Expand Down
Loading