kemitix/trello-to-deck
1
0
Fork 0
Code Issues 2 Pull requests Releases Activity Actions

WIP(TODO): define trello config model

Browse source
This commit is contained in:
Paul Campbell 2024-11-29 19:19:36 +00:00
parent 74036cf1ea
commit a6407a977c
7 changed files with 205 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/api_result.rs
View file

@ -1,32 +1,32 @@
//
// use kxio::net::Response;
//
// use crate::{e, s};
use kxio::net::Response;
// pub struct APIResult<T> {
// pub text: String,
// pub result: Result<T, kxio::net::Error>,
// }
use crate::{e, s};
// impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> {
// pub async fn new(response: kxio::net::Result<Response>) -> Self {
// match response {
// Ok(response) => {
// let text = response.text().await.unwrap_or_default();
// let text = if text.is_empty() { s!("null") } else { text };
// let result = serde_json::from_str::<T>(&text)
// .map_err(|e| e.to_string())
// .map_err(|e| {
// e!("{e}: {text}");
// e
// })
// .map_err(kxio::net::Error::from);
// Self { text, result }
// }
// Err(e) => Self {
// text: s!(""),
// result: Err(e),
// },
// }
// }
// }
pub struct APIResult<T> {
pub text: String,
pub result: Result<T, kxio::net::Error>,
}
impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> {
pub async fn new(response: kxio::net::Result<Response>) -> Self {
match response {
Ok(response) => {
let text = response.text().await.unwrap_or_default();
let text = if text.is_empty() { s!("null") } else { text };
let result = serde_json::from_str::<T>(&text)
.map_err(|e| e.to_string())
.map_err(|e| {
e!("{e}: {text}");
e
})
.map_err(kxio::net::Error::from);
Self { text, result }
}
Err(e) => Self {
text: s!(""),
result: Err(e),
},
}
}
}

51
src/config.rs
View file

@ -1,7 +1,52 @@
//
// use color_eyre::Result;
// use crate::{f, s, Ctx, NAME};
// use crate::{
// f, s,
// trello::{
// types::{
// auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser},
// TrelloBoardName,
// }
// },
// Ctx, NAME,
// };
#[derive(
Clone,
Debug,
derive_more::From,
PartialEq,
Eq,
PartialOrd,
Ord,
serde::Deserialize,
derive_more::Constructor,
)]
pub struct TrelloConfig {
pub user: String,
pub api_key: String,
pub api_secret: String,
pub board_name: String,
}
// impl TrelloConfig {
// pub fn user(&self) -> TrelloUser {
// TrelloUser::from(self.user.clone())
// }
// pub fn api_key(&self) -> TrelloApiKey {
// TrelloApiKey::from(self.api_key.clone())
// }
// pub fn api_secret(&self) -> TrelloApiSecret {
// TrelloApiSecret::from(self.api_secret.clone())
// }
// pub fn auth(&self) -> TrelloAuth {
// TrelloAuth::new(self.api_key(), self.api_secret(), self.user())
// }
//
// pub fn board_name(&self) -> TrelloBoardName {
// TrelloBoardName::from(self.board_name.clone())
// }
// }
#[derive(
Clone,
@ -15,7 +60,9 @@
serde::Deserialize,
derive_more::Constructor,
)]
pub struct AppConfig {}
pub struct AppConfig {
pub trello: TrelloConfig,
}
// impl AppConfig {
// pub fn load(ctx: &Ctx) -> Result<Self> {
// let file = ctx.fs.base().join(f!("{NAME}.toml"));

4
src/lib.rs
View file

@ -4,12 +4,12 @@ use std::path::PathBuf;
use clap::Parser;
use kxio::{fs::FileSystem, net::Net};
mod api_result;
// mod api_result;
mod config;
mod init;
mod macros;
mod template;
mod trello;
// mod trello;
#[cfg(test)]
mod tests;

104
src/trello/api/members.rs
View file

@ -1,54 +1,54 @@
//
// use kxio::net::Net;
use kxio::net::Net;
// use crate::api_result::APIResult;
// use crate::{
// f,
// trello::{
// types::{TrelloAuth, board::TrelloBoard},
// url,
// },
// };
//
// /// Get lists from named board that Member belongs to
// ///
// /// Get Boards that Member belongs to
// /// https://developer.atlassian.com/cloud/trello/rest/api-group-members/#api-members-id-boards-get
// /// /members/{id}/boards
// ///
// /// Lists the boards that the user is a member of.
// ///
// /// Request
// ///
// /// Path parameters
// ///
// /// - id TrelloID REQUIRED
// ///
// ///
// /// Query parameters
// ///
// /// - fields string
// /// Default: all
// /// Valid values: id, name, desc, descData, closed, idMemberCreator, idOrganization, pinned, url, shortUrl, prefs, labelNames, starred, limits, memberships, enterpriseOwned
// ///
// /// - lists string
// /// Which lists to include with the boards. One of: all, closed, none, open
// /// Default: none
// /// Valid values: all, closed, none, open
// ///
// /// curl --request GET \
// /// --url "https://api.trello.com/1/members/$TRELLO_USERNAME/boards?key=$TRELLO_KEY&token=$TRELLO_SECRET&lists=open" \
// /// --header 'Accept: application/json'
// pub async fn get_boards_that_member_belongs_to(
// auth: &TrelloAuth,
// net: &Net,
// ) -> APIResult<Vec<TrelloBoard>> {
// APIResult::new(
// net.get(url(f!("/members/{}/boards?lists=open", **auth.user())))
// .headers(auth.into())
// .header("Accept", "application/json")
// .send()
// .await,
// )
// .await
// }
use crate::api_result::APIResult;
use crate::{
f,
trello::{
types::{auth::TrelloAuth, board::TrelloBoard},
url,
},
};
/// Get lists from named board that Member belongs to
///
/// Get Boards that Member belongs to
/// https://developer.atlassian.com/cloud/trello/rest/api-group-members/#api-members-id-boards-get
/// /members/{id}/boards
///
/// Lists the boards that the user is a member of.
///
/// Request
///
/// Path parameters
///
/// - id TrelloID REQUIRED
///
///
/// Query parameters
///
/// - fields string
/// Default: all
/// Valid values: id, name, desc, descData, closed, idMemberCreator, idOrganization, pinned, url, shortUrl, prefs, labelNames, starred, limits, memberships, enterpriseOwned
///
/// - lists string
/// Which lists to include with the boards. One of: all, closed, none, open
/// Default: none
/// Valid values: all, closed, none, open
///
/// curl --request GET \
/// --url "https://api.trello.com/1/members/$TRELLO_USERNAME/boards?key=$TRELLO_KEY&token=$TRELLO_SECRET&lists=open" \
/// --header 'Accept: application/json'
pub async fn get_boards_that_member_belongs_to(
auth: &TrelloAuth,
net: &Net,
) -> APIResult<Vec<TrelloBoard>> {
APIResult::new(
net.get(url(f!("/members/{}/boards?lists=open", **auth.user())))
.headers(auth.into())
.header("Accept", "application/json")
.send()
.await,
)
.await
}

25
src/trello/api/tests/given.rs
View file

@ -1,15 +1,16 @@
// use kxio::net::MockNet;
//
use kxio::net::MockNet;
// use crate::trello::types::auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser};
use crate::trello::types::auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser};
// pub(crate) fn a_network() -> MockNet {
// kxio::net::mock()
// }
pub(crate) fn a_network() -> MockNet {
kxio::net::mock()
}
// pub(crate) fn an_auth() -> TrelloAuth {
// TrelloAuth::new(
// TrelloApiKey::new("foo"),
// TrelloApiSecret::new("bar"),
// TrelloUser::new("baz"),
// )
// }
pub(crate) fn an_auth() -> TrelloAuth {
TrelloAuth::new(
TrelloApiKey::new("foo"),
TrelloApiSecret::new("bar"),
TrelloUser::new("baz"),
)
}

99
src/trello/api/tests/mod.rs
View file

@ -1,61 +1,64 @@
// use super::*;
use super::*;
mod given;
// type TestResult = color_eyre::Result<()>;
type TestResult = color_eyre::Result<()>;
mod members {
// use std::collections::HashMap;
use std::collections::HashMap;
// use kxio::net::StatusCode;
// use serde_json::json;
use kxio::net::StatusCode;
use serde_json::json;
// use crate::{
// s,
// trello::{
// // api::members::get_boards_that_member_belongs_to,
// types::{board::TrelloBoard, TrelloBoardId, TrelloBoardName},
// },
// };
use crate::{
s,
trello::{
api::members::get_boards_that_member_belongs_to,
types::{board::TrelloBoard, TrelloBoardId, TrelloBoardName},
},
};
// use super::*;
//
// #[tokio::test]
// async fn get_member_boards() -> TestResult {
// //given
// let net = given::a_network();
// let auth = given::an_auth();
//
// net.on()
// .get("https://api.trello.com/1/members/baz/boards?lists=open")
// .headers(HashMap::from([
// (
// s!("authorization"),
// s!("OAuth oauth_consumer_key=\"foo\", oauth_token=\"bar\""),
// ),
// (s!("accept"), s!("application/json")),
// ]))
// .respond(StatusCode::OK)
// .body(s!(json!([
// {"id": "1", "name": "board-1", "lists":[]}
// ])))?;
//
// //when
// let result = get_boards_that_member_belongs_to(&auth, &net.into()).await;
//
// assert_eq!(
// result.result?,
// vec![TrelloBoard::new(
// TrelloBoardId::new("1"),
// TrelloBoardName::new("board-1"),
// vec![]
// )]
// );
//
// //then
// Ok(())
// }
use super::*;
#[tokio::test]
async fn get_member_boards() -> TestResult {
//given
let net = given::a_network();
let auth = given::an_auth();
net.on()
.get("https://api.trello.com/1/members/baz/boards?lists=open")
.headers(HashMap::from([
(
s!("authorization"),
s!("OAuth oauth_consumer_key=\"foo\", oauth_token=\"bar\""),
),
(s!("accept"), s!("application/json")),
]))
.respond(StatusCode::OK)
.body(s!(json!([
{"id": "1", "name": "board-1", "lists":[]}
])))?;
//when
let result = get_boards_that_member_belongs_to(&auth, &net.into())
.await
.result?;
assert_eq!(
result,
vec![TrelloBoard::new(
TrelloBoardId::new("1"),
TrelloBoardName::new("board-1"),
vec![]
)]
);
//then
Ok(())
}
}
// TODO: boards
// TODO: lists

12
src/trello/mod.rs
View file

@ -5,10 +5,10 @@ pub mod types;
#[cfg(test)]
mod tests;
// use crate::f;
use crate::f;
// pub fn url(path: impl Into<String>) -> String {
// let path = path.into();
// assert!(path.starts_with("/"));
// f!("https://api.trello.com/1{path}")
// }
pub fn url(path: impl Into<String>) -> String {
let path = path.into();
assert!(path.starts_with("/"));
f!("https://api.trello.com/1{path}")
}