Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.annotation.JsonNaming
import groovy.transform.ToString
import org.prebid.server.functional.model.ChannelType
import org.prebid.server.functional.model.bidder.BidderName

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
Expand All @@ -22,7 +23,7 @@ class AccountGdprConfig {
PurposeOneTreatmentInterpretation purposeOneTreatmentInterpretation
@JsonProperty("purpose_one_treatment_interpretation")
PurposeOneTreatmentInterpretation purposeOneTreatmentInterpretationSnakeCase
List<String> basicEnforcementVendors
List<BidderName> basicEnforcementVendors
@JsonProperty("basic_enforcement_vendors")
List<String> basicEnforcementVendorsSnakeCase
List<BidderName> basicEnforcementVendorsSnakeCase
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.databind.annotation.JsonNaming
import groovy.transform.ToString
import org.prebid.server.functional.model.bidder.BidderName

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
Expand All @@ -12,5 +13,5 @@ class SpecialFeatureConfig {
Boolean enforce
List<String> vendorExceptions
@JsonProperty("vendor_exceptions")
List<String> vendorExceptionsSnakeCase
List<BidderName> vendorExceptionsSnakeCase
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ import org.prebid.server.functional.model.config.Purpose
import org.prebid.server.functional.model.config.PurposeEnforcement
import org.prebid.server.functional.util.privacy.TcfConsent

import java.time.ZonedDateTime

import static org.prebid.server.functional.util.privacy.TcfConsent.RestrictionType.REQUIRE_CONSENT
import static org.prebid.server.functional.util.privacy.TcfConsent.RestrictionType.UNDEFINED

@ToString(includeNames = true, ignoreNulls = true)
@JsonNaming(PropertyNamingStrategies.KebabCaseStrategy)
class EnforcementRequirement {
Expand All @@ -27,4 +32,32 @@ class EnforcementRequirement {
List<TcfConsent.RestrictionType> restrictionType
Integer vendorIdGvl
Integer vendorListVersion
List<Integer> disclosedVendorsId
ZonedDateTime created = ZonedDateTime.now()
ZonedDateTime updated = ZonedDateTime.now()

static EnforcementRequirement getDefaultBase(Integer disclosedVendorsId, Purpose purpose = Purpose.P2) {
new EnforcementRequirement().tap {
it.purpose = purpose
it.enforcePurpose = PurposeEnforcement.BASIC
it.enforceVendor = false
it.disclosedVendorsId = [disclosedVendorsId]
}
}

static EnforcementRequirement getDefaultFull(Integer vendorId,
Integer vendorListVersion,
Purpose purpose = Purpose.P2) {

new EnforcementRequirement().tap {
it.enforcePurpose = PurposeEnforcement.FULL
it.purpose = purpose
it.enforceVendor = true
it.vendorIdGvl = vendorId
it.restrictionType = [REQUIRE_CONSENT, UNDEFINED]
it.vendorConsentBitField = vendorId
it.vendorListVersion = vendorListVersion
it.disclosedVendorsId = [vendorId]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.prebid.server.functional.service.PrebidServerService
import org.prebid.server.functional.testcontainers.container.NetworkServiceContainer
import org.prebid.server.functional.testcontainers.container.PrebidServerContainer
import org.prebid.server.functional.util.SystemProperties
import org.testcontainers.images.builder.Transferable

import static org.prebid.server.functional.util.SystemProperties.USE_FIXED_CONTAINER_PORTS

Expand All @@ -19,7 +20,7 @@ class PbsServiceFactory {
this.networkServiceContainer = networkServiceContainer
}

static PrebidServerService getService(Map<String, String> config) {
static PrebidServerService getService(Map<String, String> config, Map<String, Transferable> additionalFiles = [:]) {
if (containers.containsKey(config)) {
def container = containers.get(config)
container.refresh()
Expand All @@ -33,6 +34,9 @@ class PbsServiceFactory {
remove([(container.key): container.value])
}
def pbsContainer = new PrebidServerContainer(config)
if (!additionalFiles.isEmpty()) {
additionalFiles.each { k, v -> pbsContainer.withCopyToContainer(v, k) }
}
pbsContainer.start()
containers.put(config, pbsContainer)
return new PrebidServerService(pbsContainer)
Expand Down
Loading