Skip to content

Commit 8358521

Browse files
elpielelpiel
authored
Merge pull request #556 from AmbireTech/issue-540-get-channel-validator-messages-tests
Issue 540 GET `/v5/channel/:id/validator-messages` tests
2 parents d67a390 + 0e394d4 commit 8358521

File tree

7 files changed

+471
-270
lines changed

7 files changed

+471
-270
lines changed

‎primitives/src/validator.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,12 @@ pub mod messages {
400400
Heartbeat(Heartbeat),
401401
}
402402

403+
impl MessageTypes {
404+
pub fn message_type(&self) -> MessageType {
405+
self.into()
406+
}
407+
}
408+
403409
/// All available message type names.
404410
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, FromStr, Display)]
405411
#[display(style = "CamelCase")]

‎sentry/src/middleware.rs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
//! This module contains all the routers' middlewares
22
//!
33
4-
#[cfg(test)]
5-
pub use test_util::*;
6-
74
pub mod auth;
85
pub mod campaign;
96
pub mod channel;
10-
11-
#[cfg(test)]
12-
pub mod test_util {
13-
use axum::{body::BoxBody, response::Response};
14-
15-
/// Extracts the body as a String from the Response.
16-
///
17-
/// Used when you want to check the response body or debug a response.
18-
pub async fn body_to_string(response: Response<BoxBody>) -> String {
19-
String::from_utf8(hyper::body::to_bytes(response).await.unwrap().to_vec()).unwrap()
20-
}
21-
}

‎sentry/src/middleware/auth.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,10 @@ mod test {
210210
};
211211
use primitives::test_util::{ADVERTISER, DUMMY_AUTH, FOLLOWER, IDS, LEADER, PUBLISHER};
212212

213-
use crate::{middleware::body_to_string, test_util::setup_dummy_app, Session};
213+
use crate::{
214+
test_util::{body_to_string, setup_dummy_app},
215+
Session,
216+
};
214217

215218
use super::*;
216219

‎sentry/src/routes/analytics.rs‎

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ mod test {
627627
}
628628

629629
// test with not allowed key
630-
// event type: IMPRESSION
630+
// event type: CLICK
631631
{
632632
let query = AnalyticsQuery {
633633
event_type: CLICK,
@@ -1276,19 +1276,6 @@ mod test {
12761276
.collect::<Vec<_>>(),
12771277
);
12781278
}
1279-
1280-
// TODO: test with no authUid
1281-
// let req = Request::builder()
1282-
// .uri("http://127.0.0.1/v5/analytics?limit=100&eventType=CLICK&metric=count&timeframe=day")
1283-
// .body(Body::empty())
1284-
// .expect("Should build Request");
1285-
1286-
// let analytics_response = analytics_router(req, &app, None, Some(AuthenticateAs::Publisher())).await;
1287-
// let err_msg = "auth_as_key is provided but there is no Auth object".to_string();
1288-
// assert!(matches!(
1289-
// analytics_response,
1290-
// Err(ResponseError::BadRequest(err_msg))
1291-
// ));
12921279
}
12931280

12941281
#[tokio::test]
@@ -1303,16 +1290,11 @@ mod test {
13031290
// Country
13041291
{
13051292
let query = AnalyticsQuery {
1306-
limit: 1000,
1307-
event_type: CLICK,
1308-
metric: Metric::Count,
1309-
segment_by: None,
13101293
time: Time {
13111294
timeframe: Timeframe::Day,
13121295
start: base_datehour - 1,
13131296
end: None,
13141297
},
1315-
chains: vec![GANACHE_1337.chain_id],
13161298
country: Some("Bulgaria".to_string()),
13171299
..Default::default()
13181300
};
@@ -1329,16 +1311,11 @@ mod test {
13291311
// Ad Slot Type
13301312
{
13311313
let query = AnalyticsQuery {
1332-
limit: 1000,
1333-
event_type: CLICK,
1334-
metric: Metric::Count,
1335-
segment_by: None,
13361314
time: Time {
13371315
timeframe: Timeframe::Day,
13381316
start: base_datehour - 1,
13391317
end: None,
13401318
},
1341-
chains: vec![GANACHE_1337.chain_id],
13421319
ad_slot_type: Some("legacy_300x100".to_string()),
13431320
..Default::default()
13441321
};
@@ -1356,16 +1333,11 @@ mod test {
13561333
// CampaignId
13571334
{
13581335
let query = AnalyticsQuery {
1359-
limit: 1000,
1360-
event_type: CLICK,
1361-
metric: Metric::Count,
1362-
segment_by: None,
13631336
time: Time {
13641337
timeframe: Timeframe::Day,
13651338
start: base_datehour - 1,
13661339
end: None,
13671340
},
1368-
chains: vec![GANACHE_1337.chain_id],
13691341
campaign_id: Some(DUMMY_CAMPAIGN.id),
13701342
..Default::default()
13711343
};
@@ -1386,16 +1358,11 @@ mod test {
13861358
// AdUnit
13871359
{
13881360
let query = AnalyticsQuery {
1389-
limit: 1000,
1390-
event_type: CLICK,
1391-
metric: Metric::Count,
1392-
segment_by: None,
13931361
time: Time {
13941362
timeframe: Timeframe::Day,
13951363
start: base_datehour - 1,
13961364
end: None,
13971365
},
1398-
chains: vec![GANACHE_1337.chain_id],
13991366
ad_unit: Some(DUMMY_IPFS[0]),
14001367
..Default::default()
14011368
};
@@ -1416,16 +1383,11 @@ mod test {
14161383
// AdSlot
14171384
{
14181385
let query = AnalyticsQuery {
1419-
limit: 1000,
1420-
event_type: CLICK,
1421-
metric: Metric::Count,
1422-
segment_by: None,
14231386
time: Time {
14241387
timeframe: Timeframe::Day,
14251388
start: base_datehour - 1,
14261389
end: None,
14271390
},
1428-
chains: vec![GANACHE_1337.chain_id],
14291391
ad_slot: Some(DUMMY_IPFS[1]),
14301392
..Default::default()
14311393
};
@@ -1446,16 +1408,11 @@ mod test {
14461408
// Advertiser
14471409
{
14481410
let query = AnalyticsQuery {
1449-
limit: 1000,
1450-
event_type: CLICK,
1451-
metric: Metric::Count,
1452-
segment_by: None,
14531411
time: Time {
14541412
timeframe: Timeframe::Day,
14551413
start: base_datehour - 1,
14561414
end: None,
14571415
},
1458-
chains: vec![GANACHE_1337.chain_id],
14591416
advertiser: Some(*ADVERTISER),
14601417
..Default::default()
14611418
};
@@ -1476,16 +1433,11 @@ mod test {
14761433
// Publisher
14771434
{
14781435
let query = AnalyticsQuery {
1479-
limit: 1000,
1480-
event_type: CLICK,
1481-
metric: Metric::Count,
1482-
segment_by: None,
14831436
time: Time {
14841437
timeframe: Timeframe::Day,
14851438
start: base_datehour - 1,
14861439
end: None,
14871440
},
1488-
chains: vec![GANACHE_1337.chain_id],
14891441
publisher: Some(*PUBLISHER),
14901442
..Default::default()
14911443
};
@@ -1506,16 +1458,11 @@ mod test {
15061458
// Hostname
15071459
{
15081460
let query = AnalyticsQuery {
1509-
limit: 1000,
1510-
event_type: CLICK,
1511-
metric: Metric::Count,
1512-
segment_by: None,
15131461
time: Time {
15141462
timeframe: Timeframe::Day,
15151463
start: base_datehour - 1,
15161464
end: None,
15171465
},
1518-
chains: vec![GANACHE_1337.chain_id],
15191466
hostname: Some("localhost".to_string()),
15201467
..Default::default()
15211468
};
@@ -1536,16 +1483,11 @@ mod test {
15361483
// OsName
15371484
{
15381485
let query = AnalyticsQuery {
1539-
limit: 1000,
1540-
event_type: CLICK,
1541-
metric: Metric::Count,
1542-
segment_by: None,
15431486
time: Time {
15441487
timeframe: Timeframe::Day,
15451488
start: base_datehour - 1,
15461489
end: None,
15471490
},
1548-
chains: vec![GANACHE_1337.chain_id],
15491491
os_name: Some(OperatingSystem::map_os("Windows")),
15501492
..Default::default()
15511493
};

0 commit comments

Comments
 (0)