Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes revisions for notifications (#511)

Browse Source
This commit is contained in:
Keagan McClelland
2021-09-23 13:27:05 -06:00
committed by Aiden McClelland
parent 5b3e445b53
commit d5e59db7cc
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appmgr/src/notifications.rs
View File

@@ -4,11 +4,12 @@ use std::str::FromStr;
use anyhow::anyhow; use anyhow::anyhow;
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use patch_db::{LockType, PatchDb}; use patch_db::{LockType, PatchDb, Revision};
use rpc_toolkit::command; use rpc_toolkit::command;
use sqlx::SqlitePool; use sqlx::SqlitePool;
use crate::context::RpcContext; use crate::context::RpcContext;
use crate::db::util::WithRevision;
use crate::s9pk::manifest::PackageId; use crate::s9pk::manifest::PackageId;
use crate::util::{display_none, display_serializable}; use crate::util::{display_none, display_serializable};
use crate::{Error, ErrorKind}; use crate::{Error, ErrorKind};
@@ -23,7 +24,7 @@ pub async fn list(
#[context] ctx: RpcContext, #[context] ctx: RpcContext,
#[arg] before: Option<u32>, #[arg] before: Option<u32>,
#[arg] limit: Option<u32>, #[arg] limit: Option<u32>,
) -> Result<Vec<Notification>, Error> { ) -> Result<WithRevision<Vec<Notification>>, Error> {
let limit = limit.unwrap_or(40); let limit = limit.unwrap_or(40);
let mut handle = ctx.db.handle(); let mut handle = ctx.db.handle();
match before { match before {
@@ -66,8 +67,11 @@ pub async fn list(
}) })
.collect::<Result<Vec<Notification>, Error>>()?; .collect::<Result<Vec<Notification>, Error>>()?;
// set notification count to zero // set notification count to zero
model.put(&mut handle, &0).await?; let r = model.put(&mut handle, &0).await?;
Ok(notifs) Ok(WithRevision {
response: notifs,
revision: r,
})
} }
Some(before) => { Some(before) => {
let records = sqlx::query!( let records = sqlx::query!(
@@ -75,7 +79,7 @@ pub async fn list(
before, before,
limit limit
).fetch_all(&ctx.secret_store).await?; ).fetch_all(&ctx.secret_store).await?;
records let res = records
.into_iter() .into_iter()
.map(|r| { .map(|r| {
Ok(Notification { Ok(Notification {
@@ -103,7 +107,11 @@ pub async fn list(
}, },
}) })
}) })
.collect::<Result<Vec<Notification>, Error>>() .collect::<Result<Vec<Notification>, Error>>()?;
Ok(WithRevision {
response: res,
revision: None,
})
} }
} }
} }