update get interface tests

Author: osulzhenko

src/test/groovy/org/prebid/server/functional/model/request/auction/Device.groovy

@@ -1,8 +1,10 @@
 package org.prebid.server.functional.model.request.auction
 
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.util.PBSUtils
 
+@EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 class Device {
 

src/test/groovy/org/prebid/server/functional/model/request/auction/DeviceExt.groovy

@@ -2,8 +2,10 @@ package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
+@EqualsAndHashCode
 @ToString
 class DeviceExt {
 

src/test/groovy/org/prebid/server/functional/model/request/auction/Imp.groovy

@@ -111,6 +111,7 @@ class Imp {
         ].findAll { it }
     }
 
+    @JsonIgnore
     Object getSingleMediaTypeData() {
         return banner ?: video ?: nativeObj ?: audio
     }

src/test/groovy/org/prebid/server/functional/model/request/auction/PublicCountryIp.groovy

@@ -1,5 +1,7 @@
 package org.prebid.server.functional.model.request.auction
 
+import inet.ipaddr.IPAddressString
+
 enum PublicCountryIp {
 
     USA_IP("209.232.44.21", "d646:2414:17b2:f371:9b62:f176:b4c0:51cd"),
@@ -14,4 +16,8 @@ enum PublicCountryIp {
         this.v4 = v4
         this.v6 = ipV6
     }
+
+    String getMaskedIPv6() {
+        new IPAddressString(this.v6).toAddress().mask(new IPAddressString("::/64").toAddress().getNetworkMask()).toCanonicalString()
+    }
 }

src/test/groovy/org/prebid/server/functional/model/request/auction/StoredAuctionResponse.groovy

@@ -1,9 +1,11 @@
 package org.prebid.server.functional.model.request.auction
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.prebid.server.functional.model.response.auction.SeatBid
 
+@EqualsAndHashCode
 @ToString(includeNames = true, ignoreNulls = true)
 class StoredAuctionResponse {
 

src/test/groovy/org/prebid/server/functional/model/request/get/GeneralGetRequest.groovy

@@ -163,6 +163,7 @@ class GeneralGetRequest {
 
     String targeting
 
+    @JsonProperty("tcfc")
     String consent
 
     @JsonProperty("gdpr_consent")

src/test/groovy/org/prebid/server/functional/service/PrebidServerService.groovy

@@ -48,7 +48,7 @@ import static java.time.ZoneOffset.UTC
 class PrebidServerService implements ObjectMapperWrapper {
 
     static final String AUCTION_ENDPOINT = "/openrtb2/auction"
-    static final String GENERAL_GET_ENDPOINT = "/openrtb2/auction"
+    static final String GENERAL_GET_ENDPOINT = "/openrtb2/get"
     static final String AMP_ENDPOINT = "/openrtb2/amp"
     static final String COOKIE_SYNC_ENDPOINT = "/cookie_sync"
     static final String SET_UID_ENDPOINT = "/setuid"

src/test/groovy/org/prebid/server/functional/tests/GeneralGetInterfaceImpSpec.groovy

@@ -6,8 +6,10 @@ import org.prebid.server.functional.model.request.auction.BidRequest
 import org.prebid.server.functional.model.request.auction.Content
 import org.prebid.server.functional.model.request.auction.DebugCondition
 import org.prebid.server.functional.model.request.auction.Device
+import org.prebid.server.functional.model.request.auction.DeviceExt
 import org.prebid.server.functional.model.request.auction.DeviceType
 import org.prebid.server.functional.model.request.auction.PublicCountryIp
+import org.prebid.server.functional.model.request.auction.StoredAuctionResponse
 import org.prebid.server.functional.model.request.get.GeneralGetRequest
 import org.prebid.server.functional.service.PrebidServerException
 import org.prebid.server.functional.util.PBSUtils
@@ -45,7 +47,7 @@ class GeneralGetInterfaceRequestSpec extends BaseSpec {
         ]
     }
 
-    def "PBS should process bid request from default general get request "() {
+    def "PBS should response with error when process bid request is not specified in general get request"() {
         given: "General get request without stored request param"
         def generalGetRequest = new GeneralGetRequest()
 
@@ -736,6 +738,99 @@ class GeneralGetInterfaceRequestSpec extends BaseSpec {
         "True-Client-IP"  | PBSUtils.getRandomEnum(PublicCountryIp).v6
     }
 
+
+    def "PBS should use original values from stored request when it's not specified in get request"() {
+        given: "Default General get request"
+        def storedRequestId = PBSUtils.randomString
+        def generalGetRequest = new GeneralGetRequest(storedRequestId: storedRequestId)
+
+        and: "Default stored request"
+        def bidRequestDevice = new Device().tap {
+            it.dnt = PBSUtils.randomNumber
+            it.lmt = PBSUtils.randomNumber
+            it.ip = PBSUtils.getRandomEnum(PublicCountryIp).v4
+            it.ipv6 = PBSUtils.getRandomEnum(PublicCountryIp).maskedIPv6
+            it.ua = PBSUtils.randomString
+            it.devicetype = PBSUtils.getRandomEnum(DeviceType)
+            it.ifa = PBSUtils.randomString
+            it.ext = new DeviceExt(ifaType: PBSUtils.randomString)
+        }
+
+        def request = BidRequest.getDefaultBidRequest().tap {
+            it.tmax = PBSUtils.getRandomNumber(1000, 5000)
+            it.bcat = [PBSUtils.randomString]
+            it.badv = [PBSUtils.randomString]
+            it.device = bidRequestDevice
+
+            it.ext.prebid.debug = PBSUtils.getRandomEnum(DebugCondition)
+            it.ext.prebid.outputFormat = PBSUtils.randomString
+            it.ext.prebid.outputModule = PBSUtils.randomString
+            it.ext.prebid.storedAuctionResponse = new StoredAuctionResponse(id: PBSUtils.randomNumber)
+        }
+
+        and: "Save storedRequest into DB"
+        def storedRequest = StoredRequest.getStoredRequest(generalGetRequest.storedAuctionResponseId, request)
+        storedRequestDao.save(storedRequest)
+
+        when: "PBS processes general get request"
+        def response = defaultPbsService.sendGeneralGetRequest(generalGetRequest)
+
+        then: "Response should not contain errors and warnings"
+        assert !response.ext?.errors
+        assert !response.ext?.warnings
+
+        and: "Bidder request should contain device ip from headers"
+        verifyAll(bidder.getBidderRequest(request.id)) {
+            it.bcat == request.bcat
+            it.badv == request.badv
+            it.device == bidRequestDevice
+
+            it.ext.prebid.debug == request.ext.prebid.debug
+            it.ext.prebid.outputFormat == request.ext.prebid.outputFormat
+            it.ext.prebid.outputModule == request.ext.prebid.outputModule
+            it.ext.prebid.storedAuctionResponse == request.ext.prebid.storedAuctionResponse
+        }
+    }
+
+    def "PBS should use original content values from stored #channel request when it's not specified in get request"() {
+        given: "Default General get request"
+        def storedRequestId = PBSUtils.randomString
+        def generalGetRequest = new GeneralGetRequest(storedRequestId: storedRequestId)
+
+        and: "Default stored request"
+        def content = Content.getDefaultContent().tap {
+            it.genre = PBSUtils.randomString
+            it.language = PBSUtils.randomString
+            it.contentrating = PBSUtils.randomString
+            it.cat = [PBSUtils.randomString]
+            it.cattax = PBSUtils.randomNumber
+            it.series = PBSUtils.randomString
+            it.title = PBSUtils.randomString
+            it.url = PBSUtils.randomString
+            it.livestream = PBSUtils.randomNumber
+        }
+        def request = BidRequest.getDefaultBidRequest(channel).tap {
+            it.getProperty(channel.value).content = content
+        }
+
+        and: "Save storedRequest into DB"
+        def storedRequest = StoredRequest.getStoredRequest(generalGetRequest.storedAuctionResponseId, request)
+        storedRequestDao.save(storedRequest)
+
+        when: "PBS processes general get request"
+        def response = defaultPbsService.sendGeneralGetRequest(generalGetRequest)
+
+        then: "Response should not contain errors and warnings"
+        assert !response.ext?.errors
+        assert !response.ext?.warnings
+
+        and: "Bidder request should contain device ip from headers"
+        assert getRequestContent(bidder.getBidderRequest(request.id)) == content
+
+        where:
+        channel << [SITE, APP, DOOH]
+    }
+
     static String getDeviceIp(Device device) {
         device.ip ?: device.ipv6
     }
@@ -746,11 +841,9 @@ class GeneralGetInterfaceRequestSpec extends BaseSpec {
         if (distributionChannels.contains(SITE)) {
             return bidderRequest.site.content
         }
-
         if (distributionChannels.contains(APP)) {
             return bidderRequest.app.content
         }
-
         return bidderRequest.dooh.content
     }
 }

src/test/groovy/org/prebid/server/functional/tests/GeneralGetInterfaceRequestSpec.groovy

@@ -5,6 +5,11 @@ import org.prebid.server.functional.model.config.PurposeConfig
 import org.prebid.server.functional.model.db.StoredRequest
 import org.prebid.server.functional.model.request.GppSectionId
 import org.prebid.server.functional.model.request.auction.BidRequest
+import org.prebid.server.functional.model.request.auction.ConsentedProvidersSettings
+import org.prebid.server.functional.model.request.auction.Regs
+import org.prebid.server.functional.model.request.auction.RegsExt
+import org.prebid.server.functional.model.request.auction.User
+import org.prebid.server.functional.model.request.auction.UserExt
 import org.prebid.server.functional.model.request.get.GeneralGetRequest
 import org.prebid.server.functional.util.PBSUtils
 import org.prebid.server.functional.util.privacy.TcfConsent
@@ -496,4 +501,45 @@ class GeneralGetInterfacePrivacySpec extends PrivacyBaseSpec {
         def bidderRequest = bidder.getBidderRequest(request.id)
         assert bidderRequest.regs.gpc == gpc
     }
+
+    def "PBS should use original values from stored request when it's not specified in get request"() {
+        given: "Default General get request"
+        def storedRequestId = PBSUtils.randomString
+        def generalGetRequest = new GeneralGetRequest(storedRequestId: storedRequestId)
+
+        and: "Default stored request"
+        def userForRequest = User.defaultUser.tap {
+            it.consent = PBSUtils.randomString
+            it.ext = new UserExt(consentedProvidersSettings: new ConsentedProvidersSettings(consentedProviders: PBSUtils.randomString))
+        }
+        def regsForRequest = new Regs().tap {
+            it.gdpr = 0 // for preventing bidder block
+            it.gpp = PBSUtils.randomString
+            it.usPrivacy = PBSUtils.randomString
+            it.gppSid = [PBSUtils.randomNumber]
+            it.ext = new RegsExt(gpc: PBSUtils.randomNumber)
+            it.coppa = PBSUtils.randomNumber
+        }
+        def request = BidRequest.getDefaultBidRequest().tap {
+            user = userForRequest
+            regs = regsForRequest
+        }
+
+        and: "Save storedRequest into DB"
+        def storedRequest = StoredRequest.getStoredRequest(generalGetRequest.resolveStoredRequestId(), request)
+        storedRequestDao.save(storedRequest)
+
+        when: "PBS processes general get request"
+        def response = privacyPbsService.sendGeneralGetRequest(generalGetRequest)
+
+        then: "Response should not contain errors and warnings"
+        assert !response.ext?.errors
+        assert !response.ext?.warnings
+
+        and: "Bidder request should contain privacy data from original request"
+        verifyAll (bidder.getBidderRequest(request.id)) {
+            it.user == userForRequest
+            it.regs == regsForRequest
+        }
+    }
 }