Skip to content

Adview Manager V5 changes #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 13, 2022
Merged

Adview Manager V5 changes #466

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e15ee52
changed to use the V5 event struct and route
simzzz Jan 6, 2022
7fed852
Merge branch 'aip-61-adex-v5' into get-campaign-events
simzzz Jan 11, 2022
9e2a1e2
passed EventBody to request instead of vec
simzzz Jan 13, 2022
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
46 changes: 21 additions & 25 deletions adview-manager/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use adex_primitives::{
campaign::Validators,
sentry::Event,
supermarket::units_for_slot,
supermarket::units_for_slot::response::{AdUnit, Campaign},
targeting::{self, input},
Expand Down Expand Up @@ -72,18 +73,6 @@ pub struct HistoryEntry {
slot_id: IPFS,
}

#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct Event {
#[serde(rename = "type")]
event_type: String,
publisher: Address,
ad_unit: IPFS,
ad_slot: IPFS,
#[serde(rename = "ref")]
referrer: String,
}

#[derive(Serialize)]
struct EventBody {
events: Vec<Event>,
Expand Down Expand Up @@ -211,27 +200,34 @@ pub fn get_unit_html_with_events(
validators: &Validators,
no_impression: impl Into<bool>,
) -> String {
let get_body = |event_type: &str| EventBody {
events: vec![Event {
event_type: event_type.to_string(),
publisher: options.publisher_addr,
ad_unit: ad_unit.id,
ad_slot: options.market_slot,
referrer: "document.referrer".to_string(),
}],
};

let get_fetch_code = |event_type: &str| -> String {
let body = serde_json::to_string(&get_body(event_type))
.expect("It should always serialize EventBody");
let event = match event_type {
"CLICK" => Event::Click {
publisher: options.publisher_addr,
ad_unit: Some(ad_unit.id),
ad_slot: Some(options.market_slot),
referrer: Some("document.referrer".to_string()),
},
_ => Event::Impression {
publisher: options.publisher_addr,
ad_unit: Some(ad_unit.id),
ad_slot: Some(options.market_slot),
referrer: Some("document.referrer".to_string()),
},
};
let event_body = EventBody {
events: vec![event],
};
let body =
serde_json::to_string(&event_body).expect("It should always serialize EventBody");

let fetch_opts = format!("var fetchOpts = {{ method: 'POST', headers: {{ 'content-type': 'application/json' }}, body: {} }};", body);

let validators: String = validators
.iter()
.map(|validator| {
let fetch_url = format!(
"{}/channel/{}/events?pubAddr={}",
"{}/campaign/{}/events?pubAddr={}",
validator.url, campaign_id, options.publisher_addr
);

Expand Down