feat(gpodder): add paginated sessions function
parent
bf132f93dc
commit
823133c034
|
@ -65,3 +65,9 @@ pub struct Subscription {
|
||||||
pub url: String,
|
pub url: String,
|
||||||
pub time_changed: DateTime<Utc>,
|
pub time_changed: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
|
pub struct Page {
|
||||||
|
pub page: u32,
|
||||||
|
pub per_page: u32,
|
||||||
|
}
|
||||||
|
|
|
@ -37,6 +37,14 @@ impl GpodderRepository {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn paginated_sessions(
|
||||||
|
&self,
|
||||||
|
user: &models::User,
|
||||||
|
page: models::Page,
|
||||||
|
) -> Result<Vec<models::Session>, AuthErr> {
|
||||||
|
self.store.paginated_sessions(user, page)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_user(&self, username: &str) -> Result<models::User, AuthErr> {
|
pub fn get_user(&self, username: &str) -> Result<models::User, AuthErr> {
|
||||||
self.store.get_user(username)?.ok_or(AuthErr::UnknownUser)
|
self.store.get_user(username)?.ok_or(AuthErr::UnknownUser)
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,10 @@ pub trait AuthStore {
|
||||||
/// Retrieve the session with the given session ID
|
/// Retrieve the session with the given session ID
|
||||||
fn get_session(&self, session_id: i64) -> Result<Option<Session>, AuthErr>;
|
fn get_session(&self, session_id: i64) -> Result<Option<Session>, AuthErr>;
|
||||||
|
|
||||||
|
/// Retrieve a paginated list of the given user's sessions, ordered descending by the last seen
|
||||||
|
/// value.
|
||||||
|
fn paginated_sessions(&self, user: &User, page: Page) -> Result<Vec<Session>, AuthErr>;
|
||||||
|
|
||||||
/// Retrieve the user with the given username
|
/// Retrieve the user with the given username
|
||||||
fn get_user(&self, username: &str) -> Result<Option<User>, AuthErr>;
|
fn get_user(&self, username: &str) -> Result<Option<User>, AuthErr>;
|
||||||
|
|
||||||
|
|
|
@ -114,4 +114,31 @@ impl gpodder::AuthStore for SqliteRepository {
|
||||||
.map_err(DbError::from)?,
|
.map_err(DbError::from)?,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn paginated_sessions(
|
||||||
|
&self,
|
||||||
|
user: &gpodder::User,
|
||||||
|
page: gpodder::Page,
|
||||||
|
) -> Result<Vec<gpodder::Session>, AuthErr> {
|
||||||
|
(|| {
|
||||||
|
let sessions = sessions::table
|
||||||
|
.filter(sessions::user_id.eq(user.id))
|
||||||
|
.order(sessions::last_seen.desc())
|
||||||
|
.offset((page.page * page.per_page) as i64)
|
||||||
|
.limit(page.per_page as i64)
|
||||||
|
.select(Session::as_select())
|
||||||
|
.get_results(&mut self.pool.get()?)?
|
||||||
|
.into_iter()
|
||||||
|
.map(|session| gpodder::Session {
|
||||||
|
id: session.id,
|
||||||
|
last_seen: DateTime::from_timestamp(session.last_seen, 0).unwrap(),
|
||||||
|
user_agent: session.user_agent,
|
||||||
|
user: user.clone(),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok::<_, DbError>(sessions)
|
||||||
|
})()
|
||||||
|
.map_err(AuthErr::from)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue