Skip to content

Commit

Permalink
Merge pull request #835 from SourcePointUSA/DIA-4456_integrate_mobile…
Browse files Browse the repository at this point in the history 
…-core

DIA-4456 integrate core `/meta-data`
  • Loading branch information
@andresilveirah
andresilveirah authored Sep 28, 2024
2 parents ab2e87d + 6a1b7d3 commit 1fa50f6
Show file tree
Hide file tree
Showing 32 changed files with 444 additions and 628 deletions.
209 changes: 107 additions & 102 deletions ...brary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.sourcepoint.cmplibrary.data.local.* //ktlint-disable
import com.sourcepoint.cmplibrary.data.network.converter.JsonConverter
import com.sourcepoint.cmplibrary.data.network.converter.converter
import com.sourcepoint.cmplibrary.data.network.model.optimized.ConsentStatusResp
import com.sourcepoint.cmplibrary.data.network.model.optimized.MetaDataResp
import com.sourcepoint.cmplibrary.data.network.model.optimized.USNatConsentData
import com.sourcepoint.cmplibrary.data.network.util.CampaignsEnv
import com.sourcepoint.cmplibrary.exception.CampaignType
Expand All @@ -19,7 +18,7 @@ import com.sourcepoint.cmplibrary.model.exposed.SpCampaign
import com.sourcepoint.cmplibrary.model.exposed.SpConfig
import com.sourcepoint.cmplibrary.model.exposed.TargetingParam
import com.sourcepoint.cmplibrary.util.file2String
import kotlinx.serialization.decodeFromString
import com.sourcepoint.mobile_core.network.responses.MetaDataResponse
import org.json.JSONObject
import org.junit.Before
import org.junit.Test
Expand Down Expand Up @@ -177,28 +176,6 @@ class CampaignManagerImplTest {
campaignManager.messagesOptimizedLocalState.assertNotNull()
}

@Test
fun given_a_v7_MetaData_STORE_it_into_the_local_data_storage() {
val json = "v7/meta_data.json".file2String()
val obj = JsonConverter.converter.decodeFromString<MetaDataResp>(json)

campaignManager.metaDataResp = obj

campaignManager.metaDataResp?.run {
gdpr?.also {
it.applies!!.assertTrue()
it.vendorListId!!.assertEquals("5fa9a8fda228635eaf24ceb5")
}
ccpa?.also {
it.applies!!.assertTrue()
}
}

campaignManager.metaDataResp = null

campaignManager.metaDataResp.assertNull()
}

@Test
fun given_an_expired_GDPR_and_a_valid_CCPA_campaign_DELETE_only_the_GDPR_consent() {
val json = JSONObject("v7/expired_gdpr_valid_ccpa.json".file2String())
Expand Down Expand Up @@ -265,104 +242,116 @@ class CampaignManagerImplTest {

@Test
fun given_gdpr_vendor_list_id_did_not_change_THEN_should_return_false() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val gdprVendorListId = "5fa9a8fda228635eaf24ceb5"

// WHEN
val actual = campaignManager.hasGdprVendorListIdChanged(gdprVendorListId)

// THEN
actual.assertFalse()
campaignManager.metaDataResp = MetaDataResponse(
gdpr = MetaDataResponse.MetaDataResponseGDPR(
vendorListId = "123",
additionsChangeDate = "",
applies = false,
childPmId = null,
legalBasisChangeDate = "",
sampleRate = 1.0f
),
usnat = null,
ccpa = null
)
campaignManager.hasGdprVendorListIdChanged("123").assertFalse()
}

@Test
fun given_gdpr_vendor_list_id_changed_from_something_to_something_else_THEN_should_return_true() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val gdprVendorListId = "6cb1e2bcb337524aed35abc4"

// WHEN
val actual = campaignManager.hasGdprVendorListIdChanged(gdprVendorListId)

// THEN
actual.assertTrue()
campaignManager.metaDataResp = MetaDataResponse(
gdpr = MetaDataResponse.MetaDataResponseGDPR(
vendorListId = "123",
additionsChangeDate = "",
applies = false,
childPmId = null,
legalBasisChangeDate = "",
sampleRate = 1.0f
),
usnat = null,
ccpa = null
)
campaignManager.hasGdprVendorListIdChanged("321").assertTrue()
}

@Test
fun given_gdpr_vendor_list_id_changed_from_something_to_null_THEN_should_return_false() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val gdprVendorListId = null

// WHEN
val actual = campaignManager.hasGdprVendorListIdChanged(gdprVendorListId)

// THEN
actual.assertFalse()
campaignManager.metaDataResp = MetaDataResponse(
gdpr = MetaDataResponse.MetaDataResponseGDPR(
vendorListId = "123",
additionsChangeDate = "",
applies = false,
childPmId = null,
legalBasisChangeDate = "",
sampleRate = 1.0f
),
usnat = null,
ccpa = null
)
campaignManager.hasGdprVendorListIdChanged(null).assertFalse()
}

@Test
fun given_usnat_vendor_list_id_changed_from_null_to_something_THEN_should_return_false() {
// GIVEN
val usNatVendorListId = "new_usnat_vendor_list_id"

// WHEN
val actual = campaignManager.hasUsNatVendorListIdChanged(usNatVendorListId)

// THEN
actual.assertFalse()
campaignManager
.hasUsNatVendorListIdChanged("new_usnat_vendor_list_id")
.assertFalse()
}

@Test
fun given_usnat_vendor_list_id_did_not_change_THEN_should_return_false() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val usNatVendorListId = "64e6268d5ee47ddf019bfa22"

// WHEN
val actual = campaignManager.hasUsNatVendorListIdChanged(usNatVendorListId)

// THEN
actual.assertFalse()
campaignManager.metaDataResp = MetaDataResponse(
gdpr = null,
usnat = MetaDataResponse.MetaDataResponseUSNat(
applies = false,
sampleRate = 1.0f,
additionsChangeDate = "",
applicableSections = emptyList(),
vendorListId = "123"
),
ccpa = null
)
campaignManager
.hasUsNatVendorListIdChanged("123")
.assertFalse()
}

@Test
fun given_usnat_vendor_list_id_changed_from_something_to_something_else_THEN_should_return_true() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val usnatVendorListId = "6cb1e2bcb337524aed35abc4"

// WHEN
val actual = campaignManager.hasUsNatVendorListIdChanged(usnatVendorListId)

// THEN
actual.assertTrue()
campaignManager.metaDataResp = MetaDataResponse(
gdpr = null,
usnat = MetaDataResponse.MetaDataResponseUSNat(
applies = false,
sampleRate = 1.0f,
additionsChangeDate = "",
applicableSections = emptyList(),
vendorListId = "123"
),
ccpa = null
)
campaignManager
.hasUsNatVendorListIdChanged("abc")
.assertTrue()
}

@Test
fun given_usnat_vendor_list_id_changed_from_something_to_null_THEN_should_return_false() {
// GIVEN
val metaDataJson = "v7/meta_data.json".file2String()
val storedMetaData = JsonConverter.converter.decodeFromString<MetaDataResp>(metaDataJson)
campaignManager.metaDataResp = storedMetaData
val usnatVendorListId = null

// WHEN
val actual = campaignManager.hasUsNatVendorListIdChanged(usnatVendorListId)

// THEN
actual.assertFalse()
campaignManager.handleMetaDataResponse(
MetaDataResponse(
gdpr = null,
usnat = MetaDataResponse.MetaDataResponseUSNat(
applies = false,
sampleRate = 1.0f,
additionsChangeDate = "",
applicableSections = emptyList(),
vendorListId = "123"
),
ccpa = null
)
)
campaignManager
.hasUsNatVendorListIdChanged(null)
.assertFalse()
}

@Test
Expand All @@ -371,8 +360,16 @@ class CampaignManagerImplTest {
dataStorage.usnatSampled = true
val newRate = 0.5
campaignManager.handleMetaDataResponse(
MetaDataResp(
usNat = MetaDataResp.USNat(sampleRate = newRate)
MetaDataResponse(
gdpr = null,
usnat = MetaDataResponse.MetaDataResponseUSNat(
applies = false,
sampleRate = newRate.toFloat(),
additionsChangeDate = "",
applicableSections = emptyList(),
vendorListId = ""
),
ccpa = null
)
)
dataStorage.usnatSampleRate.assertEquals(newRate)
Expand All @@ -385,8 +382,16 @@ class CampaignManagerImplTest {
dataStorage.usnatSampled = true
val newRate = 0.5
campaignManager.handleMetaDataResponse(
MetaDataResp(
usNat = MetaDataResp.USNat(sampleRate = newRate)
MetaDataResponse(
gdpr = null,
usnat = MetaDataResponse.MetaDataResponseUSNat(
applies = false,
sampleRate = newRate.toFloat(),
additionsChangeDate = "",
applicableSections = emptyList(),
vendorListId = ""
),
ccpa = null
)
)
dataStorage.usnatSampleRate.assertEquals(newRate)
Expand Down
39 changes: 23 additions & 16 deletions cmplibrary/src/debug/java/com/sourcepoint/cmplibrary/creation/ComponentFactory.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import com.sourcepoint.cmplibrary.data.network.NetworkClient
import com.sourcepoint.cmplibrary.data.network.connection.ConnectionManager
import com.sourcepoint.cmplibrary.data.network.connection.create
import com.sourcepoint.cmplibrary.data.network.createNetworkClient
import com.sourcepoint.cmplibrary.data.network.model.optimized.MetaDataParamReq
import com.sourcepoint.cmplibrary.data.network.model.optimized.MetaDataResp
import com.sourcepoint.cmplibrary.data.network.model.optimized.choice.ChoiceResp
import com.sourcepoint.cmplibrary.data.network.model.optimized.choice.GetChoiceParamReq
import com.sourcepoint.cmplibrary.data.network.util.HttpUrlManagerSingleton
import com.sourcepoint.cmplibrary.data.network.util.ResponseManager
import com.sourcepoint.cmplibrary.exception.Logger
import com.sourcepoint.mobile_core.network.requests.MetaDataRequest
import com.sourcepoint.mobile_core.network.responses.MetaDataResponse
import okhttp3.OkHttpClient

internal fun getConnectionManager(appCtx: Context): ConnectionManager {
Expand All @@ -38,13 +38,24 @@ internal fun getConnectionManager(appCtx: Context): ConnectionManager {
return mockObject ?: ConnectionManager.create(appCtx)
}

internal fun networkClient(appCtx: Context, netClient: OkHttpClient, responseManage: ResponseManager, logger: Logger): NetworkClient {
internal fun networkClient(
accountId: Int,
propertyId: Int,
propertyName: String,
appCtx: Context,
netClient: OkHttpClient,
responseManage: ResponseManager,
logger: Logger
): NetworkClient {

val nc = createNetworkClient(
httpClient = netClient,
responseManager = responseManage,
urlManager = HttpUrlManagerSingleton,
logger = logger
logger = logger,
accountId = accountId,
propertyId = propertyId,
propertyName = propertyName
)

val mockObject: NetworkClient? = com.sourcepoint.cmplibrary.util.check {
Expand All @@ -66,18 +77,14 @@ internal fun networkClient(appCtx: Context, netClient: OkHttpClient, responseMan
}

internal class NCMock(nc: NetworkClient, val applies: Boolean) : NetworkClient by nc {
override fun getMetaData(param: MetaDataParamReq): Either<MetaDataResp> {
return Either.Right(
MetaDataResp(
gdpr = null,
ccpa = MetaDataResp.Ccpa(
sampleRate = 1.0,
applies = applies
),
usNat = null
)
)
}
override fun getMetaData(campaigns: MetaDataRequest.Campaigns) = MetaDataResponse(
gdpr = null,
ccpa = MetaDataResponse.MetaDataResponseCCPA(
applies = applies,
sampleRate = 1.0f
),
usnat = null
)
}

internal class NCMockStoreChoiceException(nc: NetworkClient) : NetworkClient by nc {
Expand Down
2 changes: 1 addition & 1 deletion cmplibrary/src/main/java/com/sourcepoint/cmplibrary/SpConsentLibImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ internal class SpConsentLibImpl(
pJsonConverter
.toConsentAction(actionData)
.map { ca ->
if(ca.actionType == PM_DISMISS && clientEventManager.isFirstLayerMessage) {
if (ca.actionType == PM_DISMISS && clientEventManager.isFirstLayerMessage) {
onAction(view, actionData)
} else {
onActionFromWebViewClient(ca, view)
Expand Down
Loading

0 comments on commit 1fa50f6

Please sign in to comment.