Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

make session backwards compatible#1528

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from2 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
107 changes: 2 additions & 105 deletionspgml-dashboard/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

192 changes: 184 additions & 8 deletionspgml-dashboard/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -390,7 +390,6 @@ pub fn replace_banner_product(
context: &Cluster,
) -> Result<Response, Error> {
let mut all_notification_cookies = Notifications::get_viewed(cookies);

let current_notification_cookie = all_notification_cookies.iter().position(|x| x.id == id);

match current_notification_cookie {
Expand All@@ -408,8 +407,8 @@ pub fn replace_banner_product(

Notifications::update_viewed(&all_notification_cookies, cookies);

// Get the notification that triggered this call.
//Guaranteed to existsinceit built the component that calledthis, so thisissafe to unwrap.
// Get the notification that triggered this call..
//unwrap notifications if finesincewe should panic ifthisismissing.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

We should not be panicking if anything optional like this is missing. We should default tovec![].

let last_notification = context
.notifications
.as_ref()
Expand All@@ -424,11 +423,15 @@ pub fn replace_banner_product(
.into_iter()
.filter(|n: &Notification| -> bool {
let n = n.clone().set_viewed(n.id == id);
Notification::product_filter(
&n,
last_notification.clone().unwrap().level.clone(),
deployment_id.clone(),
)
if last_notification.clone().is_none() {
return false;
} else {
Notification::product_filter(
&n,
last_notification.clone().unwrap().level.clone(),
deployment_id.clone(),
)
}
})
.next(),
_ => None,
Expand DownExpand Up@@ -519,3 +522,176 @@ pub fn routes() -> Vec<Route> {
pub async fn migrate(pool: &PgPool) -> anyhow::Result<()> {
Ok(sqlx::migrate!("./migrations").run(pool).await?)
}

#[cfg(test)]
mod test {
use super::*;
use crate::components::sections::footers::MarketingFooter;
use crate::guards::Cluster;
use crate::utils::config;
use rocket::fairing::AdHoc;
use rocket::http::{Cookie, Status};
use rocket::local::asynchronous::Client;

#[sqlx::test]
async fn test_remove_modal() {
let rocket = rocket::build().mount("/", routes());
let client = Client::untracked(rocket).await.unwrap();

let cookie = vec![
NotificationCookie {
id: "1".to_string(),
time_viewed: Some(chrono::Utc::now() - chrono::Duration::days(1)),
time_modal_viewed: Some(chrono::Utc::now() - chrono::Duration::days(1)),
},
NotificationCookie {
id: "2".to_string(),
time_viewed: None,
time_modal_viewed: None,
},
];

let response = client
.get("/notifications/product/modal/remove_modal?id=1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This feels like the wrong place to implement this. This should be in our web app, and we should pass it through the context into the dashboard.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Not sure what you mean here. The test, or the endpoint should be in web app? I felt like both are needed here since notifications include marketing notifications.

.private_cookie(Cookie::new("session", Notifications::safe_serialize_session(&cookie)))
.dispatch()
.await;

let time_modal_viewed = Notifications::get_viewed(response.cookies())
.get(0)
.unwrap()
.time_modal_viewed;

// Update modal view time for existing notification cookie
assert_eq!(time_modal_viewed.is_some(), true);

let response = client
.get("/notifications/product/modal/remove_modal?id=3")
.private_cookie(Cookie::new("session", Notifications::safe_serialize_session(&cookie)))
.dispatch()
.await;

let time_modal_viewed = Notifications::get_viewed(response.cookies())
.get(0)
.unwrap()
.time_modal_viewed;

// Update modal view time for new notification cookie
assert_eq!(time_modal_viewed.is_some(), true);
}

#[sqlx::test]
async fn test_remove_banner_product() {
let rocket = rocket::build().mount("/", routes());
let client = Client::untracked(rocket).await.unwrap();

let cookie = vec![
NotificationCookie {
id: "1".to_string(),
time_viewed: Some(chrono::Utc::now() - chrono::Duration::days(1)),
time_modal_viewed: Some(chrono::Utc::now() - chrono::Duration::days(1)),
},
NotificationCookie {
id: "2".to_string(),
time_viewed: None,
time_modal_viewed: Some(chrono::Utc::now() - chrono::Duration::days(1)),
},
];

let response = client
.get("/notifications/product/remove_banner?id=1&target=ajskghjfbs")
.private_cookie(Cookie::new("session", Notifications::safe_serialize_session(&cookie)))
.dispatch()
.await;

let time_viewed = Notifications::get_viewed(response.cookies())
.get(0)
.unwrap()
.time_viewed;

// Update view time for existing notification cookie
assert_eq!(time_viewed.is_some(), true);

let response = client
.get("/notifications/product/remove_banner?id=3&target=ajfadghs")
.private_cookie(Cookie::new("session", Notifications::safe_serialize_session(&cookie)))
.dispatch()
.await;

let time_viewed = Notifications::get_viewed(response.cookies())
.get(0)
.unwrap()
.time_viewed;

// Update view time for new notification cookie
assert_eq!(time_viewed.is_some(), true);
}

#[sqlx::test]
async fn test_replace_banner_product() {
let notification1 = Notification::new("Test notification 1")
.set_level(&NotificationLevel::ProductMedium)
.set_deployment("1");
let notification2 = Notification::new("Test notification 2")
.set_level(&NotificationLevel::ProductMedium)
.set_deployment("1");
let notification3 = Notification::new("Test notification 3").set_level(&NotificationLevel::ProductMarketing);

let rocket = rocket::build()
.attach(AdHoc::on_request("request", |req, _| {
Box::pin(async {
req.local_cache(|| Cluster {
pool: None,
context: Context {
user: models::User::default(),
cluster: models::Cluster::default(),
dropdown_nav: StaticNav { links: vec![] },
product_left_nav: StaticNav { links: vec![] },
marketing_footer: MarketingFooter::new().render_once().unwrap(),
head_items: None,
},
notifications: Some(vec![
Notification::new("Test notification 1")
.set_level(&NotificationLevel::ProductMedium)
.set_deployment("1"),
Notification::new("Test notification 2")
.set_level(&NotificationLevel::ProductMedium)
.set_deployment("1"),
Notification::new("Test notification 3").set_level(&NotificationLevel::ProductMarketing),
]),
});
})
}))
.mount("/", routes());

let client = Client::tracked(rocket).await.unwrap();

let response = client
.get(format!(
"/notifications/product/replace_banner?id={}&deployment_id=1",
notification1.id
))
.dispatch()
.await;

let body = response.into_string().await.unwrap();
let rsp_contains_next_notification = body.contains("Test notification 2");

// ensure banner is replaced with next notification of same type
assert_eq!(rsp_contains_next_notification, true);

let response = client
.get(format!(
"/notifications/product/replace_banner?id={}&deployment_id=1",
notification2.id
))
.dispatch()
.await;

let body = response.into_string().await.unwrap();
let rsp_contains_next_notification = body.contains("Test notification 3");

// ensure next notification is not found
assert_eq!(rsp_contains_next_notification, false);
}
}
2 changes: 1 addition & 1 deletionpgml-dashboard/src/main.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ mod test {
async fn rocket() -> Rocket<Build> {
dotenv::dotenv().ok();

pgml_dashboard::migrate(Cluster::default(None).pool()).await.unwrap();
pgml_dashboard::migrate(Cluster::default().pool()).await.unwrap();

let mut site_search = markdown::SiteSearch::new()
.await
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp