feat(nextcloud): add command 'nextcloud stack list'
This commit is contained in:
parent
584f056b45
commit
72bc7b73f6
5 changed files with 81 additions and 53 deletions
13
src/lib.rs
13
src/lib.rs
|
@ -42,6 +42,8 @@ enum Command {
|
||||||
enum NextcloudCommand {
|
enum NextcloudCommand {
|
||||||
#[clap(subcommand)]
|
#[clap(subcommand)]
|
||||||
Board(NextcloudBoardCommand),
|
Board(NextcloudBoardCommand),
|
||||||
|
#[clap(subcommand)]
|
||||||
|
Stack(NextcloudStackCommand),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Parser, Debug)]
|
#[derive(Parser, Debug)]
|
||||||
|
@ -52,6 +54,14 @@ enum NextcloudBoardCommand {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Parser, Debug)]
|
||||||
|
enum NextcloudStackCommand {
|
||||||
|
List {
|
||||||
|
#[clap(long, action = clap::ArgAction::SetTrue)]
|
||||||
|
dump: bool,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Ctx {
|
pub struct Ctx {
|
||||||
pub fs: FileSystem,
|
pub fs: FileSystem,
|
||||||
|
@ -109,6 +119,9 @@ pub async fn run(ctx: Ctx) -> color_eyre::Result<()> {
|
||||||
Command::Nextcloud(NextcloudCommand::Board(NextcloudBoardCommand::List {
|
Command::Nextcloud(NextcloudCommand::Board(NextcloudBoardCommand::List {
|
||||||
dump,
|
dump,
|
||||||
})) => nextcloud::board::list(ctx, dump).await,
|
})) => nextcloud::board::list(ctx, dump).await,
|
||||||
|
Command::Nextcloud(NextcloudCommand::Stack(NextcloudStackCommand::List {
|
||||||
|
dump,
|
||||||
|
})) => nextcloud::stack::list(ctx, dump).await,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ use model::{Board, Card, NextcloudBoardId, Stack};
|
||||||
|
|
||||||
pub mod board;
|
pub mod board;
|
||||||
pub mod model;
|
pub mod model;
|
||||||
|
pub mod stack;
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
|
|
@ -98,6 +98,7 @@ newtype!(
|
||||||
newtype!(
|
newtype!(
|
||||||
NextcloudStackTitle,
|
NextcloudStackTitle,
|
||||||
String,
|
String,
|
||||||
|
Display,
|
||||||
PartialOrd,
|
PartialOrd,
|
||||||
Ord,
|
Ord,
|
||||||
"Title of the Stack"
|
"Title of the Stack"
|
||||||
|
@ -105,6 +106,7 @@ newtype!(
|
||||||
newtype!(
|
newtype!(
|
||||||
NextcloudCardTitle,
|
NextcloudCardTitle,
|
||||||
String,
|
String,
|
||||||
|
Display,
|
||||||
PartialOrd,
|
PartialOrd,
|
||||||
Ord,
|
Ord,
|
||||||
"Title of the Card"
|
"Title of the Card"
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
//
|
//
|
||||||
use crate::{p, FullCtx};
|
use crate::{p, FullCtx};
|
||||||
|
|
||||||
use super::DeckClient;
|
|
||||||
|
|
||||||
pub async fn list(ctx: FullCtx, dump: bool) -> color_eyre::Result<()> {
|
pub async fn list(ctx: FullCtx, dump: bool) -> color_eyre::Result<()> {
|
||||||
let dc = DeckClient::new(&ctx.cfg.nextcloud, ctx.net);
|
let api_result = ctx
|
||||||
let apiresult = dc.get_stacks(ctx.cfg.nextcloud.board_id()).await;
|
.deck_client()
|
||||||
|
.get_stacks(ctx.cfg.nextcloud.board_id)
|
||||||
|
.await;
|
||||||
if dump {
|
if dump {
|
||||||
p!("{}", apiresult.text);
|
p!(ctx.prt, "{}", api_result.text);
|
||||||
} else {
|
} else {
|
||||||
let mut stacks = apiresult.result?;
|
let mut stacks = api_result.result?;
|
||||||
stacks.sort_by_key(|stack| stack.order);
|
stacks.sort_by_key(|stack| stack.order);
|
||||||
stacks
|
stacks
|
||||||
.iter()
|
.iter()
|
||||||
.for_each(|stack| p!("{}:{}", stack.id, stack.title));
|
.for_each(|stack| p!(ctx.prt, "{}:{}", stack.id, stack.title));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,56 +173,68 @@ mod commands {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
mod stack {
|
||||||
async fn get_stacks() {
|
use super::*;
|
||||||
//given
|
|
||||||
let mock_net = kxio::net::mock();
|
|
||||||
|
|
||||||
mock_net
|
#[tokio::test]
|
||||||
.on()
|
async fn list() {
|
||||||
.get("https://host-name/index.php/apps/deck/api/v1.0/boards/2/stacks")
|
//given
|
||||||
.basic_auth("username", Some("password"))
|
let mock_net = kxio::net::mock();
|
||||||
.respond(StatusCode::OK)
|
|
||||||
.body(include_str!("../tests/responses/nextcloud-stack-list.json"))
|
|
||||||
.expect("mock request");
|
|
||||||
|
|
||||||
let fs = given::a_filesystem();
|
mock_net
|
||||||
let ctx = given::a_full_context(mock_net, fs);
|
.on()
|
||||||
let deck_client = DeckClient::new(&ctx);
|
.get("https://host-name/index.php/apps/deck/api/v1.0/boards/2/stacks")
|
||||||
|
.basic_auth("username", Some("password"))
|
||||||
|
.respond(StatusCode::OK)
|
||||||
|
.body(include_str!("../tests/responses/nextcloud-stack-list.json"))
|
||||||
|
.expect("mock request");
|
||||||
|
|
||||||
//when
|
let fs = given::a_filesystem();
|
||||||
let result = deck_client
|
let ctx = FullCtx {
|
||||||
.get_stacks(ctx.cfg.nextcloud.board_id)
|
fs: fs.as_real(),
|
||||||
.await
|
net: mock_net.into(),
|
||||||
.result
|
prt: given::a_printer(),
|
||||||
.expect("get stacks");
|
cfg: AppConfig {
|
||||||
|
trello: given::a_trello_config(),
|
||||||
assert_eq!(
|
nextcloud: given::a_nextcloud_config(),
|
||||||
result,
|
|
||||||
vec![
|
|
||||||
Stack {
|
|
||||||
id: NextcloudStackId::new(3),
|
|
||||||
title: NextcloudStackTitle::new("Done"),
|
|
||||||
order: NextcloudOrder::new(2),
|
|
||||||
board_id: NextcloudBoardId::new(1),
|
|
||||||
etag: NextcloudETag::new("97592874d17017ef4f620c9c2a490086")
|
|
||||||
},
|
},
|
||||||
Stack {
|
};
|
||||||
id: NextcloudStackId::new(2),
|
let deck_client = DeckClient::new(&ctx);
|
||||||
title: NextcloudStackTitle::new("Doing"),
|
|
||||||
order: NextcloudOrder::new(1),
|
//when
|
||||||
board_id: NextcloudBoardId::new(1),
|
let result = deck_client
|
||||||
etag: NextcloudETag::new("3da05f904903c88450b79e4f8f6e2160")
|
.get_stacks(ctx.cfg.nextcloud.board_id)
|
||||||
},
|
.await
|
||||||
Stack {
|
.result
|
||||||
id: NextcloudStackId::new(1),
|
.expect("get stacks");
|
||||||
title: NextcloudStackTitle::new("To do"),
|
|
||||||
order: NextcloudOrder::new(0),
|
assert_eq!(
|
||||||
board_id: NextcloudBoardId::new(1),
|
result,
|
||||||
etag: NextcloudETag::new("b567d287210fa4d9b108ac68d5b087c1")
|
vec![
|
||||||
}
|
Stack {
|
||||||
]
|
id: NextcloudStackId::new(3),
|
||||||
);
|
title: NextcloudStackTitle::new("Done"),
|
||||||
|
order: NextcloudOrder::new(2),
|
||||||
|
board_id: NextcloudBoardId::new(1),
|
||||||
|
etag: NextcloudETag::new("97592874d17017ef4f620c9c2a490086")
|
||||||
|
},
|
||||||
|
Stack {
|
||||||
|
id: NextcloudStackId::new(2),
|
||||||
|
title: NextcloudStackTitle::new("Doing"),
|
||||||
|
order: NextcloudOrder::new(1),
|
||||||
|
board_id: NextcloudBoardId::new(1),
|
||||||
|
etag: NextcloudETag::new("3da05f904903c88450b79e4f8f6e2160")
|
||||||
|
},
|
||||||
|
Stack {
|
||||||
|
id: NextcloudStackId::new(1),
|
||||||
|
title: NextcloudStackTitle::new("To do"),
|
||||||
|
order: NextcloudOrder::new(0),
|
||||||
|
board_id: NextcloudBoardId::new(1),
|
||||||
|
etag: NextcloudETag::new("b567d287210fa4d9b108ac68d5b087c1")
|
||||||
|
}
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue