Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
16 changes: 6 additions & 10 deletions src/main/java/org/prebid/server/auction/ImpAdjuster.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.prebid.server.auction;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.Imp;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.json.JsonMerger;
import org.prebid.server.util.StreamUtil;
import org.prebid.server.validation.ImpValidator;

import java.util.Iterator;
Expand Down Expand Up @@ -81,16 +79,14 @@ private void setAeParams(ObjectNode ext) {

final boolean extIgsAePresent = Optional.ofNullable(ext)
.map(extNode -> extNode.get(EXT_IGS))
.filter(JsonNode::isArray)
.stream()
.flatMap(extNode -> StreamUtil.asStream(extNode.spliterator()))
.filter(Objects::nonNull)
.anyMatch(igsElementNode -> igsElementNode.has(EXT_AE));
.map(igsNode -> igsNode.get(EXT_AE))
.isPresent();

if (!extIgsAePresent && (extAe == 0 || extAe == 1)) {
final ArrayNode extIgs = jacksonMapper.mapper().createArrayNode();
extIgs.add(jacksonMapper.mapper().createObjectNode().set(EXT_AE, IntNode.valueOf(extAe)));
ext.set(EXT_IGS, extIgs);
final ObjectNode igsNode = jacksonMapper.mapper().createObjectNode()
.set(EXT_AE, IntNode.valueOf(extAe));

ext.set(EXT_IGS, igsNode);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/prebid/server/auction/ImpAdjusterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void adjustShouldSetImpExtIgsAeWhenImpExtAeIsZero() {
final Imp result = target.adjust(givenImp, "someBidder", bidderAliases, debugMessages);

// then
assertThat(result.getExt().get("igs").get(0).get("ae")).isEqualTo(IntNode.valueOf(0));
assertThat(result.getExt().get("igs").get("ae")).isEqualTo(IntNode.valueOf(0));
assertThat(debugMessages).isEmpty();
}

Expand All @@ -110,7 +110,7 @@ public void adjustShouldSetImpExtIgsAeWhenImpExtAeIsOne() {
final Imp result = target.adjust(givenImp, "someBidder", bidderAliases, debugMessages);

// then
assertThat(result.getExt().get("igs").get(0).get("ae")).isEqualTo(IntNode.valueOf(1));
assertThat(result.getExt().get("igs").get("ae")).isEqualTo(IntNode.valueOf(1));
assertThat(debugMessages).isEmpty();
}

Expand All @@ -137,7 +137,7 @@ public void adjustShouldNotModifyImpExtIgsAeWhenImpExtIgsAePresent() {
// given
final ObjectNode ext = mapper.createObjectNode();
ext.set("ae", IntNode.valueOf(0));
ext.set("igs", mapper.createArrayNode().add(mapper.createObjectNode().set("ae", IntNode.valueOf(123))));
ext.set("igs", mapper.createObjectNode().set("ae", IntNode.valueOf(123)));

final Imp givenImp = Imp.builder().ext(ext).build();

Expand All @@ -147,7 +147,7 @@ public void adjustShouldNotModifyImpExtIgsAeWhenImpExtIgsAePresent() {
final Imp result = target.adjust(givenImp, "someBidder", bidderAliases, debugMessages);

// then
assertThat(result.getExt().get("igs").get(0).get("ae")).isEqualTo(IntNode.valueOf(123));
assertThat(result.getExt().get("igs").get("ae")).isEqualTo(IntNode.valueOf(123));
assertThat(debugMessages).isEmpty();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@
},
"ext": {
"ae": 1,
"igs": [
{
"ae": 1
}
],
"igs": {
"ae": 1
},
"tid": "${json-unit.any-string}",
"bidder": {
"siteId": "10002"
Expand Down
Loading