diff --git a/src/main/java/org/prebid/server/bidder/smilewanted/SmileWantedBidder.java b/src/main/java/org/prebid/server/bidder/smilewanted/SmileWantedBidder.java index e75601bf389..9f99df66564 100644 --- a/src/main/java/org/prebid/server/bidder/smilewanted/SmileWantedBidder.java +++ b/src/main/java/org/prebid/server/bidder/smilewanted/SmileWantedBidder.java @@ -3,10 +3,12 @@ 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; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; import io.vertx.core.MultiMap; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderCall; @@ -101,16 +103,45 @@ private static List bidsFromResponse(BidRequest bidRequest, BidRespon final SeatBid firstSeatBid = bidResponse.getSeatbid().getFirst(); return CollectionUtils.emptyIfNull(firstSeatBid.getBid()).stream() .filter(Objects::nonNull) - .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur())) + .map(bid -> BidderBid.of(bid, getBidType(bid, bidRequest.getImp()), bidResponse.getCur())) .toList(); } - private static BidType getBidType(String impid, List imps) { + private static BidType getBidType(Bid bid, List imps) { + return switch (bid.getMtype()) { + case 1 -> BidType.banner; + case 2 -> BidType.video; + case 3 -> BidType.audio; + case 4 -> BidType.xNative; + case null, default -> getBidTypeFromImp(bid, imps); + }; + } + + private static BidType getBidTypeFromImp(Bid bid, List imps) { for (Imp imp : imps) { - if (imp.getId().equals(impid) && imp.getVideo() != null) { - return BidType.video; + if (imp.getId().equals(bid.getImpid())) { + return getBidTypeFromMarkup(bid.getAdm(), imp); } } return BidType.banner; } + + // Among the media types the imp offers, the markup decides: VAST is video or audio, + // a JSON object is native, anything else is banner. An imp without banner keeps its own media type. + private static BidType getBidTypeFromMarkup(String adm, Imp imp) { + final boolean isVast = StringUtils.contains(adm, ""; + private static final String NATIVE_ADM = "{\"ver\":\"1.2\",\"assets\":[{\"id\":1,\"title\":{\"text\":\"Title\"}}]}"; private final SmileWantedBidder target = new SmileWantedBidder(ENDPOINT_URL, jacksonMapper); @@ -229,6 +237,230 @@ public void makeBidsShouldReturnBannerBidIfVideoIsAbsentInRequestImp() throws Js .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), banner, null)); } + @Test + public void makeBidsShouldReturnBannerBidIfMtypeIsBannerOnMultiFormatImp() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenMultiFormatImp())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(1))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").mtype(1).build(), banner, null)); + } + + @Test + public void makeBidsShouldReturnVideoBidIfMtypeIsVideoOnMultiFormatImp() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenMultiFormatImp())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(2))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").mtype(2).build(), video, null)); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMtypeIsAbsentAndAdmIsHtmlOnBannerVideoImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenMultiFormatImp())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(HTML_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(HTML_ADM).build(), banner, null)); + } + + @Test + public void makeBidsShouldReturnVideoBidIfMtypeIsAbsentAndAdmIsVastOnBannerVideoImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenMultiFormatImp())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(VAST_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(VAST_ADM).build(), video, null)); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMtypeIsAbsentAndAdmIsHtmlOnBannerAudioImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenBannerImp(impBuilder -> impBuilder.audio(Audio.builder().build())))) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(HTML_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(HTML_ADM).build(), banner, null)); + } + + @Test + public void makeBidsShouldReturnAudioBidIfMtypeIsAbsentAndAdmIsVastOnBannerAudioImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenBannerImp(impBuilder -> impBuilder.audio(Audio.builder().build())))) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(VAST_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(VAST_ADM).build(), audio, null)); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMtypeIsAbsentAndAdmIsHtmlOnBannerNativeImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenBannerImp(impBuilder -> impBuilder.xNative(Native.builder().build())))) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(HTML_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(HTML_ADM).build(), banner, null)); + } + + @Test + public void makeBidsShouldReturnNativeBidIfMtypeIsAbsentAndAdmIsJsonOnBannerNativeImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(givenBannerImp(impBuilder -> impBuilder.xNative(Native.builder().build())))) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").adm(NATIVE_ADM))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").adm(NATIVE_ADM).build(), xNative, null)); + } + + @Test + public void makeBidsShouldReturnAudioBidIfMtypeIsAudio() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").audio(Audio.builder().build()).build())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(3))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").mtype(3).build(), audio, null)); + } + + @Test + public void makeBidsShouldReturnNativeBidIfMtypeIsNative() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(4))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").mtype(4).build(), xNative, null)); + } + + @Test + public void makeBidsShouldReturnAudioBidIfMtypeIsAbsentAndAudioIsPresentInRequestImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").audio(Audio.builder().build()).build())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123"))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), audio, null)); + } + + @Test + public void makeBidsShouldReturnNativeBidIfMtypeIsAbsentAndNativeIsPresentInRequestImp() + throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build())) + .build(), + givenBidResponse(bidBuilder -> bidBuilder.impid("123"))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), xNative, null)); + } + @Test public void makeBidsShouldReturnMultipleBidsFromSingleSeatBid() throws JsonProcessingException { // given @@ -350,4 +582,12 @@ private static Imp givenImp(String zoneId) { .ext(mapper.valueToTree(ExtPrebid.of(null, ExtImpSmilewanted.of(zoneId)))) .build(); } + + private static Imp givenMultiFormatImp() { + return givenBannerImp(impBuilder -> impBuilder.video(Video.builder().build())); + } + + private static Imp givenBannerImp(Function impCustomizer) { + return impCustomizer.apply(Imp.builder().id("123").banner(Banner.builder().build())).build(); + } }