thallada/BazaarRealmAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bincode responses, refactored content_type handling, better error reporting

Browse Source 
Fixed issues with Bincode responses not actually being readable, oops. Also fix handling Bincode requests.

Added `TypedCache` for DRYing up GET request content-type handling.

Added `DeserializedBody` for DRYing up POST/PATCH request conent-type handling.

Removed "Unsaved" structs since I could just mutate Posted structs instead.

Added improved error reporting and stopped sending unfiltered interal error data.

Upgraded sqlx to proper 0.4.1 release.
This commit is contained in:
Tyler Hallada 2020-11-14 02:19:33 -05:00
parent 0bc94e4b7d
commit 50184da1f6
16 changed files with 527 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
Cargo.lock generated
View File

@ -328,22 +328,6 @@ dependencies = [
"proc-macro-hack", "proc-macro-hack",
] ]
[[package]]
name = "core-foundation"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "core-foundation-sys"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
[[package]] [[package]]
name = "cpuid-bool" name = "cpuid-bool"
version = "0.1.2" version = "0.1.2"
@ -473,21 +457,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foreign-types"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
"foreign-types-shared",
]
[[package]]
name = "foreign-types-shared"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]] [[package]]
name = "fuchsia-cprng" name = "fuchsia-cprng"
version = "0.1.1" version = "0.1.1"
@ -1082,24 +1051,6 @@ dependencies = [
"twoway", "twoway",
] ]
[[package]]
name = "native-tls"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
dependencies = [
"lazy_static",
"libc",
"log",
"openssl",
"openssl-probe",
"openssl-sys",
"schannel",
"security-framework",
"security-framework-sys",
"tempfile",
]
[[package]] [[package]]
name = "net2" name = "net2"
version = "0.2.34" version = "0.2.34"
@ -1158,39 +1109,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
dependencies = [
"bitflags",
"cfg-if 0.1.10",
"foreign-types",
"lazy_static",
"libc",
"openssl-sys",
]
[[package]] [[package]]
name = "openssl-probe" name = "openssl-probe"
version = "0.1.2" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
version = "0.9.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
dependencies = [
"autocfg 1.0.0",
"cc",
"libc",
"pkg-config",
"vcpkg",
]
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.11.0" version = "0.11.0"
@ -1255,12 +1179,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
[[package]] [[package]]
name = "ppv-lite86" name = "ppv-lite86"
version = "0.2.8" version = "0.2.8"
@ -1542,16 +1460,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]]
name = "schannel"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
"winapi 0.3.9",
]
[[package]] [[package]]
name = "scoped-tls" name = "scoped-tls"
version = "1.0.0" version = "1.0.0"
@ -1580,29 +1488,6 @@ version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ee459cae272d224928ca09a1df5406da984f263dc544f9f8bde92a8c3dc916" checksum = "39ee459cae272d224928ca09a1df5406da984f263dc544f9f8bde92a8c3dc916"
[[package]]
name = "security-framework"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
dependencies = [
"bitflags",
"core-foundation",
"core-foundation-sys",
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework-sys"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.114" version = "1.0.114"
@ -1737,8 +1622,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlx" name = "sqlx"
version = "0.4.0-beta.1" version = "0.4.1"
source = "git+https://github.com/launchbadge/sqlx?branch=master#12b4250454b13fa2699dee9a4c761154ae60ddb6" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1f8eb788e1733bdbf69a8f97087213ebdebd253d4782c686d3cfd586b0a9453"
dependencies = [ dependencies = [
"sqlx-core", "sqlx-core",
"sqlx-macros", "sqlx-macros",
@ -1746,8 +1632,9 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-core" name = "sqlx-core"
version = "0.4.0-beta.1" version = "0.4.0"
source = "git+https://github.com/launchbadge/sqlx?branch=master#12b4250454b13fa2699dee9a4c761154ae60ddb6" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e647268dc1239dd9db2d3103fefd61151971a2214882cff9efea6f60cf50840"
dependencies = [ dependencies = [
"ahash 0.5.8", "ahash 0.5.8",
"atoi", "atoi",
@ -1777,6 +1664,7 @@ dependencies = [
"parking_lot", "parking_lot",
"percent-encoding", "percent-encoding",
"rand 0.7.3", "rand 0.7.3",
"rustls",
"serde", "serde",
"serde_json", "serde_json",
"sha-1 0.9.1", "sha-1 0.9.1",
@ -1788,13 +1676,16 @@ dependencies = [
"thiserror", "thiserror",
"url", "url",
"uuid 0.8.1", "uuid 0.8.1",
"webpki",
"webpki-roots",
"whoami", "whoami",
] ]
[[package]] [[package]]
name = "sqlx-macros" name = "sqlx-macros"
version = "0.4.0-beta.1" version = "0.4.0"
source = "git+https://github.com/launchbadge/sqlx?branch=master#12b4250454b13fa2699dee9a4c761154ae60ddb6" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7acd32cba35531345f8a94a038874baf00efd0b701c913f5b00d2870b474b64"
dependencies = [ dependencies = [
"dotenv", "dotenv",
"either", "either",
@ -1814,13 +1705,13 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-rt" name = "sqlx-rt"
version = "0.1.1" version = "0.2.0"
source = "git+https://github.com/launchbadge/sqlx?branch=master#12b4250454b13fa2699dee9a4c761154ae60ddb6" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63fc5454c9dd7aaea3a0eeeb65ca40d06d0d8e7413a8184f7c3a3ffa5056190b"
dependencies = [ dependencies = [
"native-tls",
"once_cell", "once_cell",
"tokio", "tokio",
"tokio-native-tls", "tokio-rustls",
] ]
[[package]] [[package]]
@ -1941,16 +1832,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "tokio-native-tls"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069"
dependencies = [
"native-tls",
"tokio",
]
[[package]] [[package]]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.14.1" version = "0.14.1"
@ -2207,12 +2088,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "vcpkg"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
[[package]] [[package]]
name = "version_check" name = "version_check"
version = "0.9.2" version = "0.9.2"
@ -2339,6 +2214,15 @@ dependencies = [
"untrusted", "untrusted",
] ]
[[package]]
name = "webpki-roots"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
dependencies = [
"webpki",
]
[[package]] [[package]]
name = "whoami" name = "whoami"
version = "0.9.0" version = "0.9.0"

2
Cargo.toml
View File

@ -18,7 +18,7 @@ listenfd = "0.3"
mime = "0.3" mime = "0.3"
openssl-probe = "0.1" openssl-probe = "0.1"
tokio = { version = "0.2", features = ["macros", "rt-threaded", "sync"] } tokio = { version = "0.2", features = ["macros", "rt-threaded", "sync"] }
sqlx = { git = "https://github.com/launchbadge/sqlx", branch = "master", default-features = false, features = [ "runtime-tokio", "macros", "postgres", "chrono", "uuid", "ipnetwork", "json", "migrate", "offline" ] } sqlx = { version = "0.4.1", default-features = false, features = [ "runtime-tokio-rustls", "macros", "postgres", "chrono", "uuid", "ipnetwork", "json", "migrate", "offline" ] }
warp = { version = "0.2", features = ["compression", "tls"] } warp = { version = "0.2", features = ["compression", "tls"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

96
src/handlers/interior_ref_list.rs
View File

@ -1,17 +1,19 @@
use anyhow::Result; use anyhow::Result;
use http::StatusCode; use http::StatusCode;
use hyper::body::Bytes;
use mime::Mime; use mime::Mime;
use uuid::Uuid; use uuid::Uuid;
use warp::reply::{with_header, with_status}; use warp::reply::{with_header, with_status};
use warp::{Rejection, Reply}; use warp::{Rejection, Reply};
use crate::caches::CACHES; use crate::caches::{CachedResponse, CACHES};
use crate::models::{InteriorRefList, ListParams, PostedInteriorRefList, UnsavedInteriorRefList}; use crate::models::{InteriorRefList, ListParams, PostedInteriorRefList};
use crate::problem::reject_anyhow; use crate::problem::reject_anyhow;
use crate::Environment; use crate::Environment;
use super::{ use super::{
authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, ETagReply, Json, authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, DeserializedBody,
ETagReply, Json, TypedCache,
}; };
pub async fn get( pub async fn get(
@ -20,12 +22,14 @@ pub async fn get(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.interior_ref_list_bin) cache,
} } = TypedCache::<i32, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.interior_ref_list), accept,
}; &CACHES.interior_ref_list_bin,
&CACHES.interior_ref_list,
);
let response = cache let response = cache
.get_response(id, || async { .get_response(id, || async {
let interior_ref_list = InteriorRefList::get(&env.db, id).await?; let interior_ref_list = InteriorRefList::get(&env.db, id).await?;
@ -50,13 +54,14 @@ pub async fn get_by_shop_id(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => ( content_type,
ContentType::Bincode, cache,
} = TypedCache::<i32, CachedResponse>::pick_cache(
accept,
&CACHES.interior_ref_list_by_shop_id_bin, &CACHES.interior_ref_list_by_shop_id_bin,
), &CACHES.interior_ref_list_by_shop_id,
_ => (ContentType::Json, &CACHES.interior_ref_list_by_shop_id), );
};
let response = cache let response = cache
.get_response(shop_id, || async { .get_response(shop_id, || async {
let interior_ref_list = InteriorRefList::get_by_shop_id(&env.db, shop_id).await?; let interior_ref_list = InteriorRefList::get_by_shop_id(&env.db, shop_id).await?;
@ -81,12 +86,14 @@ pub async fn list(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.list_interior_ref_lists_bin) cache,
} } = TypedCache::<ListParams, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.list_interior_ref_lists), accept,
}; &CACHES.list_interior_ref_lists_bin,
&CACHES.list_interior_ref_lists,
);
let response = cache let response = cache
.get_response(list_params.clone(), || async { .get_response(list_params.clone(), || async {
let interior_ref_lists = InteriorRefList::list(&env.db, &list_params).await?; let interior_ref_lists = InteriorRefList::list(&env.db, &list_params).await?;
@ -107,24 +114,19 @@ pub async fn list(
} }
pub async fn create( pub async fn create(
interior_ref_list: PostedInteriorRefList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: mut interior_ref_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedInteriorRefList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let unsaved_interior_ref_list = UnsavedInteriorRefList { interior_ref_list.owner_id = Some(owner_id);
owner_id, let saved_interior_ref_list = InteriorRefList::create(interior_ref_list, &env.db)
shop_id: interior_ref_list.shop_id,
ref_list: interior_ref_list.ref_list,
};
let saved_interior_ref_list = InteriorRefList::create(unsaved_interior_ref_list, &env.db)
.await .await
.map_err(reject_anyhow)?; .map_err(reject_anyhow)?;
let url = saved_interior_ref_list let url = saved_interior_ref_list
@ -159,17 +161,16 @@ pub async fn create(
pub async fn update( pub async fn update(
id: i32, id: i32,
interior_ref_list: PostedInteriorRefList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: interior_ref_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedInteriorRefList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let updated_interior_ref_list = let updated_interior_ref_list =
InteriorRefList::update(interior_ref_list, &env.db, owner_id, id) InteriorRefList::update(interior_ref_list, &env.db, owner_id, id)
@ -209,17 +210,16 @@ pub async fn update(
pub async fn update_by_shop_id( pub async fn update_by_shop_id(
shop_id: i32, shop_id: i32,
interior_ref_list: PostedInteriorRefList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: interior_ref_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedInteriorRefList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let updated_interior_ref_list = let updated_interior_ref_list =
InteriorRefList::update_by_shop_id(interior_ref_list, &env.db, owner_id, shop_id) InteriorRefList::update_by_shop_id(interior_ref_list, &env.db, owner_id, shop_id)

97
src/handlers/merchandise_list.rs
View File

@ -1,17 +1,19 @@
use anyhow::Result; use anyhow::Result;
use http::StatusCode; use http::StatusCode;
use hyper::body::Bytes;
use mime::Mime; use mime::Mime;
use uuid::Uuid; use uuid::Uuid;
use warp::reply::{with_header, with_status}; use warp::reply::{with_header, with_status};
use warp::{Rejection, Reply}; use warp::{Rejection, Reply};
use crate::caches::CACHES; use crate::caches::{CachedResponse, CACHES};
use crate::models::{ListParams, MerchandiseList, PostedMerchandiseList, UnsavedMerchandiseList}; use crate::models::{ListParams, MerchandiseList, PostedMerchandiseList};
use crate::problem::reject_anyhow; use crate::problem::reject_anyhow;
use crate::Environment; use crate::Environment;
use super::{ use super::{
authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, ETagReply, Json, authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, DeserializedBody,
ETagReply, Json, TypedCache,
}; };
pub async fn get( pub async fn get(
@ -20,12 +22,14 @@ pub async fn get(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.merchandise_list_bin) cache,
} } = TypedCache::<i32, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.merchandise_list), accept,
}; &CACHES.merchandise_list_bin,
&CACHES.merchandise_list,
);
let response = cache let response = cache
.get_response(id, || async { .get_response(id, || async {
let merchandise_list = MerchandiseList::get(&env.db, id).await?; let merchandise_list = MerchandiseList::get(&env.db, id).await?;
@ -50,12 +54,14 @@ pub async fn get_by_shop_id(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.merchandise_list_bin) cache,
} } = TypedCache::<i32, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.merchandise_list), accept,
}; &CACHES.merchandise_list_by_shop_id_bin,
&CACHES.merchandise_list_by_shop_id,
);
let response = cache let response = cache
.get_response(shop_id, || async { .get_response(shop_id, || async {
let merchandise_list = MerchandiseList::get_by_shop_id(&env.db, shop_id).await?; let merchandise_list = MerchandiseList::get_by_shop_id(&env.db, shop_id).await?;
@ -80,12 +86,14 @@ pub async fn list(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.list_merchandise_lists_bin) cache,
} } = TypedCache::<ListParams, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.list_merchandise_lists), accept,
}; &CACHES.list_merchandise_lists_bin,
&CACHES.list_merchandise_lists,
);
let response = cache let response = cache
.get_response(list_params.clone(), || async { .get_response(list_params.clone(), || async {
let merchandise_lists = MerchandiseList::list(&env.db, &list_params).await?; let merchandise_lists = MerchandiseList::list(&env.db, &list_params).await?;
@ -105,24 +113,19 @@ pub async fn list(
} }
pub async fn create( pub async fn create(
merchandise_list: PostedMerchandiseList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: mut merchandise_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedMerchandiseList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let unsaved_merchandise_list = UnsavedMerchandiseList { merchandise_list.owner_id = Some(owner_id);
owner_id, let saved_merchandise_list = MerchandiseList::create(merchandise_list, &env.db)
shop_id: merchandise_list.shop_id,
form_list: merchandise_list.form_list,
};
let saved_merchandise_list = MerchandiseList::create(unsaved_merchandise_list, &env.db)
.await .await
.map_err(reject_anyhow)?; .map_err(reject_anyhow)?;
let url = saved_merchandise_list let url = saved_merchandise_list
@ -156,17 +159,16 @@ pub async fn create(
pub async fn update( pub async fn update(
id: i32, id: i32,
merchandise_list: PostedMerchandiseList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: merchandise_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedMerchandiseList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let updated_merchandise_list = MerchandiseList::update(merchandise_list, &env.db, owner_id, id) let updated_merchandise_list = MerchandiseList::update(merchandise_list, &env.db, owner_id, id)
.await .await
@ -205,17 +207,16 @@ pub async fn update(
pub async fn update_by_shop_id( pub async fn update_by_shop_id(
shop_id: i32, shop_id: i32,
merchandise_list: PostedMerchandiseList, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: merchandise_list,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedMerchandiseList>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let updated_merchandise_list = let updated_merchandise_list =
MerchandiseList::update_by_shop_id(merchandise_list, &env.db, owner_id, shop_id) MerchandiseList::update_by_shop_id(merchandise_list, &env.db, owner_id, shop_id)

82
src/handlers/mod.rs
View File

@ -1,3 +1,5 @@
use std::fmt::Debug;
use std::hash::Hash;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::str::FromStr; use std::str::FromStr;
@ -5,10 +7,11 @@ use anyhow::{anyhow, Error, Result};
use http::header::{HeaderValue, CONTENT_TYPE, ETAG, SERVER}; use http::header::{HeaderValue, CONTENT_TYPE, ETAG, SERVER};
use http::StatusCode; use http::StatusCode;
use http_api_problem::HttpApiProblem; use http_api_problem::HttpApiProblem;
use hyper::body::Bytes;
use mime::{FromStrError, Mime}; use mime::{FromStrError, Mime};
use seahash::hash; use seahash::hash;
use serde::Serialize; use serde::{de::DeserializeOwned, Serialize};
use tracing::{error, instrument, warn}; use tracing::{debug, error, instrument, warn};
use uuid::Uuid; use uuid::Uuid;
use warp::reply::Response; use warp::reply::Response;
use warp::Reply; use warp::Reply;
@ -19,7 +22,7 @@ pub mod owner;
pub mod shop; pub mod shop;
pub mod transaction; pub mod transaction;
use super::caches::{CachedResponse, CACHES}; use super::caches::{Cache, CachedResponse, CACHES};
use super::problem::{unauthorized_no_api_key, unauthorized_no_owner}; use super::problem::{unauthorized_no_api_key, unauthorized_no_owner};
use super::Environment; use super::Environment;
@ -184,3 +187,76 @@ impl AcceptHeader {
self.mimes.contains(&mime::APPLICATION_OCTET_STREAM) self.mimes.contains(&mime::APPLICATION_OCTET_STREAM)
} }
} }
pub struct DeserializedBody<T> {
body: T,
content_type: ContentType,
}
impl<T: DeserializeOwned> DeserializedBody<T> {
pub fn from_bytes(bytes: Bytes, content_type: Option<Mime>) -> Result<Self> {
match content_type {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => {
debug!(
content_type = ?ContentType::Bincode,
"deserializing body as bincode"
);
Ok(Self {
content_type: ContentType::Bincode,
body: bincode::deserialize(&bytes)?,
})
}
_ => {
debug!(
content_type = ?ContentType::Json,
"deserializing body as json"
);
Ok(Self {
content_type: ContentType::Json,
body: serde_json::from_slice(&bytes)?,
})
}
}
}
}
pub struct TypedCache<'a, K, V>
where
K: Eq + Hash + Debug,
V: Clone,
{
cache: &'a Cache<K, V>,
content_type: ContentType,
}
impl<'a, K, V> TypedCache<'a, K, V>
where
K: Eq + Hash + Debug,
V: Clone,
{
pub fn pick_cache(
accept: Option<AcceptHeader>,
bincode_cache: &'a Cache<K, V>,
json_cache: &'a Cache<K, V>,
) -> Self {
match accept {
Some(accept) if accept.accepts_bincode() => {
debug!(
content_type = ?ContentType::Bincode,
"serializing body as bincode"
);
Self {
content_type: ContentType::Bincode,
cache: bincode_cache,
}
}
_ => {
debug!(content_type = ?ContentType::Json, "serializing body as json");
Self {
content_type: ContentType::Json,
cache: json_cache,
}
}
}
}
}

63
src/handlers/owner.rs
View File

@ -1,5 +1,6 @@
use anyhow::Result; use anyhow::Result;
use http::StatusCode; use http::StatusCode;
use hyper::body::Bytes;
use ipnetwork::IpNetwork; use ipnetwork::IpNetwork;
use mime::Mime; use mime::Mime;
use std::net::SocketAddr; use std::net::SocketAddr;
@ -7,13 +8,14 @@ use uuid::Uuid;
use warp::reply::{with_header, with_status}; use warp::reply::{with_header, with_status};
use warp::{Rejection, Reply}; use warp::{Rejection, Reply};
use crate::caches::CACHES; use crate::caches::{CachedResponse, CACHES};
use crate::models::{ListParams, Owner, PostedOwner, UnsavedOwner}; use crate::models::{FullPostedOwner, ListParams, Owner, PostedOwner};
use crate::problem::{reject_anyhow, unauthorized_no_api_key}; use crate::problem::{reject_anyhow, unauthorized_no_api_key};
use crate::Environment; use crate::Environment;
use super::{ use super::{
authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, ETagReply, Json, authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, DeserializedBody,
ETagReply, Json, TypedCache,
}; };
pub async fn get( pub async fn get(
@ -22,10 +24,10 @@ pub async fn get(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => (ContentType::Bincode, &CACHES.owner_bin), content_type,
_ => (ContentType::Json, &CACHES.owner), cache,
}; } = TypedCache::<i32, CachedResponse>::pick_cache(accept, &CACHES.owner_bin, &CACHES.owner);
let response = cache let response = cache
.get_response(id, || async { .get_response(id, || async {
let owner = Owner::get(&env.db, id).await?; let owner = Owner::get(&env.db, id).await?;
@ -46,10 +48,14 @@ pub async fn list(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => (ContentType::Bincode, &CACHES.list_owners_bin), content_type,
_ => (ContentType::Json, &CACHES.list_owners), cache,
}; } = TypedCache::<ListParams, CachedResponse>::pick_cache(
accept,
&CACHES.list_owners_bin,
&CACHES.list_owners,
);
let response = cache let response = cache
.get_response(list_params.clone(), || async { .get_response(list_params.clone(), || async {
let owners = Owner::list(&env.db, &list_params).await?; let owners = Owner::list(&env.db, &list_params).await?;
@ -65,7 +71,7 @@ pub async fn list(
} }
pub async fn create( pub async fn create(
owner: PostedOwner, bytes: Bytes,
remote_addr: Option<SocketAddr>, remote_addr: Option<SocketAddr>,
api_key: Option<Uuid>, api_key: Option<Uuid>,
real_ip: Option<IpNetwork>, real_ip: Option<IpNetwork>,
@ -73,24 +79,21 @@ pub async fn create(
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
if let Some(api_key) = api_key { if let Some(api_key) = api_key {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: owner,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedOwner>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
}; let owner = FullPostedOwner {
let unsaved_owner = UnsavedOwner { name: owner.name,
mod_version: owner.mod_version,
api_key, api_key,
ip_address: match remote_addr { ip_address: match remote_addr {
Some(addr) => Some(IpNetwork::from(addr.ip())), Some(addr) => Some(IpNetwork::from(addr.ip())),
None => real_ip, None => real_ip,
}, },
name: owner.name,
mod_version: owner.mod_version,
}; };
let saved_owner = Owner::create(unsaved_owner, &env.db) let saved_owner = Owner::create(owner, &env.db).await.map_err(reject_anyhow)?;
.await
.map_err(reject_anyhow)?;
let url = saved_owner.url(&env.api_url).map_err(reject_anyhow)?; let url = saved_owner.url(&env.api_url).map_err(reject_anyhow)?;
let reply: Box<dyn Reply> = match content_type { let reply: Box<dyn Reply> = match content_type {
ContentType::Bincode => Box::new( ContentType::Bincode => Box::new(
@ -114,17 +117,15 @@ pub async fn create(
pub async fn update( pub async fn update(
id: i32, id: i32,
owner: PostedOwner, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: owner,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedOwner>::from_bytes(bytes, content_type).map_err(reject_anyhow)?;
_ => ContentType::Json,
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let updated_owner = Owner::update(owner, &env.db, owner_id, id) let updated_owner = Owner::update(owner, &env.db, owner_id, id)
.await .await

79
src/handlers/shop.rs
View File

@ -1,20 +1,22 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use http::StatusCode; use http::StatusCode;
use hyper::body::Bytes;
use mime::Mime; use mime::Mime;
use uuid::Uuid; use uuid::Uuid;
use warp::reply::{with_header, with_status}; use warp::reply::{with_header, with_status};
use warp::{Rejection, Reply}; use warp::{Rejection, Reply};
use crate::caches::CACHES; use crate::caches::{CachedResponse, CACHES};
use crate::models::{ use crate::models::{
InteriorRefList, ListParams, MerchandiseList, PostedShop, Shop, UnsavedInteriorRefList, InteriorRefList, ListParams, MerchandiseList, PostedInteriorRefList, PostedMerchandiseList,
UnsavedMerchandiseList, UnsavedShop, PostedShop, Shop,
}; };
use crate::problem::reject_anyhow; use crate::problem::reject_anyhow;
use crate::Environment; use crate::Environment;
use super::{ use super::{
authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, ETagReply, Json, authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, DeserializedBody,
ETagReply, Json, TypedCache,
}; };
pub async fn get( pub async fn get(
@ -23,10 +25,10 @@ pub async fn get(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => (ContentType::Bincode, &CACHES.shop_bin), content_type,
_ => (ContentType::Json, &CACHES.shop), cache,
}; } = TypedCache::<i32, CachedResponse>::pick_cache(accept, &CACHES.shop_bin, &CACHES.shop);
let response = cache let response = cache
.get_response(id, || async { .get_response(id, || async {
let shop = Shop::get(&env.db, id).await?; let shop = Shop::get(&env.db, id).await?;
@ -47,10 +49,14 @@ pub async fn list(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => (ContentType::Bincode, &CACHES.list_shops_bin), content_type,
_ => (ContentType::Json, &CACHES.list_shops), cache,
}; } = TypedCache::<ListParams, CachedResponse>::pick_cache(
accept,
&CACHES.list_shops_bin,
&CACHES.list_shops,
);
let response = cache let response = cache
.get_response(list_params.clone(), || async { .get_response(list_params.clone(), || async {
let shops = Shop::list(&env.db, &list_params).await?; let shops = Shop::list(&env.db, &list_params).await?;
@ -66,44 +72,36 @@ pub async fn list(
} }
pub async fn create( pub async fn create(
shop: PostedShop, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: mut shop,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedShop>::from_bytes(bytes, content_type).map_err(reject_anyhow)?;
_ => ContentType::Json,
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let unsaved_shop = UnsavedShop { shop.owner_id = Some(owner_id);
name: shop.name,
description: shop.description,
owner_id,
};
let mut tx = env let mut tx = env
.db .db
.begin() .begin()
.await .await
.map_err(|error| reject_anyhow(anyhow!(error)))?; .map_err(|error| reject_anyhow(anyhow!(error)))?;
let saved_shop = Shop::create(unsaved_shop, &mut tx) let saved_shop = Shop::create(shop, &mut tx).await.map_err(reject_anyhow)?;
.await
.map_err(reject_anyhow)?;
// also save empty interior_ref_list and merchandise_list rows // also save empty interior_ref_list and merchandise_list rows
let interior_ref_list = UnsavedInteriorRefList { let interior_ref_list = PostedInteriorRefList {
shop_id: saved_shop.id, shop_id: saved_shop.id,
owner_id, owner_id: Some(owner_id),
ref_list: sqlx::types::Json::default(), ref_list: sqlx::types::Json::default(),
}; };
InteriorRefList::create(interior_ref_list, &mut tx) InteriorRefList::create(interior_ref_list, &mut tx)
.await .await
.map_err(reject_anyhow)?; .map_err(reject_anyhow)?;
let merchandise_list = UnsavedMerchandiseList { let merchandise_list = PostedMerchandiseList {
shop_id: saved_shop.id, shop_id: saved_shop.id,
owner_id, owner_id: Some(owner_id),
form_list: sqlx::types::Json::default(), form_list: sqlx::types::Json::default(),
}; };
MerchandiseList::create(merchandise_list, &mut tx) MerchandiseList::create(merchandise_list, &mut tx)
@ -133,27 +131,22 @@ pub async fn create(
pub async fn update( pub async fn update(
id: i32, id: i32,
shop: PostedShop, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: mut shop,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedShop>::from_bytes(bytes, content_type).map_err(reject_anyhow)?;
_ => ContentType::Json,
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let posted_shop = PostedShop { shop.owner_id = match shop.owner_id {
owner_id: match shop.owner_id {
// allows an owner to transfer ownership of shop to another owner // allows an owner to transfer ownership of shop to another owner
Some(posted_owner_id) => Some(posted_owner_id), Some(posted_owner_id) => Some(posted_owner_id),
None => Some(owner_id), None => Some(owner_id),
},
..shop
}; };
let updated_shop = Shop::update(posted_shop, &env.db, owner_id, id) let updated_shop = Shop::update(shop, &env.db, owner_id, id)
.await .await
.map_err(reject_anyhow)?; .map_err(reject_anyhow)?;
let url = updated_shop.url(&env.api_url).map_err(reject_anyhow)?; let url = updated_shop.url(&env.api_url).map_err(reject_anyhow)?;

84
src/handlers/transaction.rs
View File

@ -1,19 +1,19 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use http::StatusCode; use http::StatusCode;
use hyper::body::Bytes;
use mime::Mime; use mime::Mime;
use uuid::Uuid; use uuid::Uuid;
use warp::reply::{with_header, with_status}; use warp::reply::{with_header, with_status};
use warp::{Rejection, Reply}; use warp::{Rejection, Reply};
use crate::caches::CACHES; use crate::caches::{CachedResponse, CACHES};
use crate::models::{ use crate::models::{ListParams, MerchandiseList, PostedTransaction, Transaction};
ListParams, MerchandiseList, PostedTransaction, Transaction, UnsavedTransaction,
};
use crate::problem::reject_anyhow; use crate::problem::reject_anyhow;
use crate::Environment; use crate::Environment;
use super::{ use super::{
authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, ETagReply, Json, authenticate, check_etag, AcceptHeader, Bincode, ContentType, DataReply, DeserializedBody,
ETagReply, Json, TypedCache,
}; };
pub async fn get( pub async fn get(
@ -22,10 +22,14 @@ pub async fn get(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => (ContentType::Bincode, &CACHES.transaction_bin), content_type,
_ => (ContentType::Json, &CACHES.transaction), cache,
}; } = TypedCache::<i32, CachedResponse>::pick_cache(
accept,
&CACHES.transaction_bin,
&CACHES.transaction,
);
let response = cache let response = cache
.get_response(id, || async { .get_response(id, || async {
let transaction = Transaction::get(&env.db, id).await?; let transaction = Transaction::get(&env.db, id).await?;
@ -48,12 +52,14 @@ pub async fn list(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => { content_type,
(ContentType::Bincode, &CACHES.list_transactions_bin) cache,
} } = TypedCache::<ListParams, CachedResponse>::pick_cache(
_ => (ContentType::Json, &CACHES.list_transactions), accept,
}; &CACHES.list_transactions_bin,
&CACHES.list_transactions,
);
let response = cache let response = cache
.get_response(list_params.clone(), || async { .get_response(list_params.clone(), || async {
let transactions = Transaction::list(&env.db, &list_params).await?; let transactions = Transaction::list(&env.db, &list_params).await?;
@ -77,13 +83,14 @@ pub async fn list_by_shop_id(
accept: Option<AcceptHeader>, accept: Option<AcceptHeader>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let (content_type, cache) = match accept { let TypedCache {
Some(accept) if accept.accepts_bincode() => ( content_type,
ContentType::Bincode, cache,
} = TypedCache::<(i32, ListParams), CachedResponse>::pick_cache(
accept,
&CACHES.list_transactions_by_shop_id_bin, &CACHES.list_transactions_by_shop_id_bin,
), &CACHES.list_transactions_by_shop_id,
_ => (ContentType::Json, &CACHES.list_transactions_by_shop_id), );
};
let response = cache let response = cache
.get_response((shop_id, list_params.clone()), || async { .get_response((shop_id, list_params.clone()), || async {
let transactions = Transaction::list_by_shop_id(&env.db, shop_id, &list_params).await?; let transactions = Transaction::list_by_shop_id(&env.db, shop_id, &list_params).await?;
@ -101,42 +108,29 @@ pub async fn list_by_shop_id(
} }
pub async fn create( pub async fn create(
transaction: PostedTransaction, bytes: Bytes,
api_key: Option<Uuid>, api_key: Option<Uuid>,
content_type: Option<Mime>, content_type: Option<Mime>,
env: Environment, env: Environment,
) -> Result<impl Reply, Rejection> { ) -> Result<impl Reply, Rejection> {
let content_type = match content_type { let DeserializedBody {
Some(content_type) if content_type == mime::APPLICATION_OCTET_STREAM => { body: mut transaction,
ContentType::Bincode content_type,
} } = DeserializedBody::<PostedTransaction>::from_bytes(bytes, content_type)
_ => ContentType::Json, .map_err(reject_anyhow)?;
};
let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?; let owner_id = authenticate(&env, api_key).await.map_err(reject_anyhow)?;
let unsaved_transaction = UnsavedTransaction { transaction.owner_id = Some(owner_id);
shop_id: transaction.shop_id,
owner_id,
mod_name: transaction.mod_name,
local_form_id: transaction.local_form_id,
name: transaction.name,
form_type: transaction.form_type,
is_food: transaction.is_food,
price: transaction.price,
is_sell: transaction.is_sell,
quantity: transaction.quantity,
amount: transaction.amount,
};
let mut tx = env let mut tx = env
.db .db
.begin() .begin()
.await .await
.map_err(|error| reject_anyhow(anyhow!(error)))?; .map_err(|error| reject_anyhow(anyhow!(error)))?;
let saved_transaction = Transaction::create(unsaved_transaction, &mut tx) let saved_transaction = Transaction::create(transaction, &mut tx)
.await .await
.map_err(reject_anyhow)?; .map_err(reject_anyhow)?;
let quantity_delta = match transaction.is_sell { let quantity_delta = match saved_transaction.is_sell {
true => transaction.quantity, true => saved_transaction.quantity,
false => transaction.quantity * -1, false => saved_transaction.quantity * -1,
}; };
let updated_merchandise_list = MerchandiseList::update_merchandise_quantity( let updated_merchandise_list = MerchandiseList::update_merchandise_quantity(
&mut tx, &mut tx,

43
src/main.rs
View File

@ -4,9 +4,8 @@ extern crate lazy_static;
use anyhow::Result; use anyhow::Result;
use dotenv::dotenv; use dotenv::dotenv;
use http::header::SERVER; use http::header::SERVER;
use hyper::server::Server; use hyper::{body::Bytes, server::Server};
use listenfd::ListenFd; use listenfd::ListenFd;
use serde::{de::DeserializeOwned, Serialize};
use sqlx::postgres::PgPoolOptions; use sqlx::postgres::PgPoolOptions;
use sqlx::{migrate, Pool, Postgres}; use sqlx::{migrate, Pool, Postgres};
use std::convert::Infallible; use std::convert::Infallible;
@ -24,10 +23,7 @@ mod models;
mod problem; mod problem;
use handlers::SERVER_STRING; use handlers::SERVER_STRING;
use models::{ use models::ListParams;
ListParams, PostedInteriorRefList, PostedMerchandiseList, PostedOwner, PostedShop,
PostedTransaction,
};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Environment { pub struct Environment {
@ -47,21 +43,12 @@ impl Environment {
} }
} }
#[derive(Serialize)]
struct ErrorMessage {
code: u16,
message: String,
}
fn with_env(env: Environment) -> impl Filter<Extract = (Environment,), Error = Infallible> + Clone { fn with_env(env: Environment) -> impl Filter<Extract = (Environment,), Error = Infallible> + Clone {
warp::any().map(move || env.clone()) warp::any().map(move || env.clone())
} }
fn json_body<T>() -> impl Filter<Extract = (T,), Error = warp::Rejection> + Clone fn extract_body_bytes() -> impl Filter<Extract = (Bytes,), Error = warp::Rejection> + Clone {
where warp::body::content_length_limit(1024 * 1024).and(warp::body::bytes())
T: Send + DeserializeOwned,
{
warp::body::content_length_limit(1024 * 1024).and(warp::body::json())
} }
#[tokio::main] #[tokio::main]
@ -100,7 +87,7 @@ async fn main() -> Result<()> {
let create_owner_handler = warp::path("owners").and( let create_owner_handler = warp::path("owners").and(
warp::path::end() warp::path::end()
.and(warp::post()) .and(warp::post())
.and(json_body::<PostedOwner>()) .and(extract_body_bytes())
.and(warp::addr::remote()) .and(warp::addr::remote())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("x-real-ip")) .and(warp::header::optional("x-real-ip"))
@ -120,7 +107,7 @@ async fn main() -> Result<()> {
warp::path::param() warp::path::param()
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedOwner>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -147,7 +134,7 @@ async fn main() -> Result<()> {
let create_shop_handler = warp::path("shops").and( let create_shop_handler = warp::path("shops").and(
warp::path::end() warp::path::end()
.and(warp::post()) .and(warp::post())
.and(json_body::<PostedShop>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -165,7 +152,7 @@ async fn main() -> Result<()> {
warp::path::param() warp::path::param()
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedShop>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -192,7 +179,7 @@ async fn main() -> Result<()> {
let create_interior_ref_list_handler = warp::path("interior_ref_lists").and( let create_interior_ref_list_handler = warp::path("interior_ref_lists").and(
warp::path::end() warp::path::end()
.and(warp::post()) .and(warp::post())
.and(json_body::<PostedInteriorRefList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -210,7 +197,7 @@ async fn main() -> Result<()> {
warp::path::param() warp::path::param()
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedInteriorRefList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -221,7 +208,7 @@ async fn main() -> Result<()> {
.and(warp::path("interior_ref_list")) .and(warp::path("interior_ref_list"))
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedInteriorRefList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -258,7 +245,7 @@ async fn main() -> Result<()> {
let create_merchandise_list_handler = warp::path("merchandise_lists").and( let create_merchandise_list_handler = warp::path("merchandise_lists").and(
warp::path::end() warp::path::end()
.and(warp::post()) .and(warp::post())
.and(json_body::<PostedMerchandiseList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -276,7 +263,7 @@ async fn main() -> Result<()> {
warp::path::param() warp::path::param()
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedMerchandiseList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -287,7 +274,7 @@ async fn main() -> Result<()> {
.and(warp::path("merchandise_list")) .and(warp::path("merchandise_list"))
.and(warp::path::end()) .and(warp::path::end())
.and(warp::patch()) .and(warp::patch())
.and(json_body::<PostedMerchandiseList>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))
@ -324,7 +311,7 @@ async fn main() -> Result<()> {
let create_transaction_handler = warp::path("transactions").and( let create_transaction_handler = warp::path("transactions").and(
warp::path::end() warp::path::end()
.and(warp::post()) .and(warp::post())
.and(json_body::<PostedTransaction>()) .and(extract_body_bytes())
.and(warp::header::optional("api-key")) .and(warp::header::optional("api-key"))
.and(warp::header::optional("content-type")) .and(warp::header::optional("content-type"))
.and(with_env(env.clone())) .and(with_env(env.clone()))

57
src/models/interior_ref_list.rs
View File

@ -9,12 +9,12 @@ use url::Url;
use super::ListParams; use super::ListParams;
use crate::problem::forbidden_permission; use crate::problem::forbidden_permission;
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(sqlx::FromRow, Debug, Serialize, Deserialize, Clone)]
pub struct InteriorRef { pub struct InteriorRef {
pub base_mod_name: String, pub base_mod_name: String,
pub base_local_form_id: i32, pub base_local_form_id: u32,
pub ref_mod_name: Option<String>, pub ref_mod_name: Option<String>,
pub ref_local_form_id: i32, pub ref_local_form_id: u32,
pub position_x: f32, pub position_x: f32,
pub position_y: f32, pub position_y: f32,
pub position_z: f32, pub position_z: f32,
@ -24,23 +24,16 @@ pub struct InteriorRef {
pub scale: u16, pub scale: u16,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(sqlx::FromRow, Debug, Serialize, Deserialize, Clone)]
pub struct InteriorRefList { pub struct InteriorRefList {
pub id: i32, pub id: i32,
pub shop_id: i32, pub shop_id: i32,
pub owner_id: i32, pub owner_id: i32,
pub ref_list: serde_json::Value, pub ref_list: Json<Vec<InteriorRef>>,
pub created_at: NaiveDateTime, pub created_at: NaiveDateTime,
pub updated_at: NaiveDateTime, pub updated_at: NaiveDateTime,
} }
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct UnsavedInteriorRefList {
pub shop_id: i32,
pub owner_id: i32,
pub ref_list: Json<Vec<InteriorRef>>,
}
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PostedInteriorRefList { pub struct PostedInteriorRefList {
pub shop_id: i32, pub shop_id: i32,
@ -64,7 +57,13 @@ impl InteriorRefList {
// TODO: this model will probably never need to be accessed through it's ID, should these methods be removed/unimplemented? // TODO: this model will probably never need to be accessed through it's ID, should these methods be removed/unimplemented?
#[instrument(level = "debug", skip(db))] #[instrument(level = "debug", skip(db))]
pub async fn get(db: impl Executor<'_, Database = Postgres>, id: i32) -> Result<Self> { pub async fn get(db: impl Executor<'_, Database = Postgres>, id: i32) -> Result<Self> {
sqlx::query_as!(Self, "SELECT * FROM interior_ref_lists WHERE id = $1", id) sqlx::query_as!(
Self,
r#"SELECT id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>"
FROM interior_ref_lists WHERE id = $1"#,
id
)
.fetch_one(db) .fetch_one(db)
.await .await
.map_err(Error::new) .map_err(Error::new)
@ -72,15 +71,16 @@ impl InteriorRefList {
#[instrument(level = "debug", skip(interior_ref_list, db))] #[instrument(level = "debug", skip(interior_ref_list, db))]
pub async fn create( pub async fn create(
interior_ref_list: UnsavedInteriorRefList, interior_ref_list: PostedInteriorRefList,
db: impl Executor<'_, Database = Postgres>, db: impl Executor<'_, Database = Postgres>,
) -> Result<Self> { ) -> Result<Self> {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"INSERT INTO interior_ref_lists r#"INSERT INTO interior_ref_lists
(shop_id, owner_id, ref_list, created_at, updated_at) (shop_id, owner_id, ref_list, created_at, updated_at)
VALUES ($1, $2, $3, now(), now()) VALUES ($1, $2, $3, now(), now())
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>""#,
interior_ref_list.shop_id, interior_ref_list.shop_id,
interior_ref_list.owner_id, interior_ref_list.owner_id,
serde_json::json!(interior_ref_list.ref_list), serde_json::json!(interior_ref_list.ref_list),
@ -119,10 +119,11 @@ impl InteriorRefList {
let result = if let Some(order_by) = list_params.get_order_by() { let result = if let Some(order_by) = list_params.get_order_by() {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM interior_ref_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>" FROM interior_ref_lists
ORDER BY $1 ORDER BY $1
LIMIT $2 LIMIT $2
OFFSET $3", OFFSET $3"#,
order_by, order_by,
list_params.limit.unwrap_or(10), list_params.limit.unwrap_or(10),
list_params.offset.unwrap_or(0), list_params.offset.unwrap_or(0),
@ -132,9 +133,10 @@ impl InteriorRefList {
} else { } else {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM interior_ref_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>" FROM interior_ref_lists
LIMIT $1 LIMIT $1
OFFSET $2", OFFSET $2"#,
list_params.limit.unwrap_or(10), list_params.limit.unwrap_or(10),
list_params.offset.unwrap_or(0), list_params.offset.unwrap_or(0),
) )
@ -158,11 +160,12 @@ impl InteriorRefList {
if existing_interior_ref_list.owner_id == owner_id { if existing_interior_ref_list.owner_id == owner_id {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"UPDATE interior_ref_lists SET r#"UPDATE interior_ref_lists SET
ref_list = $2, ref_list = $2,
updated_at = now() updated_at = now()
WHERE id = $1 WHERE id = $1
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>""#,
id, id,
serde_json::json!(interior_ref_list.ref_list), serde_json::json!(interior_ref_list.ref_list),
) )
@ -180,8 +183,9 @@ impl InteriorRefList {
) -> Result<Self> { ) -> Result<Self> {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM interior_ref_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
WHERE shop_id = $1", ref_list as "ref_list: Json<Vec<InteriorRef>>" FROM interior_ref_lists
WHERE shop_id = $1"#,
shop_id, shop_id,
) )
.fetch_one(db) .fetch_one(db)
@ -205,11 +209,12 @@ impl InteriorRefList {
if existing_interior_ref_list.owner_id == owner_id { if existing_interior_ref_list.owner_id == owner_id {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"UPDATE interior_ref_lists SET r#"UPDATE interior_ref_lists SET
ref_list = $2, ref_list = $2,
updated_at = now() updated_at = now()
WHERE shop_id = $1 WHERE shop_id = $1
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
ref_list as "ref_list: Json<Vec<InteriorRef>>""#,
shop_id, shop_id,
serde_json::json!(interior_ref_list.ref_list), serde_json::json!(interior_ref_list.ref_list),
) )

71
src/models/merchandise_list.rs
View File

@ -15,12 +15,12 @@ use crate::problem::forbidden_permission;
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct Merchandise { pub struct Merchandise {
pub mod_name: String, pub mod_name: String,
pub local_form_id: i32, pub local_form_id: u32,
pub name: String, pub name: String,
pub quantity: i32, pub quantity: u32,
pub form_type: i32, pub form_type: u32,
pub is_food: bool, pub is_food: bool,
pub price: i32, pub price: u32,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
@ -28,18 +28,11 @@ pub struct MerchandiseList {
pub id: i32, pub id: i32,
pub shop_id: i32, pub shop_id: i32,
pub owner_id: i32, pub owner_id: i32,
pub form_list: serde_json::Value, pub form_list: Json<Vec<Merchandise>>,
pub created_at: NaiveDateTime, pub created_at: NaiveDateTime,
pub updated_at: NaiveDateTime, pub updated_at: NaiveDateTime,
} }
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct UnsavedMerchandiseList {
pub shop_id: i32,
pub owner_id: i32,
pub form_list: Json<Vec<Merchandise>>,
}
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PostedMerchandiseList { pub struct PostedMerchandiseList {
pub shop_id: i32, pub shop_id: i32,
@ -63,7 +56,14 @@ impl MerchandiseList {
// TODO: this model will probably never need to be accessed through it's ID, should these methods be removed/unimplemented? // TODO: this model will probably never need to be accessed through it's ID, should these methods be removed/unimplemented?
#[instrument(level = "debug", skip(db))] #[instrument(level = "debug", skip(db))]
pub async fn get(db: impl Executor<'_, Database = Postgres>, id: i32) -> Result<Self> { pub async fn get(db: impl Executor<'_, Database = Postgres>, id: i32) -> Result<Self> {
sqlx::query_as!(Self, "SELECT * FROM merchandise_lists WHERE id = $1", id) sqlx::query_as!(
Self,
r#"SELECT id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>"
FROM merchandise_lists
WHERE id = $1"#,
id,
)
.fetch_one(db) .fetch_one(db)
.await .await
.map_err(Error::new) .map_err(Error::new)
@ -71,15 +71,16 @@ impl MerchandiseList {
#[instrument(level = "debug", skip(merchandise_list, db))] #[instrument(level = "debug", skip(merchandise_list, db))]
pub async fn create( pub async fn create(
merchandise_list: UnsavedMerchandiseList, merchandise_list: PostedMerchandiseList,
db: impl Executor<'_, Database = Postgres>, db: impl Executor<'_, Database = Postgres>,
) -> Result<Self> { ) -> Result<Self> {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"INSERT INTO merchandise_lists r#"INSERT INTO merchandise_lists
(shop_id, owner_id, form_list, created_at, updated_at) (shop_id, owner_id, form_list, created_at, updated_at)
VALUES ($1, $2, $3, now(), now()) VALUES ($1, $2, $3, now(), now())
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>""#,
merchandise_list.shop_id, merchandise_list.shop_id,
merchandise_list.owner_id, merchandise_list.owner_id,
serde_json::json!(merchandise_list.form_list), serde_json::json!(merchandise_list.form_list),
@ -118,10 +119,12 @@ impl MerchandiseList {
let result = if let Some(order_by) = list_params.get_order_by() { let result = if let Some(order_by) = list_params.get_order_by() {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM merchandise_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>"
FROM merchandise_lists
ORDER BY $1 ORDER BY $1
LIMIT $2 LIMIT $2
OFFSET $3", OFFSET $3"#,
order_by, order_by,
list_params.limit.unwrap_or(10), list_params.limit.unwrap_or(10),
list_params.offset.unwrap_or(0), list_params.offset.unwrap_or(0),
@ -131,9 +134,11 @@ impl MerchandiseList {
} else { } else {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM merchandise_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>"
FROM merchandise_lists
LIMIT $1 LIMIT $1
OFFSET $2", OFFSET $2"#,
list_params.limit.unwrap_or(10), list_params.limit.unwrap_or(10),
list_params.offset.unwrap_or(0), list_params.offset.unwrap_or(0),
) )
@ -157,11 +162,12 @@ impl MerchandiseList {
if existing_merchandise_list.owner_id == owner_id { if existing_merchandise_list.owner_id == owner_id {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"UPDATE merchandise_lists SET r#"UPDATE merchandise_lists SET
form_list = $2, form_list = $2,
updated_at = now() updated_at = now()
WHERE id = $1 WHERE id = $1
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>""#,
id, id,
serde_json::json!(merchandise_list.form_list), serde_json::json!(merchandise_list.form_list),
) )
@ -179,8 +185,10 @@ impl MerchandiseList {
) -> Result<Self> { ) -> Result<Self> {
sqlx::query_as!( sqlx::query_as!(
Self, Self,
"SELECT * FROM merchandise_lists r#"SELECT id, shop_id, owner_id, created_at, updated_at,
WHERE shop_id = $1", form_list as "form_list: Json<Vec<Merchandise>>"
FROM merchandise_lists
WHERE shop_id = $1"#,
shop_id, shop_id,
) )
.fetch_one(db) .fetch_one(db)
@ -204,11 +212,12 @@ impl MerchandiseList {
if existing_merchandise_list.owner_id == owner_id { if existing_merchandise_list.owner_id == owner_id {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"UPDATE merchandise_lists SET r#"UPDATE merchandise_lists SET
form_list = $2, form_list = $2,
updated_at = now() updated_at = now()
WHERE shop_id = $1 WHERE shop_id = $1
RETURNING *", RETURNING id, shop_id, owner_id, created_at, updated_at,
form_list as "form_list: Json<Vec<Merchandise>>""#,
shop_id, shop_id,
serde_json::json!(merchandise_list.form_list), serde_json::json!(merchandise_list.form_list),
) )
@ -242,7 +251,7 @@ impl MerchandiseList {
}]); }]);
Ok(sqlx::query_as!( Ok(sqlx::query_as!(
Self, Self,
"UPDATE r#"UPDATE
merchandise_lists merchandise_lists
SET SET
form_list = CASE form_list = CASE
@ -277,7 +286,13 @@ impl MerchandiseList {
) sub ) sub
WHERE WHERE
shop_id = $1 shop_id = $1
RETURNING merchandise_lists.*", RETURNING
merchandise_lists.id,
merchandise_lists.shop_id,
merchandise_lists.owner_id,
merchandise_lists.created_at,
merchandise_lists.updated_at,
merchandise_lists.form_list as "form_list: Json<Vec<Merchandise>>""#,
shop_id, shop_id,
mod_name, mod_name,
&local_form_id.to_string(), &local_form_id.to_string(),

10
src/models/mod.rs
View File

@ -9,12 +9,12 @@ pub mod owner;
pub mod shop; pub mod shop;
pub mod transaction; pub mod transaction;
pub use interior_ref_list::{InteriorRefList, PostedInteriorRefList, UnsavedInteriorRefList}; pub use interior_ref_list::{InteriorRefList, PostedInteriorRefList};
pub use merchandise_list::{MerchandiseList, PostedMerchandiseList, UnsavedMerchandiseList}; pub use merchandise_list::{MerchandiseList, PostedMerchandiseList};
pub use model::{Model, UpdateableModel}; pub use model::{Model, UpdateableModel};
pub use owner::{Owner, PostedOwner, UnsavedOwner}; pub use owner::{FullPostedOwner, Owner, PostedOwner};
pub use shop::{PostedShop, Shop, UnsavedShop}; pub use shop::{PostedShop, Shop};
pub use transaction::{PostedTransaction, Transaction, UnsavedTransaction}; pub use transaction::{PostedTransaction, Transaction};
#[derive(Debug, Eq, PartialEq, Hash, Clone, Deserialize)] #[derive(Debug, Eq, PartialEq, Hash, Clone, Deserialize)]
pub enum Order { pub enum Order {

12
src/models/owner.rs
View File

@ -24,18 +24,16 @@ pub struct Owner {
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct UnsavedOwner { pub struct PostedOwner {
pub name: String, pub name: String,
#[serde(skip_serializing)]
pub api_key: Uuid,
#[serde(skip_serializing)]
pub ip_address: Option<IpNetwork>,
pub mod_version: i32, pub mod_version: i32,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PostedOwner { pub struct FullPostedOwner {
pub name: String, pub name: String,
pub api_key: Uuid,
pub ip_address: Option<IpNetwork>,
pub mod_version: i32, pub mod_version: i32,
} }
@ -62,7 +60,7 @@ impl Owner {
#[instrument(level = "debug", skip(owner, db))] #[instrument(level = "debug", skip(owner, db))]
pub async fn create( pub async fn create(
owner: UnsavedOwner, owner: FullPostedOwner,
db: impl Executor<'_, Database = Postgres>, db: impl Executor<'_, Database = Postgres>,
) -> Result<Self> { ) -> Result<Self> {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(

9
src/models/shop.rs
View File

@ -18,13 +18,6 @@ pub struct Shop {
pub updated_at: NaiveDateTime, pub updated_at: NaiveDateTime,
} }
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct UnsavedShop {
pub name: String,
pub owner_id: i32,
pub description: Option<String>,
}
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PostedShop { pub struct PostedShop {
pub name: String, pub name: String,
@ -55,7 +48,7 @@ impl Shop {
#[instrument(level = "debug", skip(shop, db))] #[instrument(level = "debug", skip(shop, db))]
pub async fn create( pub async fn create(
shop: UnsavedShop, shop: PostedShop,
db: impl Executor<'_, Database = Postgres>, db: impl Executor<'_, Database = Postgres>,
) -> Result<Self> { ) -> Result<Self> {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(

17
src/models/transaction.rs
View File

@ -26,21 +26,6 @@ pub struct Transaction {
pub updated_at: NaiveDateTime, pub updated_at: NaiveDateTime,
} }
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct UnsavedTransaction {
pub shop_id: i32,
pub owner_id: i32,
pub mod_name: String,
pub local_form_id: i32,
pub name: String,
pub form_type: i32,
pub is_food: bool,
pub price: i32,
pub is_sell: bool,
pub quantity: i32,
pub amount: i32,
}
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct PostedTransaction { pub struct PostedTransaction {
pub shop_id: i32, pub shop_id: i32,
@ -79,7 +64,7 @@ impl Transaction {
#[instrument(level = "debug", skip(db))] #[instrument(level = "debug", skip(db))]
pub async fn create( pub async fn create(
transaction: UnsavedTransaction, transaction: PostedTransaction,
db: impl Executor<'_, Database = Postgres>, db: impl Executor<'_, Database = Postgres>,
) -> Result<Self> { ) -> Result<Self> {
Ok(sqlx::query_as!( Ok(sqlx::query_as!(

99
src/problem/mod.rs
View File

@ -1,3 +1,5 @@
use std::borrow::Borrow;
use anyhow::{anyhow, Error}; use anyhow::{anyhow, Error};
use http::StatusCode; use http::StatusCode;
use http_api_problem::HttpApiProblem; use http_api_problem::HttpApiProblem;
@ -31,16 +33,14 @@ pub fn from_anyhow(error: anyhow::Error) -> HttpApiProblem {
Err(error) => error, Err(error) => error,
}; };
// TODO: should probably decentralize all this error handling to the places where they are relevant
if let Some(sqlx_error) = error.downcast_ref::<sqlx::error::Error>() { if let Some(sqlx_error) = error.downcast_ref::<sqlx::error::Error>() {
match sqlx_error { match sqlx_error {
sqlx::error::Error::RowNotFound => { sqlx::error::Error::RowNotFound => {
return HttpApiProblem::with_title_and_type_from_status(StatusCode::NOT_FOUND) return HttpApiProblem::with_title_and_type_from_status(StatusCode::NOT_FOUND)
} }
_ => {} sqlx::error::Error::Database(db_error) => {
} let pg_error = db_error.downcast_ref::<sqlx::postgres::PgDatabaseError>();
}
if let Some(pg_error) = error.downcast_ref::<sqlx::postgres::PgDatabaseError>() {
error!( error!(
"Database error: {}. {}", "Database error: {}. {}",
pg_error.message(), pg_error.message(),
@ -51,33 +51,104 @@ pub fn from_anyhow(error: anyhow::Error) -> HttpApiProblem {
dbg!(&code); dbg!(&code);
if let Some(constraint) = pg_error.constraint() { if let Some(constraint) = pg_error.constraint() {
dbg!(&constraint); dbg!(&constraint);
if code == "23503" && constraint == "shops_owner_id_fkey" { if code == "23503"
&& (constraint == "shops_owner_id_fkey"
|| constraint == "interior_ref_lists_owner_id_fkey"
|| constraint == "merchandise_lists_owner_id_fkey"
|| constraint == "transactions_owner_id_fkey")
{
// foreign_key_violation // foreign_key_violation
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST) return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Owner does not exist"); .set_detail("Owner does not exist");
} else if code == "23503"
&& (constraint == "interior_ref_lists_shop_id_fkey"
|| constraint == "merchandise_lists_owner_id_fkey"
|| constraint == "transactions_shop_id_fkey")
{
// foreign_key_violation
return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Shop does not exist");
} else if code == "23505" && constraint == "owners_api_key_key" { } else if code == "23505" && constraint == "owners_api_key_key" {
// unique_violation // unique_violation
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST) return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Owner with Api-Key already exists"); .set_detail("Owner with Api-Key already exists");
} else if code == "23505" && constraint == "owners_unique_name_and_api_key" { } else if code == "23505" && constraint == "owners_unique_name_and_api_key" {
// unique_violation // unique_violation
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST) return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Duplicate owner with same name and Api-Key exists"); .set_detail("Duplicate owner with same name and Api-Key exists");
} else if code == "23505" && constraint == "shops_unique_name_and_owner_id" { } else if code == "23505" && constraint == "shops_unique_name_and_owner_id" {
// unique_violation // unique_violation
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST) return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Owner already has a shop with that name"); .set_detail("Owner already has a shop with that name");
} else if code == "23505" && constraint == "interior_ref_lists_shop_id_key" {
// unique_violation
return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Interior ref list already exists for that shop");
} else if code == "23505" && constraint == "merchandise_lists_shop_id_key" {
// unique_violation
return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Merchandise list already exists for that shop");
} else if code == "23514" && constraint == "merchandise_quantity_gt_zero" { } else if code == "23514" && constraint == "merchandise_quantity_gt_zero" {
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST) return HttpApiProblem::with_title_and_type_from_status(
StatusCode::BAD_REQUEST,
)
.set_detail("Quantity of merchandise must be greater than zero"); .set_detail("Quantity of merchandise must be greater than zero");
} }
} }
// Might possibly link sensitive info:
// let mut problem = HttpApiProblem::with_title_and_type_from_status(
// StatusCode::INTERNAL_SERVER_ERROR,
// )
// .set_title("Database Error")
// .set_detail(format!(
// "{}. {}",
// pg_error.message(),
// pg_error.detail().unwrap_or("")
// ));
// problem
// .set_value("code".to_string(), &code.to_string())
// .unwrap();
// return problem;
}
_ => {}
}
}
if let Some(json_error) = error.downcast_ref::<serde_json::Error>() {
return HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST)
.set_title("Json Body Deserialization Error")
.set_detail(format!("{}", json_error));
}
if let Some(bincode_error) = error.downcast_ref::<bincode::Error>() {
return match bincode_error.borrow() {
bincode::ErrorKind::Io(io_error) => {
HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST)
.set_title("Bincode Body Deserialization Error")
.set_detail(format!("io error ({:?}): {}", io_error.kind(), io_error))
}
error => HttpApiProblem::with_title_and_type_from_status(StatusCode::BAD_REQUEST)
.set_title("Bincode Body Deserialization Error")
.set_detail(format!("{}", error)),
};
} }
error!("Recovering unhandled error: {:?}", error); error!("Recovering unhandled error: {:?}", error);
// TODO: this leaks internal info, should not stringify error HttpApiProblem::with_title_and_type_from_status(StatusCode::INTERNAL_SERVER_ERROR)
HttpApiProblem::new(format!("Internal Server Error: {:?}", error))
.set_status(StatusCode::INTERNAL_SERVER_ERROR)
} }
pub async fn unpack_problem(rejection: Rejection) -> Result<impl Reply, Rejection> { pub async fn unpack_problem(rejection: Rejection) -> Result<impl Reply, Rejection> {