fix review: invocationContext.accountConfig

Author: EvgeniiMunin

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/model/data/GreenbidsConfig.java

@@ -16,10 +16,10 @@ public class GreenbidsConfig {
 
     String pbuid;
 
-    @JsonProperty("targetTpr")
+    @JsonProperty("target-tpr")
     Double targetTpr;
 
-    @JsonProperty("explorationRate")
+    @JsonProperty("exploration-rate")
     Double explorationRate;
 
     public Double getThreshold(ThrottlingThresholds throttlingThresholds) {

extra/modules/greenbids-real-time-data/src/main/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java

@@ -78,7 +78,7 @@ public Future<InvocationResult<AuctionRequestPayload>> call(
         final AuctionContext auctionContext = invocationContext.auctionContext();
         final BidRequest bidRequest = auctionContext.getBidRequest();
         final GreenbidsConfig greenbidsConfig = Optional.ofNullable(parseBidRequestExt(auctionContext))
-                .orElse(parseAccountConfig(auctionContext.getAccount()));
+                .orElse(parseAccountConfig(invocationContext.accountConfig()));
 
         if (greenbidsConfig == null) {
             return Future.failedFuture(
@@ -113,13 +113,12 @@ private boolean isNotEmptyObjectNode(JsonNode analytics) {
         return analytics != null && analytics.isObject() && !analytics.isEmpty();
     }
 
-    private GreenbidsConfig parseAccountConfig(Account account) {
-        return Optional.ofNullable(account)
-                .map(Account::getHooks)
-                .map(AccountHooksConfiguration::getModules)
-                .map(modules -> modules.get(name()))
-                .map(this::toGreenbidsConfig)
-                .orElse(null);
+    private GreenbidsConfig parseAccountConfig(ObjectNode accountConfig) {
+        try {
+            return mapper.treeToValue(accountConfig, GreenbidsConfig.class);
+        } catch (JsonProcessingException e) {
+            throw new PreBidException(e.getMessage());
+        }
     }
 
     private GreenbidsConfig toGreenbidsConfig(ObjectNode adapterNode) {

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java

@@ -167,9 +167,9 @@ public void callShouldFilterBiddersWhenPartnerActivatedInBidRequest()
         final BidRequest bidRequest = givenBidRequestWithExtension(identity(), List.of(imp));
         final AuctionContext auctionContext = givenAuctionContext(
                 bidRequest,
-                context -> context,
-                explorationRate);
-        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(auctionContext);
+                context -> context);
+        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(
+                auctionContext, explorationRate);
         when(invocationContext.auctionContext()).thenReturn(auctionContext);
         when(modelCacheWithExpiration.getIfPresent("onnxModelRunner_test-pbuid"))
                 .thenReturn(givenOnnxModelRunner());
@@ -229,8 +229,9 @@ public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() thr
         final Double explorationRate = 1.0;
         final Device device = givenDevice(identity());
         final BidRequest bidRequest = givenBidRequest(request -> request, List.of(imp), device);
-        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context, explorationRate);
-        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(auctionContext);
+        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context);
+        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(
+                auctionContext, explorationRate);
         when(invocationContext.auctionContext()).thenReturn(auctionContext);
         when(modelCacheWithExpiration.getIfPresent("onnxModelRunner_test-pbuid"))
                 .thenReturn(givenOnnxModelRunner());
@@ -282,8 +283,9 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
         final Double explorationRate = 0.0001;
         final Device device = givenDeviceWithoutUserAgent(identity());
         final BidRequest bidRequest = givenBidRequest(request -> request, List.of(imp), device);
-        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context, explorationRate);
-        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(auctionContext);
+        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context);
+        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(
+                auctionContext, explorationRate);
         when(invocationContext.auctionContext()).thenReturn(auctionContext);
         when(modelCacheWithExpiration.getIfPresent("onnxModelRunner_test-pbuid"))
                 .thenReturn(givenOnnxModelRunner());
@@ -342,8 +344,9 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
         final Double explorationRate = 0.0001;
         final Device device = givenDevice(identity());
         final BidRequest bidRequest = givenBidRequest(request -> request, List.of(imp), device);
-        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context, explorationRate);
-        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(auctionContext);
+        final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context);
+        final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(
+                auctionContext, explorationRate);
         when(invocationContext.auctionContext()).thenReturn(auctionContext);
         when(modelCacheWithExpiration.getIfPresent("onnxModelRunner_test-pbuid"))
                 .thenReturn(givenOnnxModelRunner());
@@ -391,38 +394,30 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
 
     private AuctionContext givenAuctionContext(
             BidRequest bidRequest,
-            UnaryOperator<AuctionContext.AuctionContextBuilder> auctionContextCustomizer,
-            Double explorationRate) {
+            UnaryOperator<AuctionContext.AuctionContextBuilder> auctionContextCustomizer) {
 
         final AuctionContext.AuctionContextBuilder auctionContextBuilder = AuctionContext.builder()
                 .httpRequest(HttpRequestContext.builder().build())
-                .bidRequest(bidRequest)
-                .account(givenAccount(explorationRate));
+                .bidRequest(bidRequest);
 
         return auctionContextCustomizer.apply(auctionContextBuilder).build();
     }
 
-    private AuctionInvocationContext givenAuctionInvocationContext(AuctionContext auctionContext) {
+    private AuctionInvocationContext givenAuctionInvocationContext(
+            AuctionContext auctionContext, Double explorationRate) {
         final AuctionInvocationContext invocationContext = mock(AuctionInvocationContext.class);
         when(invocationContext.auctionContext()).thenReturn(auctionContext);
+        when(invocationContext.accountConfig()).thenReturn(givenAccountConfig(explorationRate));
         return invocationContext;
     }
 
-    private Account givenAccount(Double explorationRate) {
-        return Account.builder()
-                .id("test-account")
-                .hooks(givenAccountHooksConfiguration(explorationRate))
-                .build();
-    }
-
-    private AccountHooksConfiguration givenAccountHooksConfiguration(Double explorationRate) {
+    private ObjectNode givenAccountConfig(Double explorationRate) {
         final ObjectNode greenbidsNode = TestBidRequestProvider.MAPPER.createObjectNode();
         greenbidsNode.put("enabled", true);
         greenbidsNode.put("pbuid", "test-pbuid");
-        greenbidsNode.put("targetTpr", 0.60);
-        greenbidsNode.put("explorationRate", explorationRate);
-        final Map<String, ObjectNode> modules = Map.of("greenbids", greenbidsNode);
-        return AccountHooksConfiguration.of(null, modules, null);
+        greenbidsNode.put("target-tpr", 0.60);
+        greenbidsNode.put("exploration-rate", explorationRate);
+        return greenbidsNode;
     }
 
     private OnnxModelRunner givenOnnxModelRunner() throws OrtException, IOException {

src/main/java/org/prebid/server/analytics/reporter/greenbids/model/GreenbidsConfig.java

@@ -8,6 +8,6 @@ public class GreenbidsConfig {
 
     String pbuid;
 
-    @JsonProperty("greenbidsSampling")
+    @JsonProperty("greenbids-sampling")
     Double greenbidsSampling;
 }

src/test/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporterTest.java

@@ -668,7 +668,7 @@ private static Account givenAccount() {
     private static AccountAnalyticsConfig givenAccountHooksConfiguration() {
         final ObjectNode greenbidsNode = mapper.createObjectNode();
         greenbidsNode.put("pbuid", "leparisien");
-        greenbidsNode.put("greenbidsSampling", 1.0);
+        greenbidsNode.put("greenbids-sampling", 1.0);
         final Map<String, ObjectNode> modules = Map.of("greenbids", greenbidsNode);
         return AccountAnalyticsConfig.of(true, null, modules);
     }
@@ -701,7 +701,7 @@ private static BidRequest givenBidRequestWithExtension(
     private static ExtRequest givenExtRequest() {
         final ObjectNode greenbidsNode = new ObjectMapper().createObjectNode();
         greenbidsNode.put("pbuid", "leparisien");
-        greenbidsNode.put("greenbidsSampling", 1.0);
+        greenbidsNode.put("greenbids-sampling", 1.0);
 
         final ObjectNode analyticsNode = new ObjectMapper().createObjectNode();
         analyticsNode.set("greenbids", greenbidsNode);