diff options
Diffstat (limited to 'rust')
125 files changed, 735 insertions, 4011 deletions
diff --git a/rust/Cargo.lock b/rust/Cargo.lock index f6fa829..f4c8ea2 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -10,7 +10,8 @@ dependencies = [ "chrono", "diesel", "libsqlite3-sys", - "schist_core", + "schist_models", + "schist_queries", ] [[package]] @@ -1368,11 +1369,58 @@ dependencies = [ "rocket", "rocket_sync_db_pools", "rusqlite", - "schist_core", + "schist_models", + "schist_queries", + "schist_schema", ] [[package]] -name = "schist_core" +name = "schist_fakes" +version = "0.1.0" +dependencies = [ + "schist_models", + "schist_traits", +] + +[[package]] +name = "schist_models" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "derive_builder", + "diesel", + "diesel_migrations", + "schist_queries", + "schist_traits", + "serde", +] + +[[package]] +name = "schist_queries" +version = "0.1.0" +dependencies = [ + "anyhow", + "chrono", + "diesel", + "diesel_migrations", + "libsqlite3-sys", + "schist_fakes", + "schist_models", + "schist_schema", + "schist_traits", + "serde", +] + +[[package]] +name = "schist_schema" +version = "0.1.0" +dependencies = [ + "schist_models", +] + +[[package]] +name = "schist_traits" version = "0.1.0" dependencies = [ "anyhow", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a43c8f5..499747d 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,8 +1,12 @@ [workspace] members = [ - "actualbudget_importer", + "schist_actualbudget_importer", "schist_backend", - "schist_core", + "schist_fakes", + "schist_models", + "schist_queries", + "schist_schema", + "schist_traits", ] resolver = "2" diff --git a/rust/actualbudget_importer/Cargo.lock b/rust/actualbudget_importer/Cargo.lock deleted file mode 100644 index b2da38b..0000000 --- a/rust/actualbudget_importer/Cargo.lock +++ /dev/null @@ -1,679 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "actualbudget" -version = "0.1.0" -dependencies = [ - "anyhow", - "schist_core", - "chrono", - "diesel", - "libsqlite3-sys", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "schist_core" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "derive_builder", - "diesel", - "diesel_migrations", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "cc" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn", -] - -[[package]] -name = "diesel" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" -dependencies = [ - "diesel_table_macro_syntax", - "dsl_auto_type", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_migrations" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" -dependencies = [ - "syn", -] - -[[package]] -name = "dsl_auto_type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" -dependencies = [ - "darling", - "either", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "migrations_internals" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "migrations_macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" -dependencies = [ - "memchr", -] diff --git a/rust/actualbudget_importer/Cargo.toml b/rust/schist_actualbudget_importer/Cargo.toml index 03d0292..ea46aa0 100644 --- a/rust/actualbudget_importer/Cargo.toml +++ b/rust/schist_actualbudget_importer/Cargo.toml @@ -5,7 +5,8 @@ edition = "2021" [dependencies] anyhow = { workspace = true } -schist_core = { path = "../schist_core" } chrono = { workspace = true, features = ["serde"] } diesel = { workspace = true, features = ["sqlite"] } libsqlite3-sys = { workspace = true, features = ["bundled"] } +schist_models = { path = "../schist_models" } +schist_queries = { path = "../schist_queries" } diff --git a/rust/actualbudget_importer/src/main.rs b/rust/schist_actualbudget_importer/src/main.rs index 78c64f4..ebf5353 100644 --- a/rust/actualbudget_importer/src/main.rs +++ b/rust/schist_actualbudget_importer/src/main.rs @@ -4,7 +4,8 @@ pub mod schema; pub mod transformers; use anyhow::Result; -use schist_core::queries as schist_queries; +use schist_models::{account::Account, budget_update::BudgetUpdate, category::Category, category_transfer::CategoryTransfer, transaction::Transaction, transaction_categorisation::TransactionCategorisation}; +use schist_queries; use diesel::{Connection, SqliteConnection}; use queries::{actualbudget_accounts::{get_all_actualbudget_accounts, get_category_transfers_account}, actualbudget_categories::get_all_actualbudget_categories, actualbudget_transactions::{get_all_actualbudget_transactions, get_first_actualbudget_transaction_date}, actualbudget_zero_budgets::get_all_actualbudget_zero_budgets}; @@ -19,16 +20,20 @@ fn main() -> Result<()> { let actualbudget_category_transfers_account = get_category_transfers_account(connection_src)?; let actualbudget_transactions = get_all_actualbudget_transactions(connection_src)?; - let first_transaction_date = transformers::transform_date(&actualbudget_first_transaction_date)?; - let accounts = + let first_transaction_date = + transformers::transform_date(&actualbudget_first_transaction_date)?; + let accounts: Vec<Account> = transformers::transform_accounts(&actualbudget_accounts, &first_transaction_date); - let categories = transformers::transform_categories(&actualbudget_categories); - let budget_updates = transformers::transform_budget_updates(&actualbudget_zero_budgets)?; - let (transactions, transaction_categorisations) = transformers::transform_transactions( - &actualbudget_transactions, - &actualbudget_category_transfers_account, - )?; - let category_transfers = transformers::transform_category_transfers( + let categories: Vec<Category> = + transformers::transform_categories(&actualbudget_categories); + let budget_updates: Vec<BudgetUpdate> = + transformers::transform_budget_updates(&actualbudget_zero_budgets)?; + let (transactions, transaction_categorisations): (Vec<Transaction>, Vec<TransactionCategorisation>) = + transformers::transform_transactions( + &actualbudget_transactions, + &actualbudget_category_transfers_account, + )?; + let category_transfers: Vec<CategoryTransfer> = transformers::transform_category_transfers( &actualbudget_transactions, &actualbudget_category_transfers_account, ); diff --git a/rust/actualbudget_importer/src/models/actualbudget_account.rs b/rust/schist_actualbudget_importer/src/models/actualbudget_account.rs index b3d00ac..b3d00ac 100644 --- a/rust/actualbudget_importer/src/models/actualbudget_account.rs +++ b/rust/schist_actualbudget_importer/src/models/actualbudget_account.rs diff --git a/rust/actualbudget_importer/src/models/actualbudget_category.rs b/rust/schist_actualbudget_importer/src/models/actualbudget_category.rs index cbea99b..cbea99b 100644 --- a/rust/actualbudget_importer/src/models/actualbudget_category.rs +++ b/rust/schist_actualbudget_importer/src/models/actualbudget_category.rs diff --git a/rust/actualbudget_importer/src/models/actualbudget_date.rs b/rust/schist_actualbudget_importer/src/models/actualbudget_date.rs index bef160c..bef160c 100644 --- a/rust/actualbudget_importer/src/models/actualbudget_date.rs +++ b/rust/schist_actualbudget_importer/src/models/actualbudget_date.rs diff --git a/rust/actualbudget_importer/src/models/actualbudget_transaction.rs b/rust/schist_actualbudget_importer/src/models/actualbudget_transaction.rs index be2ca1a..be2ca1a 100644 --- a/rust/actualbudget_importer/src/models/actualbudget_transaction.rs +++ b/rust/schist_actualbudget_importer/src/models/actualbudget_transaction.rs diff --git a/rust/actualbudget_importer/src/models/actualbudget_zero_budget.rs b/rust/schist_actualbudget_importer/src/models/actualbudget_zero_budget.rs index 6478d34..6478d34 100644 --- a/rust/actualbudget_importer/src/models/actualbudget_zero_budget.rs +++ b/rust/schist_actualbudget_importer/src/models/actualbudget_zero_budget.rs diff --git a/rust/actualbudget_importer/src/models/mod.rs b/rust/schist_actualbudget_importer/src/models/mod.rs index 1c97c65..1c97c65 100644 --- a/rust/actualbudget_importer/src/models/mod.rs +++ b/rust/schist_actualbudget_importer/src/models/mod.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_accounts/get_all.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/get_all.rs index 6f667de..6f667de 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_accounts/get_all.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/get_all.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_accounts/get_category_transfers_account.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/get_category_transfers_account.rs index f05dc78..f05dc78 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_accounts/get_category_transfers_account.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/get_category_transfers_account.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_accounts/mod.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/mod.rs index c6d6015..c6d6015 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_accounts/mod.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_accounts/mod.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_categories/get_all.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_categories/get_all.rs index 4cb7ebc..4cb7ebc 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_categories/get_all.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_categories/get_all.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_categories/mod.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_categories/mod.rs index 0c04e53..0c04e53 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_categories/mod.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_categories/mod.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_transactions/get_all.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/get_all.rs index 84c8d08..84c8d08 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_transactions/get_all.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/get_all.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_transactions/get_first_date.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/get_first_date.rs index b958c37..b958c37 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_transactions/get_first_date.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/get_first_date.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_transactions/mod.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/mod.rs index b4ed0dd..b4ed0dd 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_transactions/mod.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_transactions/mod.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_zero_budgets/get_all.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_zero_budgets/get_all.rs index 0c3f695..0c3f695 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_zero_budgets/get_all.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_zero_budgets/get_all.rs diff --git a/rust/actualbudget_importer/src/queries/actualbudget_zero_budgets/mod.rs b/rust/schist_actualbudget_importer/src/queries/actualbudget_zero_budgets/mod.rs index ba7e21b..ba7e21b 100644 --- a/rust/actualbudget_importer/src/queries/actualbudget_zero_budgets/mod.rs +++ b/rust/schist_actualbudget_importer/src/queries/actualbudget_zero_budgets/mod.rs diff --git a/rust/actualbudget_importer/src/queries/mod.rs b/rust/schist_actualbudget_importer/src/queries/mod.rs index e16dafc..e16dafc 100644 --- a/rust/actualbudget_importer/src/queries/mod.rs +++ b/rust/schist_actualbudget_importer/src/queries/mod.rs diff --git a/rust/actualbudget_importer/src/schema.rs b/rust/schist_actualbudget_importer/src/schema.rs index a872231..a872231 100644 --- a/rust/actualbudget_importer/src/schema.rs +++ b/rust/schist_actualbudget_importer/src/schema.rs diff --git a/rust/actualbudget_importer/src/transformers.rs b/rust/schist_actualbudget_importer/src/transformers.rs index 7e8141a..d1b1564 100644 --- a/rust/actualbudget_importer/src/transformers.rs +++ b/rust/schist_actualbudget_importer/src/transformers.rs @@ -1,6 +1,13 @@ use anyhow::Result; -use schist_core::models::{ - account::Account, budget_update::BudgetUpdate, category::Category, category_transfer::CategoryTransfer, date_utc::DateUtc, datetime_utc::DatetimeUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation +use schist_models::{ + account::Account, + budget_update::BudgetUpdate, + category::Category, + category_transfer::CategoryTransfer, + date_utc::DateUtc, + datetime_utc::DatetimeUtc, + transaction::Transaction, + transaction_categorisation::TransactionCategorisation, }; use core::panic; use std::hash::{DefaultHasher, Hash, Hasher}; diff --git a/rust/schist_backend/Cargo.lock b/rust/schist_backend/Cargo.lock deleted file mode 100644 index c8e1ad1..0000000 --- a/rust/schist_backend/Cargo.lock +++ /dev/null @@ -1,2021 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-trait" -version = "0.1.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] -name = "atomic" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "binascii" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "schist_backend" -version = "0.1.0" -dependencies = [ - "schist_core", - "cfg-if", - "chrono", - "diesel", - "diesel_migrations", - "dotenvy", - "rocket", - "rocket_sync_db_pools", - "rusqlite", -] - -[[package]] -name = "schist_core" -version = "0.1.0" -dependencies = [ - "chrono", - "diesel", - "diesel_migrations", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "cc" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "devise" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d90b0c4c777a2cad215e3c7be59ac7c15adf45cf76317009b7d096d46f651d" -dependencies = [ - "devise_codegen", - "devise_core", -] - -[[package]] -name = "devise_codegen" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b28680d8be17a570a2334922518be6adc3f58ecc880cbb404eaeb8624fd867" -dependencies = [ - "devise_core", - "quote", -] - -[[package]] -name = "devise_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b035a542cf7abf01f2e3c4d5a7acbaebfefe120ae4efc7bde3df98186e4b8af7" -dependencies = [ - "bitflags", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "diesel" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e13bab2796f412722112327f3e575601a3e9cdcbe426f0d30dbf43f3f5dc71" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "r2d2", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" -dependencies = [ - "diesel_table_macro_syntax", - "dsl_auto_type", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_migrations" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" -dependencies = [ - "syn", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dsl_auto_type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" -dependencies = [ - "darling", - "either", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "figment" -version = "0.10.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" -dependencies = [ - "atomic 0.6.0", - "pear", - "serde", - "toml", - "uncased", - "version_check", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.12", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "inlinable_string" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "migrations_internals" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "migrations_macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.1.0", - "httparse", - "memchr", - "mime", - "spin", - "tokio", - "tokio-util", - "version_check", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "object" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "pear" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" -dependencies = [ - "inlinable_string", - "pear_codegen", - "yansi", -] - -[[package]] -name = "pear_codegen" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" -dependencies = [ - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "version_check", - "yansi", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot", - "scheduled-thread-pool", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" -dependencies = [ - "bitflags", -] - -[[package]] -name = "ref-cast" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "rocket" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a516907296a31df7dc04310e7043b61d71954d703b603cc6867a026d7e72d73f" -dependencies = [ - "async-stream", - "async-trait", - "atomic 0.5.3", - "binascii", - "bytes", - "either", - "figment", - "futures", - "indexmap", - "log", - "memchr", - "multer", - "num_cpus", - "parking_lot", - "pin-project-lite", - "rand", - "ref-cast", - "rocket_codegen", - "rocket_http", - "serde", - "serde_json", - "state", - "tempfile", - "time", - "tokio", - "tokio-stream", - "tokio-util", - "ubyte", - "version_check", - "yansi", -] - -[[package]] -name = "rocket_codegen" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575d32d7ec1a9770108c879fc7c47815a80073f96ca07ff9525a94fcede1dd46" -dependencies = [ - "devise", - "glob", - "indexmap", - "proc-macro2", - "quote", - "rocket_http", - "syn", - "unicode-xid", - "version_check", -] - -[[package]] -name = "rocket_http" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e274915a20ee3065f611c044bd63c40757396b6dbc057d6046aec27f14f882b9" -dependencies = [ - "cookie", - "either", - "futures", - "http 0.2.12", - "hyper", - "indexmap", - "log", - "memchr", - "pear", - "percent-encoding", - "pin-project-lite", - "ref-cast", - "serde", - "smallvec", - "stable-pattern", - "state", - "time", - "tokio", - "uncased", -] - -[[package]] -name = "rocket_sync_db_pools" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f32721ed79509adac4328e97f817a8f55a47c4b64799f6fd6cc3adb6e42ff" -dependencies = [ - "diesel", - "r2d2", - "rocket", - "rocket_sync_db_pools_codegen", - "serde", - "tokio", - "version_check", -] - -[[package]] -name = "rocket_sync_db_pools_codegen" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc890925dc79370c28eb15c9957677093fdb7e8c44966d189f38cedb995ee68" -dependencies = [ - "devise", - "quote", -] - -[[package]] -name = "rusqlite" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.127" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "stable-pattern" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" -dependencies = [ - "memchr", -] - -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ubyte" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea" -dependencies = [ - "serde", -] - -[[package]] -name = "uncased" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" -dependencies = [ - "serde", - "version_check", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-xid" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/rust/schist_backend/Cargo.toml b/rust/schist_backend/Cargo.toml index b647af0..2b4f843 100644 --- a/rust/schist_backend/Cargo.toml +++ b/rust/schist_backend/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -schist_core = { path = "../schist_core" } chrono = { workspace = true, features = ["serde"] } cfg-if = { workspace = true } diesel = { workspace = true, features = ["sqlite"] } @@ -13,3 +12,6 @@ dotenvy = { workspace = true } rocket = { workspace = true, features = ["json"] } rocket_sync_db_pools = { workspace = true, features = ["diesel_sqlite_pool"] } rusqlite = { workspace = true, features = ["bundled"] } +schist_models = { path = "../schist_models" } +schist_queries = { path = "../schist_queries" } +schist_schema = { path = "../schist_schema" } diff --git a/rust/schist_backend/src/main.rs b/rust/schist_backend/src/main.rs index 8f5a40e..aa46cb4 100644 --- a/rust/schist_backend/src/main.rs +++ b/rust/schist_backend/src/main.rs @@ -1,4 +1,4 @@ -use schist_core::MIGRATIONS; +use schist_schema::migrations::MIGRATIONS; use diesel::SqliteConnection; use diesel_migrations::MigrationHarness; use rocket::fairing::AdHoc; diff --git a/rust/schist_backend/src/routes/account.rs b/rust/schist_backend/src/routes/account.rs index 22565fb..83d4d1b 100644 --- a/rust/schist_backend/src/routes/account.rs +++ b/rust/schist_backend/src/routes/account.rs @@ -1,7 +1,5 @@ -use schist_core::{ - models::account::Account, - queries::accounts::{get_all_accounts as get_all_accounts_query, insert_accounts}, -}; +use schist_models::account::Account; +use schist_queries::accounts::{get_all_accounts as get_all_accounts_query, insert_accounts}; use rocket::http::Status; use rocket::serde::json::Json; use rocket::{get, post, Responder}; diff --git a/rust/schist_backend/src/routes/balance.rs b/rust/schist_backend/src/routes/balance.rs index 058bad2..d7c01d5 100644 --- a/rust/schist_backend/src/routes/balance.rs +++ b/rust/schist_backend/src/routes/balance.rs @@ -1,8 +1,6 @@ -use schist_core::{ - models::category_balance::CategoryBalance, - queries::categories::get_all_category_balances as get_all_category_balances_query, -}; use rocket::{get, http::Status, serde::json::Json}; +use schist_models::category_balance::CategoryBalance; +use schist_queries::categories::get_all_category_balances as get_all_category_balances_query; use crate::databases::UserDataDb; #[get("/balance/category")] diff --git a/rust/schist_backend/src/routes/budget.rs b/rust/schist_backend/src/routes/budget.rs index 92213bb..89438b9 100644 --- a/rust/schist_backend/src/routes/budget.rs +++ b/rust/schist_backend/src/routes/budget.rs @@ -1,10 +1,8 @@ -use schist_core::{ - models::category_budget::CategoryBudget, - queries::categories::get_most_recent_category_budget_per_category_id as get_most_recent_category_budget_per_category_id_query, -}; use rocket::get; use rocket::http::Status; use rocket::serde::json::Json; +use schist_models::category_budget::CategoryBudget; +use schist_queries::categories::get_most_recent_category_budget_per_category_id as get_most_recent_category_budget_per_category_id_query; use crate::databases::UserDataDb; diff --git a/rust/schist_backend/src/routes/budget_update.rs b/rust/schist_backend/src/routes/budget_update.rs index 7788c6b..c70a9b7 100644 --- a/rust/schist_backend/src/routes/budget_update.rs +++ b/rust/schist_backend/src/routes/budget_update.rs @@ -1,10 +1,8 @@ -use schist_core::{ - models::budget_update::BudgetUpdate, - queries::budget_updates::get_all_budget_updates as get_all_budget_updates_query, -}; use rocket::get; use rocket::http::Status; use rocket::serde::json::Json; +use schist_models::budget_update::BudgetUpdate; +use schist_queries::budget_updates::get_all_budget_updates as get_all_budget_updates_query; use crate::databases::UserDataDb; diff --git a/rust/schist_backend/src/routes/category.rs b/rust/schist_backend/src/routes/category.rs index 1f07452..b2412ac 100644 --- a/rust/schist_backend/src/routes/category.rs +++ b/rust/schist_backend/src/routes/category.rs @@ -1,10 +1,8 @@ -use schist_core::{ - models::category::Category, - queries::categories::get_all_categories as get_all_categories_query, -}; use rocket::get; use rocket::http::Status; use rocket::serde::json::Json; +use schist_models::category::Category; +use schist_queries::categories::get_all_categories as get_all_categories_query; use crate::databases::UserDataDb; diff --git a/rust/schist_core/Cargo.lock b/rust/schist_core/Cargo.lock deleted file mode 100644 index 9253dc6..0000000 --- a/rust/schist_core/Cargo.lock +++ /dev/null @@ -1,669 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "schist_core" -version = "0.1.0" -dependencies = [ - "anyhow", - "chrono", - "derive_builder", - "diesel", - "diesel_migrations", - "libsqlite3-sys", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "cc" -version = "1.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn", -] - -[[package]] -name = "diesel" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" -dependencies = [ - "diesel_table_macro_syntax", - "dsl_auto_type", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_migrations" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" -dependencies = [ - "diesel", - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" -dependencies = [ - "syn", -] - -[[package]] -name = "dsl_auto_type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" -dependencies = [ - "darling", - "either", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "js-sys" -version = "0.3.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.159" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" - -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "migrations_internals" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "migrations_macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "proc-macro2" -version = "1.0.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "wasm-bindgen" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.95" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winnow" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" -dependencies = [ - "memchr", -] diff --git a/rust/schist_core/src/queries/accounts/delete_all.rs b/rust/schist_core/src/queries/accounts/delete_all.rs deleted file mode 100644 index 84d7bf6..0000000 --- a/rust/schist_core/src/queries/accounts/delete_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use diesel::{RunQueryDsl, SqliteConnection}; - -use crate::schema::accounts::dsl::accounts; - -pub fn delete_all_accounts(connection: &mut SqliteConnection) -> Result<usize> { - let num_rows_deleted = diesel::delete(accounts) - .execute(connection) - .with_context(|| "failed to delete all accounts")?; - Ok(num_rows_deleted) -} diff --git a/rust/schist_core/src/queries/accounts/get_all.rs b/rust/schist_core/src/queries/accounts/get_all.rs deleted file mode 100644 index ab53729..0000000 --- a/rust/schist_core/src/queries/accounts/get_all.rs +++ /dev/null @@ -1,10 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::account::Account, schema::accounts::dsl::accounts}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_accounts(connection: &mut SqliteConnection) -> Result<Vec<Account>> { - let all_accounts = accounts.select(Account::as_select()) - .load(connection) - .with_context(|| "failed to get all accounts")?; - Ok(all_accounts) -} diff --git a/rust/schist_core/src/queries/accounts/insert.rs b/rust/schist_core/src/queries/accounts/insert.rs deleted file mode 100644 index 7020b68..0000000 --- a/rust/schist_core/src/queries/accounts/insert.rs +++ /dev/null @@ -1,28 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::account::Account, - schema::accounts::dsl::accounts as accounts_table, -}; -use diesel::prelude::*; - -pub fn insert_accounts( - accounts: &[Account], - connection: &mut SqliteConnection, -) -> Result<usize> { - let num_accounts_inserted = diesel::insert_into(accounts_table) - .values(accounts) - .execute(connection) - .with_context(|| err_msg(accounts))?; - Ok(num_accounts_inserted) -} - -fn err_msg(accounts: &[Account]) -> String { - format!( - "failed to insert accounts: [{}]", - accounts - .iter() - .map(|a| format!("\"{}\": \"{}\"", a.id, a.name)) - .collect::<Vec<String>>() - .join(", ") - ) -} diff --git a/rust/schist_core/src/queries/accounts/mod.rs b/rust/schist_core/src/queries/accounts/mod.rs deleted file mode 100644 index 222b180..0000000 --- a/rust/schist_core/src/queries/accounts/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -mod delete_all; -mod get_all; -mod insert; - -pub use delete_all::delete_all_accounts; -pub use get_all::get_all_accounts; -pub use insert::insert_accounts; diff --git a/rust/schist_core/src/queries/budget_updates/delete_all.rs b/rust/schist_core/src/queries/budget_updates/delete_all.rs deleted file mode 100644 index b7ad082..0000000 --- a/rust/schist_core/src/queries/budget_updates/delete_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use diesel::{RunQueryDsl, SqliteConnection}; - -use crate::schema::budget_updates::dsl::budget_updates; - -pub fn delete_all_budget_updates(connection: &mut SqliteConnection) -> Result<usize> { - let num_rows_deleted = diesel::delete(budget_updates) - .execute(connection) - .with_context(|| "failed to delete all budget updates")?; - Ok(num_rows_deleted) -} diff --git a/rust/schist_core/src/queries/budget_updates/get_all.rs b/rust/schist_core/src/queries/budget_updates/get_all.rs deleted file mode 100644 index 9c9310b..0000000 --- a/rust/schist_core/src/queries/budget_updates/get_all.rs +++ /dev/null @@ -1,16 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::budget_update::BudgetUpdate, - schema::budget_updates::dsl::budget_updates as budget_updates_table, -}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_budget_updates( - connection: &mut SqliteConnection, -) -> Result<Vec<BudgetUpdate>> { - let all_budget_updates = budget_updates_table - .select(BudgetUpdate::as_select()) - .load::<BudgetUpdate>(connection) - .with_context(|| "failed to get all budget updates")?; - Ok(all_budget_updates) -} diff --git a/rust/schist_core/src/queries/budget_updates/get_first_with_date_and_category_id.rs b/rust/schist_core/src/queries/budget_updates/get_first_with_date_and_category_id.rs deleted file mode 100644 index 2d8f97c..0000000 --- a/rust/schist_core/src/queries/budget_updates/get_first_with_date_and_category_id.rs +++ /dev/null @@ -1,25 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::{budget_update::BudgetUpdate, date_utc::DateUtc}, - schema::budget_updates::{ - self as budget_updates_schema, dsl::budget_updates as budget_updates_table, - }, -}; -use diesel::{ - ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection -}; - -pub fn get_first_budget_update_with_date_and_category_id( - date: &DateUtc, - category_id: i32, - connection: &mut SqliteConnection, -) -> Result<Option<BudgetUpdate>> { - let first_budget_update = budget_updates_table - .select(BudgetUpdate::as_select()) - .filter(budget_updates_schema::date.eq(date.to_string())) - .filter(budget_updates_schema::category_id.eq(category_id)) - .first(connection) - .optional() - .with_context(|| format!("failed to get first budget update with date {}", date.to_string()))?; - Ok(first_budget_update) -} diff --git a/rust/schist_core/src/queries/budget_updates/get_most_recent_with_category_id.rs b/rust/schist_core/src/queries/budget_updates/get_most_recent_with_category_id.rs deleted file mode 100644 index 41ef5ec..0000000 --- a/rust/schist_core/src/queries/budget_updates/get_most_recent_with_category_id.rs +++ /dev/null @@ -1,21 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::date_utc::DateUtc, - schema::budget_updates::{ - self as budget_updates_schema, dsl::budget_updates as budget_updates_table, - }, traits::nowlike::Nowlike, -}; -use diesel::{dsl::max, ExpressionMethods, QueryDsl, RunQueryDsl, SqliteConnection}; - -pub fn get_most_recent_budget_update_date_with_category_id( - category_id: i32, - connection: &mut SqliteConnection, -) -> Result<Option<DateUtc>> { - let most_recent_date = budget_updates_table - .select(max(budget_updates_schema::date)) - .filter(budget_updates_schema::category_id.eq(category_id)) - .filter(budget_updates_schema::date.le(DateUtc::now())) - .first(connection) - .with_context(|| format!("failed to get most recent budget update date with category ID {}", category_id))?; - Ok(most_recent_date) -} diff --git a/rust/schist_core/src/queries/budget_updates/insert.rs b/rust/schist_core/src/queries/budget_updates/insert.rs deleted file mode 100644 index e8ae271..0000000 --- a/rust/schist_core/src/queries/budget_updates/insert.rs +++ /dev/null @@ -1,28 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::budget_update::BudgetUpdate, - schema::budget_updates::dsl::budget_updates as budget_updates_table, -}; -use diesel::prelude::*; - -pub fn insert_budget_updates( - budget_updates: &[BudgetUpdate], - connection: &mut SqliteConnection, -) -> Result<usize> { - let num_rows_inserted = diesel::insert_into(budget_updates_table) - .values(budget_updates) - .execute(connection) - .with_context(|| err_msg(budget_updates))?; - Ok(num_rows_inserted) -} - -fn err_msg(budget_updates: &[BudgetUpdate]) -> String { - format!( - "failed to insert budget updates: [{}]", - budget_updates - .iter() - .map(|a| a.id.to_string()) - .collect::<Vec<String>>() - .join(", ") - ) -} diff --git a/rust/schist_core/src/queries/budget_updates/mod.rs b/rust/schist_core/src/queries/budget_updates/mod.rs deleted file mode 100644 index 6fc7de0..0000000 --- a/rust/schist_core/src/queries/budget_updates/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod delete_all; -mod get_all; -mod get_first_with_date_and_category_id; -mod get_most_recent_with_category_id; -mod insert; - -pub use delete_all::delete_all_budget_updates; -pub use get_all::get_all_budget_updates; -pub use get_first_with_date_and_category_id::get_first_budget_update_with_date_and_category_id; -pub use get_most_recent_with_category_id::get_most_recent_budget_update_date_with_category_id; -pub use insert::insert_budget_updates; diff --git a/rust/schist_core/src/queries/categories/delete_all.rs b/rust/schist_core/src/queries/categories/delete_all.rs deleted file mode 100644 index 1fd2581..0000000 --- a/rust/schist_core/src/queries/categories/delete_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use diesel::{RunQueryDsl, SqliteConnection}; - -use crate::schema::categories::dsl::categories; - -pub fn delete_all_categories(connection: &mut SqliteConnection) -> Result<usize> { - let num_rows_deleted = diesel::delete(categories) - .execute(connection) - .with_context(|| "failed to delete all categories")?; - Ok(num_rows_deleted) -} diff --git a/rust/schist_core/src/queries/categories/get_all.rs b/rust/schist_core/src/queries/categories/get_all.rs deleted file mode 100644 index 431ed9c..0000000 --- a/rust/schist_core/src/queries/categories/get_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::category::Category, schema::categories::dsl::categories as categories_table}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_categories(connection: &mut SqliteConnection) -> Result<Vec<Category>> { - let all_categories = categories_table - .select(Category::as_select()) - .load(connection) - .with_context(|| "failed to get all categories")?; - Ok(all_categories) -} diff --git a/rust/schist_core/src/queries/categories/get_all_balances.rs b/rust/schist_core/src/queries/categories/get_all_balances.rs deleted file mode 100644 index c9a0102..0000000 --- a/rust/schist_core/src/queries/categories/get_all_balances.rs +++ /dev/null @@ -1,47 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::category_balance::CategoryBalance, queries::{ - budget_updates::get_all_budget_updates, - categories::get_all_categories, - category_transfers::{ - sum_category_transfer_quantity_per_from_category_id, - sum_category_transfer_quantity_per_to_category_id, - }, - transaction_categorisations::sum_transaction_categorisation_quantity_per_category_id, - }, utils::calculate_category_balance}; -use diesel::SqliteConnection; - -pub fn get_all_category_balances( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBalance>> { - get_all_category_balances_without_context(connection) - .with_context(|| "failed to get all category balances") -} - -fn get_all_category_balances_without_context( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBalance>> { - let categories = get_all_categories(connection)?; - let transaction_sums = sum_transaction_categorisation_quantity_per_category_id(connection)?; - let category_transfer_from_sums = - sum_category_transfer_quantity_per_from_category_id(connection)?; - let category_transfer_to_sums = sum_category_transfer_quantity_per_to_category_id(connection)?; - let budget_updates = get_all_budget_updates(connection)?; - - let mut balances = Vec::<CategoryBalance>::new(); - for category in categories { - let balance = calculate_category_balance( - &category, - &transaction_sums, - &category_transfer_from_sums, - &category_transfer_to_sums, - &budget_updates, - )?; - - balances.push(CategoryBalance { - category_id: category.id, - balance: balance.try_into().unwrap(), - }) - } - - Ok(balances) -} diff --git a/rust/schist_core/src/queries/categories/get_all_ids.rs b/rust/schist_core/src/queries/categories/get_all_ids.rs deleted file mode 100644 index 8505e71..0000000 --- a/rust/schist_core/src/queries/categories/get_all_ids.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use crate::schema::categories::{self as categories_schema, dsl::categories as categories_table}; -use diesel::{QueryDsl, RunQueryDsl, SqliteConnection}; - -pub fn get_all_category_ids(connection: &mut SqliteConnection) -> Result<Vec<i32>> { - let all_category_ids = categories_table - .select(categories_schema::id) - .load(connection) - .with_context(|| "failed to get all category IDs")?; - Ok(all_category_ids) -} diff --git a/rust/schist_core/src/queries/categories/get_most_recent_budget_per_category_id.rs b/rust/schist_core/src/queries/categories/get_most_recent_budget_per_category_id.rs deleted file mode 100644 index 9f2e4f6..0000000 --- a/rust/schist_core/src/queries/categories/get_most_recent_budget_per_category_id.rs +++ /dev/null @@ -1,52 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::{budget::Budget, category_budget::CategoryBudget}, queries::{ - budget_updates::{ - get_first_budget_update_with_date_and_category_id, get_most_recent_budget_update_date_with_category_id, - }, - categories::get_all_category_ids, -}}; -use diesel::SqliteConnection; - -pub fn get_most_recent_category_budget_per_category_id( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBudget>> { - get_most_recent_category_budget_per_category_id_without_context(connection) - .with_context(|| "failed to get most recent category budget per category ID") -} - -fn get_most_recent_category_budget_per_category_id_without_context( - connection: &mut SqliteConnection, -) -> Result<Vec<CategoryBudget>> { - let category_ids: Vec<i32> = get_all_category_ids(connection)?; - - let mut budgets = Vec::<CategoryBudget>::new(); - for category_id in category_ids { - let most_recent_budget_update_date = - get_most_recent_budget_update_date_with_category_id(category_id, connection)?; - - if most_recent_budget_update_date.is_none() { - budgets.push(CategoryBudget { - category_id, - budget: Option::None, - }); - continue; - } - let most_recent_budget_update_date = most_recent_budget_update_date.unwrap(); - - let most_recent_budget_update = get_first_budget_update_with_date_and_category_id( - &most_recent_budget_update_date, - category_id, - connection, - )?; - // The fact we found the date by getting the most recent budget update - // date guarantees that the Option is Some - let most_recent_budget_update = most_recent_budget_update.unwrap(); - - budgets.push(CategoryBudget { - category_id, - budget: Some(Budget::from(&most_recent_budget_update)), - }); - } - - Ok(budgets) -} diff --git a/rust/schist_core/src/queries/categories/insert.rs b/rust/schist_core/src/queries/categories/insert.rs deleted file mode 100644 index bccba72..0000000 --- a/rust/schist_core/src/queries/categories/insert.rs +++ /dev/null @@ -1,28 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{ - models::category::Category, - schema::categories::dsl::categories as categories_table, -}; -use diesel::prelude::*; - -pub fn insert_categories( - categories: &[Category], - connection: &mut SqliteConnection, -) -> Result<usize> { - let num_categories_inserted = diesel::insert_into(categories_table) - .values(categories) - .execute(connection) - .with_context(|| err_msg(categories))?; - Ok(num_categories_inserted) -} - -fn err_msg(categories: &[Category]) -> String { - format!( - "failed to insert categories: [{}]", - categories - .iter() - .map(|a| format!("\"{}\": \"{}\"", a.id, a.name)) - .collect::<Vec<String>>() - .join(", ") - ) -} diff --git a/rust/schist_core/src/queries/categories/mod.rs b/rust/schist_core/src/queries/categories/mod.rs deleted file mode 100644 index edeeebf..0000000 --- a/rust/schist_core/src/queries/categories/mod.rs +++ /dev/null @@ -1,13 +0,0 @@ -mod delete_all; -mod get_all; -mod get_all_balances; -mod get_all_ids; -mod get_most_recent_budget_per_category_id; -mod insert; - -pub use delete_all::delete_all_categories; -pub use get_all::get_all_categories; -pub use get_all_balances::get_all_category_balances; -pub use get_all_ids::get_all_category_ids; -pub use get_most_recent_budget_per_category_id::get_most_recent_category_budget_per_category_id; -pub use insert::insert_categories; diff --git a/rust/schist_core/src/queries/category_transfers/delete_all.rs b/rust/schist_core/src/queries/category_transfers/delete_all.rs deleted file mode 100644 index 406b80b..0000000 --- a/rust/schist_core/src/queries/category_transfers/delete_all.rs +++ /dev/null @@ -1,7 +0,0 @@ -use diesel::{result::Error, RunQueryDsl, SqliteConnection}; - -use crate::schema::category_transfers::dsl::category_transfers; - -pub fn delete_all_category_transfers(connection: &mut SqliteConnection) -> Result<usize, Error> { - diesel::delete(category_transfers).execute(connection) -} diff --git a/rust/schist_core/src/queries/category_transfers/get_all.rs b/rust/schist_core/src/queries/category_transfers/get_all.rs deleted file mode 100644 index 73d7e10..0000000 --- a/rust/schist_core/src/queries/category_transfers/get_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::category_transfer::CategoryTransfer, schema::category_transfers::dsl::category_transfers as category_transfers_table}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_category_transfers(connection: &mut SqliteConnection) -> Result<Vec<CategoryTransfer>> { - let all_category_transfers = category_transfers_table - .select(CategoryTransfer::as_select()) - .load(connection) - .with_context(|| "failed to get all category transfers")?; - Ok(all_category_transfers) -} diff --git a/rust/schist_core/src/queries/category_transfers/insert.rs b/rust/schist_core/src/queries/category_transfers/insert.rs deleted file mode 100644 index e1db167..0000000 --- a/rust/schist_core/src/queries/category_transfers/insert.rs +++ /dev/null @@ -1,15 +0,0 @@ -use crate::{ - models::category_transfer::CategoryTransfer, - schema::category_transfers::dsl::category_transfers as category_transfers_table, -}; -use diesel::prelude::*; -use diesel::result::Error; - -pub fn insert_category_transfers( - category_transfers: &[CategoryTransfer], - connection: &mut SqliteConnection, -) -> Result<usize, Error> { - diesel::insert_into(category_transfers_table) - .values(category_transfers) - .execute(connection) -} diff --git a/rust/schist_core/src/queries/category_transfers/mod.rs b/rust/schist_core/src/queries/category_transfers/mod.rs deleted file mode 100644 index eed7946..0000000 --- a/rust/schist_core/src/queries/category_transfers/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod delete_all; -mod get_all; -mod insert; -mod sum_quantity_per_from_category_id; -mod sum_quantity_per_to_category_id; - -pub use delete_all::delete_all_category_transfers; -pub use get_all::get_all_category_transfers; -pub use insert::insert_category_transfers; -pub use sum_quantity_per_from_category_id::sum_category_transfer_quantity_per_from_category_id; -pub use sum_quantity_per_to_category_id::sum_category_transfer_quantity_per_to_category_id; diff --git a/rust/schist_core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs b/rust/schist_core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs deleted file mode 100644 index a9c2a8c..0000000 --- a/rust/schist_core/src/queries/category_transfers/sum_quantity_per_from_category_id.rs +++ /dev/null @@ -1,18 +0,0 @@ -use crate::schema::category_transfers::{ - self as category_transfers_schema, - dsl::category_transfers as category_transfers_table, -}; -use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; - -pub fn sum_category_transfer_quantity_per_from_category_id( - connection: &mut SqliteConnection, -) -> Result<Vec<(i32, i64)>, Error> { - category_transfers_table - .group_by(category_transfers_schema::from_category_id) - .select(( - category_transfers_schema::from_category_id, - sum(category_transfers_schema::quantity), - )) - .load::<(i32, Option<i64>)>(connection) - .map(|result| result.iter().map(|sum| (sum.0, sum.1.unwrap_or(0))).collect()) -} diff --git a/rust/schist_core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs b/rust/schist_core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs deleted file mode 100644 index f041477..0000000 --- a/rust/schist_core/src/queries/category_transfers/sum_quantity_per_to_category_id.rs +++ /dev/null @@ -1,18 +0,0 @@ -use crate::schema::category_transfers::{ - self as category_transfers_schema, - dsl::category_transfers as category_transfers_table, -}; -use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; - -pub fn sum_category_transfer_quantity_per_to_category_id( - connection: &mut SqliteConnection, -) -> Result<Vec<(i32, i64)>, Error> { - category_transfers_table - .group_by(category_transfers_schema::to_category_id) - .select(( - category_transfers_schema::to_category_id, - sum(category_transfers_schema::quantity), - )) - .load::<(i32, Option<i64>)>(connection) - .map(|vec| vec.iter().map(|(id, sum)| (*id, sum.unwrap_or(0))).collect()) -} diff --git a/rust/schist_core/src/queries/transaction_categorisations/delete_all.rs b/rust/schist_core/src/queries/transaction_categorisations/delete_all.rs deleted file mode 100644 index e80a0ca..0000000 --- a/rust/schist_core/src/queries/transaction_categorisations/delete_all.rs +++ /dev/null @@ -1,7 +0,0 @@ -use diesel::{result::Error, RunQueryDsl, SqliteConnection}; - -use crate::schema::transaction_categorisations::dsl::transaction_categorisations; - -pub fn delete_all_transaction_categorisations(connection: &mut SqliteConnection) -> Result<usize, Error> { - diesel::delete(transaction_categorisations).execute(connection) -} diff --git a/rust/schist_core/src/queries/transaction_categorisations/get_all.rs b/rust/schist_core/src/queries/transaction_categorisations/get_all.rs deleted file mode 100644 index 0cacfe6..0000000 --- a/rust/schist_core/src/queries/transaction_categorisations/get_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::transaction_categorisation::TransactionCategorisation, schema::transaction_categorisations::dsl::transaction_categorisations as transaction_categorisations_table}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_transaction_categorisations(connection: &mut SqliteConnection) -> Result<Vec<TransactionCategorisation>> { - let all_transaction_categorisations = transaction_categorisations_table - .select(TransactionCategorisation::as_select()) - .load(connection) - .with_context(|| "failed to get all transaction categorisations")?; - Ok(all_transaction_categorisations) -} diff --git a/rust/schist_core/src/queries/transaction_categorisations/insert.rs b/rust/schist_core/src/queries/transaction_categorisations/insert.rs deleted file mode 100644 index 3da1c33..0000000 --- a/rust/schist_core/src/queries/transaction_categorisations/insert.rs +++ /dev/null @@ -1,15 +0,0 @@ -use crate::{ - models::transaction_categorisation::TransactionCategorisation, - schema::transaction_categorisations::dsl::transaction_categorisations as transaction_categorisations_table, -}; -use diesel::prelude::*; -use diesel::result::Error; - -pub fn insert_transaction_categorisations( - transaction_categorisations: &[TransactionCategorisation], - connection: &mut SqliteConnection, -) -> Result<usize, Error> { - diesel::insert_into(transaction_categorisations_table) - .values(transaction_categorisations) - .execute(connection) -} diff --git a/rust/schist_core/src/queries/transaction_categorisations/mod.rs b/rust/schist_core/src/queries/transaction_categorisations/mod.rs deleted file mode 100644 index d383791..0000000 --- a/rust/schist_core/src/queries/transaction_categorisations/mod.rs +++ /dev/null @@ -1,9 +0,0 @@ -mod delete_all; -mod get_all; -mod insert; -mod sum_quantity_per_category_id; - -pub use delete_all::delete_all_transaction_categorisations; -pub use get_all::get_all_transaction_categorisations; -pub use insert::insert_transaction_categorisations; -pub use sum_quantity_per_category_id::sum_transaction_categorisation_quantity_per_category_id; diff --git a/rust/schist_core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs b/rust/schist_core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs deleted file mode 100644 index 61f3492..0000000 --- a/rust/schist_core/src/queries/transaction_categorisations/sum_quantity_per_category_id.rs +++ /dev/null @@ -1,18 +0,0 @@ -use crate::schema::transaction_categorisations::{ - self as transaction_categorisations_schema, - dsl::transaction_categorisations as transaction_categorisations_table, -}; -use diesel::{dsl::sum, result::Error, QueryDsl, RunQueryDsl, SqliteConnection}; - -pub fn sum_transaction_categorisation_quantity_per_category_id( - connection: &mut SqliteConnection, -) -> Result<Vec<(i32, i64)>, Error> { - transaction_categorisations_table - .group_by(transaction_categorisations_schema::category_id) - .select(( - transaction_categorisations_schema::category_id, - sum(transaction_categorisations_schema::quantity), - )) - .load::<(i32, Option<i64>)>(connection) - .map(|vec| vec.iter().map(|(category_id, sum)| (*category_id, sum.unwrap_or(0))).collect()) -} diff --git a/rust/schist_core/src/queries/transactions/delete_all.rs b/rust/schist_core/src/queries/transactions/delete_all.rs deleted file mode 100644 index 43b7976..0000000 --- a/rust/schist_core/src/queries/transactions/delete_all.rs +++ /dev/null @@ -1,7 +0,0 @@ -use diesel::{result::Error, RunQueryDsl, SqliteConnection}; - -use crate::schema::transactions::dsl::transactions; - -pub fn delete_all_transactions(connection: &mut SqliteConnection) -> Result<usize, Error> { - diesel::delete(transactions).execute(connection) -} diff --git a/rust/schist_core/src/queries/transactions/get_all.rs b/rust/schist_core/src/queries/transactions/get_all.rs deleted file mode 100644 index afb87f4..0000000 --- a/rust/schist_core/src/queries/transactions/get_all.rs +++ /dev/null @@ -1,11 +0,0 @@ -use anyhow::{Context, Result}; -use crate::{models::transaction::Transaction, schema::transactions::dsl::transactions as transactions_table}; -use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; - -pub fn get_all_transactions(connection: &mut SqliteConnection) -> Result<Vec<Transaction>> { - let all_transactions = transactions_table - .select(Transaction::as_select()) - .load(connection) - .with_context(|| "failed to get all category transfers")?; - Ok(all_transactions) -} diff --git a/rust/schist_core/src/queries/transactions/insert.rs b/rust/schist_core/src/queries/transactions/insert.rs deleted file mode 100644 index 32f3dc2..0000000 --- a/rust/schist_core/src/queries/transactions/insert.rs +++ /dev/null @@ -1,15 +0,0 @@ -use crate::{ - models::transaction::Transaction, - schema::transactions::dsl::transactions as transactions_table, -}; -use diesel::prelude::*; -use diesel::result::Error; - -pub fn insert_transactions( - transactions: &[Transaction], - connection: &mut SqliteConnection, -) -> Result<usize, Error> { - diesel::insert_into(transactions_table) - .values(transactions) - .execute(connection) -} diff --git a/rust/schist_core/src/queries/transactions/mod.rs b/rust/schist_core/src/queries/transactions/mod.rs deleted file mode 100644 index 983e9af..0000000 --- a/rust/schist_core/src/queries/transactions/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -mod delete_all; -mod get_all; -mod insert; - -pub use delete_all::delete_all_transactions; -pub use get_all::get_all_transactions; -pub use insert::insert_transactions; diff --git a/rust/schist_core/tests/main.rs b/rust/schist_core/tests/main.rs deleted file mode 100644 index 27409b6..0000000 --- a/rust/schist_core/tests/main.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub mod common; - -mod models; -mod queries; diff --git a/rust/schist_core/tests/models/mod.rs b/rust/schist_core/tests/models/mod.rs deleted file mode 100644 index d0d0e4a..0000000 --- a/rust/schist_core/tests/models/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -mod date_utc; -mod datetime_utc; diff --git a/rust/schist_core/tests/queries/mod.rs b/rust/schist_core/tests/queries/mod.rs deleted file mode 100644 index e421934..0000000 --- a/rust/schist_core/tests/queries/mod.rs +++ /dev/null @@ -1,6 +0,0 @@ -mod account; -mod budget_updates; -mod categories; -mod category_transfers; -mod transaction_categorisations; -mod transactions; diff --git a/rust/schist_fakes/Cargo.toml b/rust/schist_fakes/Cargo.toml new file mode 100644 index 0000000..c69a28e --- /dev/null +++ b/rust/schist_fakes/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "schist_fakes" +version = "0.1.0" +edition = "2021" + +[dependencies] +schist_models = { path = "../schist_models" } +schist_traits = { path = "../schist_traits" } diff --git a/rust/schist_core/tests/common/fakes/account.rs b/rust/schist_fakes/src/account.rs index 0a1f8fe..1cee16e 100644 --- a/rust/schist_core/tests/common/fakes/account.rs +++ b/rust/schist_fakes/src/account.rs @@ -1,4 +1,5 @@ -use schist_core::{models::{account::Account, datetime_utc::DatetimeUtc}, traits::nowlike::Nowlike}; +use schist_models::{account::Account, datetime_utc::DatetimeUtc}; +use schist_traits::nowlike::Nowlike; pub fn make_fake_account(id: i32) -> Account { Account { diff --git a/rust/schist_core/tests/common/fakes/budget_update.rs b/rust/schist_fakes/src/budget_update.rs index a690288..2c8ba34 100644 --- a/rust/schist_core/tests/common/fakes/budget_update.rs +++ b/rust/schist_fakes/src/budget_update.rs @@ -1,4 +1,5 @@ -use schist_core::{models::{budget_update::{BudgetUpdate, BudgetUpdateBuilder}, date_utc::DateUtc}, traits::nowlike::Nowlike}; +use schist_models::{budget_update::{BudgetUpdate, BudgetUpdateBuilder}, date_utc::DateUtc}; +use schist_traits::nowlike::Nowlike; pub fn make_fake_budget_update(id: i32) -> BudgetUpdate { make_fake_budget_update_builder(id).build().unwrap() diff --git a/rust/schist_core/tests/common/fakes/category.rs b/rust/schist_fakes/src/category.rs index 6f0e357..39fddc7 100644 --- a/rust/schist_core/tests/common/fakes/category.rs +++ b/rust/schist_fakes/src/category.rs @@ -1,4 +1,4 @@ -use schist_core::models::category::{Category, CategoryBuilder}; +use schist_models::category::{Category, CategoryBuilder}; pub fn make_fake_category(id: i32) -> Category { make_fake_category_builder(id).build().unwrap() diff --git a/rust/schist_core/tests/common/fakes/category_transfer.rs b/rust/schist_fakes/src/category_transfer.rs index 3c66d6f..c28dffb 100644 --- a/rust/schist_core/tests/common/fakes/category_transfer.rs +++ b/rust/schist_fakes/src/category_transfer.rs @@ -1,4 +1,4 @@ -use schist_core::models::category_transfer::{CategoryTransfer, CategoryTransferBuilder}; +use schist_models::category_transfer::{CategoryTransfer, CategoryTransferBuilder}; pub fn make_fake_category_transfer(id: i32) -> CategoryTransfer { make_fake_category_transfer_builder(id).build().unwrap() diff --git a/rust/schist_core/tests/common/fakes/mod.rs b/rust/schist_fakes/src/lib.rs index 68f5209..68f5209 100644 --- a/rust/schist_core/tests/common/fakes/mod.rs +++ b/rust/schist_fakes/src/lib.rs diff --git a/rust/schist_core/tests/common/fakes/transaction.rs b/rust/schist_fakes/src/transaction.rs index 308b121..e65f478 100644 --- a/rust/schist_core/tests/common/fakes/transaction.rs +++ b/rust/schist_fakes/src/transaction.rs @@ -1,4 +1,5 @@ -use schist_core::{models::{datetime_utc::DatetimeUtc, transaction::{Transaction, TransactionBuilder}}, traits::nowlike::Nowlike}; +use schist_models::{datetime_utc::DatetimeUtc, transaction::{Transaction, TransactionBuilder}}; +use schist_traits::nowlike::Nowlike; pub fn make_fake_transaction(id: i32) -> Transaction { make_fake_transaction_builder(id).build().unwrap() diff --git a/rust/schist_core/tests/common/fakes/transaction_categorisation.rs b/rust/schist_fakes/src/transaction_categorisation.rs index dee34c1..ce9460c 100644 --- a/rust/schist_core/tests/common/fakes/transaction_categorisation.rs +++ b/rust/schist_fakes/src/transaction_categorisation.rs @@ -1,4 +1,4 @@ -use schist_core::models::transaction_categorisation::{TransactionCategorisation, TransactionCategorisationBuilder}; +use schist_models::transaction_categorisation::{TransactionCategorisation, TransactionCategorisationBuilder}; pub fn make_fake_transaction_categorisation(id: i32) -> TransactionCategorisation { make_fake_transaction_categorisation_builder(id).build().unwrap() diff --git a/rust/schist_models/Cargo.toml b/rust/schist_models/Cargo.toml new file mode 100644 index 0000000..6be4e21 --- /dev/null +++ b/rust/schist_models/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "schist_models" +version = "0.1.0" +edition = "2021" + +[dependencies] +anyhow = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +derive_builder = { workspace = true } +diesel = { workspace = true, features = ["sqlite"] } +diesel_migrations = { workspace = true } +schist_traits = { path = "../schist_traits" } +serde = { workspace = true, features = ["derive"] } + +[dev-dependencies] +schist_queries = { path = "../schist_queries" } diff --git a/rust/schist_core/migrations/2024-08-31-084439_initial_setup/down.sql b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql index 8cf4b1e..8cf4b1e 100644 --- a/rust/schist_core/migrations/2024-08-31-084439_initial_setup/down.sql +++ b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/down.sql diff --git a/rust/schist_core/migrations/2024-08-31-084439_initial_setup/up.sql b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql index 9038b54..9038b54 100644 --- a/rust/schist_core/migrations/2024-08-31-084439_initial_setup/up.sql +++ b/rust/schist_models/migrations/2024-08-31-084439_initial_setup/up.sql diff --git a/rust/schist_core/src/models/account.rs b/rust/schist_models/src/account.rs index 2df43e1..43400a3 100644 --- a/rust/schist_core/src/models/account.rs +++ b/rust/schist_models/src/account.rs @@ -1,7 +1,7 @@ use diesel::prelude::*; use serde::{Deserialize, Serialize}; -use crate::models::datetime_utc::DatetimeUtc; +use crate::datetime_utc::DatetimeUtc; #[derive( Insertable, Queryable, Identifiable, Selectable, Debug, PartialEq, Clone, Serialize, Deserialize, diff --git a/rust/schist_core/src/models/budget.rs b/rust/schist_models/src/budget.rs index e6fb4c9..03261e5 100644 --- a/rust/schist_core/src/models/budget.rs +++ b/rust/schist_models/src/budget.rs @@ -19,7 +19,8 @@ impl From<&BudgetUpdate> for Budget { #[cfg(test)] mod test { - use crate::{models::date_utc::DateUtc, traits::nowlike::Nowlike}; + use crate::date_utc::DateUtc; + use schist_traits::nowlike::Nowlike; use super::*; diff --git a/rust/schist_core/src/models/budget_update.rs b/rust/schist_models/src/budget_update.rs index c7221b1..86645cb 100644 --- a/rust/schist_core/src/models/budget_update.rs +++ b/rust/schist_models/src/budget_update.rs @@ -2,7 +2,7 @@ use derive_builder::Builder; use diesel::prelude::*; use serde::Serialize; -use crate::models::{category::Category, date_utc::DateUtc}; +use crate::{category::Category, date_utc::DateUtc}; #[derive(Builder, Clone, Serialize, Queryable, Identifiable, Selectable, Associations, Debug, PartialEq, Eq, Insertable)] #[diesel(table_name = crate::schema::budget_updates)] diff --git a/rust/schist_core/src/models/category.rs b/rust/schist_models/src/category.rs index 55c7b97..55c7b97 100644 --- a/rust/schist_core/src/models/category.rs +++ b/rust/schist_models/src/category.rs diff --git a/rust/schist_core/src/models/category_balance.rs b/rust/schist_models/src/category_balance.rs index 796b40b..796b40b 100644 --- a/rust/schist_core/src/models/category_balance.rs +++ b/rust/schist_models/src/category_balance.rs diff --git a/rust/schist_core/src/models/category_budget.rs b/rust/schist_models/src/category_budget.rs index 9796261..9796261 100644 --- a/rust/schist_core/src/models/category_budget.rs +++ b/rust/schist_models/src/category_budget.rs diff --git a/rust/schist_core/src/models/category_transfer.rs b/rust/schist_models/src/category_transfer.rs index 7b36054..7b36054 100644 --- a/rust/schist_core/src/models/category_transfer.rs +++ b/rust/schist_models/src/category_transfer.rs diff --git a/rust/schist_core/src/models/date_utc.rs b/rust/schist_models/src/date_utc.rs index 55d9e3f..3f5391c 100644 --- a/rust/schist_core/src/models/date_utc.rs +++ b/rust/schist_models/src/date_utc.rs @@ -12,9 +12,9 @@ use diesel::{ }; use serde::{Deserialize, Serialize}; -use crate::traits::{dateable::Dateable, nowlike::Nowlike}; +use schist_traits::{dateable::Dateable, nowlike::Nowlike}; -use super::datetime_utc::DatetimeUtc; +use crate::datetime_utc::DatetimeUtc; #[derive( Eq, @@ -171,7 +171,7 @@ impl FromSql<Text, Sqlite> for DateUtc { #[cfg(test)] mod test { - use crate::traits::timeable::Timeable; + use schist_traits::timeable::Timeable; use super::*; diff --git a/rust/schist_core/src/models/datetime_utc.rs b/rust/schist_models/src/datetime_utc.rs index 98d1d6c..9b63145 100644 --- a/rust/schist_core/src/models/datetime_utc.rs +++ b/rust/schist_models/src/datetime_utc.rs @@ -12,7 +12,7 @@ use diesel::{ }; use serde::{Deserialize, Serialize}; -use crate::traits::{dateable::Dateable, nowlike::Nowlike, timeable::Timeable}; +use schist_traits::{dateable::Dateable, nowlike::Nowlike, timeable::Timeable}; #[derive( PartialEq, diff --git a/rust/schist_core/src/models/mod.rs b/rust/schist_models/src/lib.rs index 2eb7ac2..9e60e80 100644 --- a/rust/schist_core/src/models/mod.rs +++ b/rust/schist_models/src/lib.rs @@ -7,5 +7,7 @@ pub mod category_budget; pub mod category_transfer; pub mod date_utc; pub mod datetime_utc; +pub mod migrations; pub mod transaction; pub mod transaction_categorisation; +pub mod schema; diff --git a/rust/schist_core/src/lib.rs b/rust/schist_models/src/migrations.rs index fd56999..d10cb83 100644 --- a/rust/schist_core/src/lib.rs +++ b/rust/schist_models/src/migrations.rs @@ -1,10 +1,3 @@ use diesel_migrations::{embed_migrations, EmbeddedMigrations}; -pub mod models; -pub mod queries; -pub mod schema; -pub mod traits; - -mod utils; - pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations"); diff --git a/rust/schist_core/src/schema.rs b/rust/schist_models/src/schema.rs index 372f8f3..372f8f3 100644 --- a/rust/schist_core/src/schema.rs +++ b/rust/schist_models/src/schema.rs diff --git a/rust/schist_core/src/models/transaction.rs b/rust/schist_models/src/transaction.rs index 18a4c0e..eb9e816 100644 --- a/rust/schist_core/src/models/transaction.rs +++ b/rust/schist_models/src/transaction.rs @@ -1,9 +1,7 @@ use derive_builder::Builder; use diesel::prelude::*; -use crate::models::account::Account; - -use super::datetime_utc::DatetimeUtc; +use crate::{account::Account, datetime_utc::DatetimeUtc}; #[derive(Builder, Queryable, Identifiable, Selectable, Insertable, Associations, Debug, PartialEq)] #[diesel(table_name = crate::schema::transactions)] diff --git a/rust/schist_core/src/models/transaction_categorisation.rs b/rust/schist_models/src/transaction_categorisation.rs index c6ac6ea..c6ac6ea 100644 --- a/rust/schist_core/src/models/transaction_categorisation.rs +++ b/rust/schist_models/src/transaction_categorisation.rs diff --git a/rust/schist_core/tests/common/mod.rs b/rust/schist_models/tests/common/mod.rs index 6681d3d..5ff67da 100644 --- a/rust/schist_core/tests/common/mod.rs +++ b/rust/schist_models/tests/common/mod.rs @@ -1,2 +1 @@ -pub mod fakes; pub mod test_context; diff --git a/rust/schist_core/tests/common/test_context.rs b/rust/schist_models/tests/common/test_context.rs index 5dcaebc..fb4112d 100644 --- a/rust/schist_core/tests/common/test_context.rs +++ b/rust/schist_models/tests/common/test_context.rs @@ -1,8 +1,9 @@ use std::sync::atomic::{AtomicU64, Ordering}; -use schist_core::{queries::clear::clear, MIGRATIONS}; use diesel::{Connection, SqliteConnection}; use diesel_migrations::MigrationHarness; +use schist_queries::clear::clear; +use schist_models::migrations::MIGRATIONS; pub struct TestContext { pub db_url: String, diff --git a/rust/schist_core/tests/models/date_utc.rs b/rust/schist_models/tests/date_utc.rs index d379a05..c5ad82e 100644 --- a/rust/schist_core/tests/models/date_utc.rs +++ b/rust/schist_models/tests/date_utc.rs @@ -1,10 +1,11 @@ +mod common; + use anyhow::Result; -use schist_core::models::date_utc::DateUtc; -use schist_core::traits::nowlike::Nowlike; +use common::test_context::TestContext; use diesel::{sql_query, Connection, ExpressionMethods, QueryDsl, RunQueryDsl, Selectable, SelectableHelper, SqliteConnection}; use diesel::prelude::{Insertable, Queryable}; - -use crate::common::test_context::TestContext; +use schist_models::date_utc::DateUtc; +use schist_traits::nowlike::Nowlike; diesel::table! { date_utc_test (id) { diff --git a/rust/schist_core/tests/models/datetime_utc.rs b/rust/schist_models/tests/datetime_utc.rs index 5bb51c0..27182ff 100644 --- a/rust/schist_core/tests/models/datetime_utc.rs +++ b/rust/schist_models/tests/datetime_utc.rs @@ -1,10 +1,12 @@ +mod common; + use anyhow::Result; -use schist_core::models::datetime_utc::DatetimeUtc; -use schist_core::traits::nowlike::Nowlike; +use common::test_context::TestContext; use diesel::{sql_query, Connection, ExpressionMethods, QueryDsl, RunQueryDsl, Selectable, SelectableHelper, SqliteConnection}; use diesel::prelude::{Insertable, Queryable}; +use schist_models::datetime_utc::DatetimeUtc; +use schist_traits::nowlike::Nowlike; -use crate::common::test_context::TestContext; diesel::table! { datetime_utc_test (id) { diff --git a/rust/schist_queries/Cargo.toml b/rust/schist_queries/Cargo.toml new file mode 100644 index 0000000..9822847 --- /dev/null +++ b/rust/schist_queries/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "schist_queries" +version = "0.1.0" +edition = "2021" + +[dependencies] +anyhow = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +diesel = { workspace = true, features = ["sqlite"] } +schist_models = { path = "../schist_models" } +schist_schema = { path = "../schist_schema" } +schist_traits = { path = "../schist_traits" } +serde = { workspace = true, features = ["derive"] } + +[dev-dependencies] +diesel_migrations = { workspace = true } +libsqlite3-sys = { workspace = true, features = ["bundled"] } +schist_fakes = { path = "../schist_fakes" } diff --git a/rust/schist_queries/src/accounts.rs b/rust/schist_queries/src/accounts.rs new file mode 100644 index 0000000..e8a4f53 --- /dev/null +++ b/rust/schist_queries/src/accounts.rs @@ -0,0 +1,41 @@ +use anyhow::{Context, Result}; +use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; + +use schist_models::account::Account; +use schist_schema::schema::accounts::dsl::accounts as accounts_table; + +pub fn delete_all_accounts(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(accounts_table) + .execute(connection) + .with_context(|| "failed to delete all accounts")?; + Ok(num_rows_deleted) +} + +pub fn get_all_accounts(connection: &mut SqliteConnection) -> Result<Vec<Account>> { + let all_accounts = accounts_table.select(Account::as_select()) + .load(connection) + .with_context(|| "failed to get all accounts")?; + Ok(all_accounts) +} + +pub fn insert_accounts( + accounts: &[Account], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_accounts_inserted = diesel::insert_into(accounts_table) + .values(accounts) + .execute(connection) + .with_context(|| insert_err_msg(accounts))?; + Ok(num_accounts_inserted) +} + +fn insert_err_msg(accounts: &[Account]) -> String { + format!( + "failed to insert accounts: [{}]", + accounts + .iter() + .map(|a| format!("\"{}\": \"{}\"", a.id, a.name)) + .collect::<Vec<String>>() + .join(", ") + ) +} diff --git a/rust/schist_queries/src/budget_updates.rs b/rust/schist_queries/src/budget_updates.rs new file mode 100644 index 0000000..07d4808 --- /dev/null +++ b/rust/schist_queries/src/budget_updates.rs @@ -0,0 +1,74 @@ +use anyhow::{Context, Result}; +use diesel::{dsl::max, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_models::{budget_update::BudgetUpdate, date_utc::DateUtc}; +use schist_schema::schema::budget_updates::{ + self as budget_updates_schema, dsl::budget_updates as budget_updates_table, +}; +use schist_traits::nowlike::Nowlike; + +pub fn delete_all_budget_updates(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(budget_updates_table) + .execute(connection) + .with_context(|| "failed to delete all budget updates")?; + Ok(num_rows_deleted) +} + +pub fn get_all_budget_updates( + connection: &mut SqliteConnection, +) -> Result<Vec<BudgetUpdate>> { + let all_budget_updates = budget_updates_table + .select(BudgetUpdate::as_select()) + .load::<BudgetUpdate>(connection) + .with_context(|| "failed to get all budget updates")?; + Ok(all_budget_updates) +} + +pub fn get_first_budget_update_with_date_and_category_id( + date: &DateUtc, + category_id: i32, + connection: &mut SqliteConnection, +) -> Result<Option<BudgetUpdate>> { + let first_budget_update = budget_updates_table + .select(BudgetUpdate::as_select()) + .filter(budget_updates_schema::date.eq(date.to_string())) + .filter(budget_updates_schema::category_id.eq(category_id)) + .first(connection) + .optional() + .with_context(|| format!("failed to get first budget update with date {}", date.to_string()))?; + Ok(first_budget_update) +} + +pub fn get_most_recent_budget_update_date_with_category_id( + category_id: i32, + connection: &mut SqliteConnection, +) -> Result<Option<DateUtc>> { + let most_recent_date = budget_updates_table + .select(max(budget_updates_schema::date)) + .filter(budget_updates_schema::category_id.eq(category_id)) + .filter(budget_updates_schema::date.le(DateUtc::now())) + .first(connection) + .with_context(|| format!("failed to get most recent budget update date with category ID {}", category_id))?; + Ok(most_recent_date) +} + +pub fn insert_budget_updates( + budget_updates: &[BudgetUpdate], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_rows_inserted = diesel::insert_into(budget_updates_table) + .values(budget_updates) + .execute(connection) + .with_context(|| insert_err_msg(budget_updates))?; + Ok(num_rows_inserted) +} + +fn insert_err_msg(budget_updates: &[BudgetUpdate]) -> String { + format!( + "failed to insert budget updates: [{}]", + budget_updates + .iter() + .map(|a| a.id.to_string()) + .collect::<Vec<String>>() + .join(", ") + ) +} diff --git a/rust/schist_queries/src/categories.rs b/rust/schist_queries/src/categories.rs new file mode 100644 index 0000000..f54373c --- /dev/null +++ b/rust/schist_queries/src/categories.rs @@ -0,0 +1,155 @@ +use anyhow::{Context, Result}; +use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_models::{budget::Budget, category::Category, category_balance::CategoryBalance, category_budget::CategoryBudget, date_utc::DateUtc}; +use schist_schema::schema::categories::{self as categories_schema, dsl::categories as categories_table}; + +use crate::{ + budget_updates::{ + get_all_budget_updates, + get_first_budget_update_with_date_and_category_id, + get_most_recent_budget_update_date_with_category_id, + }, + category_transfers::{ + sum_category_transfer_quantity_per_from_category_id, + sum_category_transfer_quantity_per_to_category_id, + }, + transaction_categorisations::sum_transaction_categorisation_quantity_per_category_id, + utils::calculate_category_balance, +}; + +pub fn delete_all_categories(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(categories_table) + .execute(connection) + .with_context(|| "failed to delete all categories")?; + Ok(num_rows_deleted) +} + +pub fn get_all_categories(connection: &mut SqliteConnection) -> Result<Vec<Category>> { + let all_categories = categories_table + .select(Category::as_select()) + .load(connection) + .with_context(|| "failed to get all categories")?; + Ok(all_categories) +} + +pub fn get_all_category_balances( + connection: &mut SqliteConnection, +) -> Result<Vec<CategoryBalance>> { + get_all_category_balances_without_context(connection) + .with_context(|| "failed to get all category balances") +} + +fn get_all_category_balances_without_context( + connection: &mut SqliteConnection, +) -> Result<Vec<CategoryBalance>> { + let categories = get_all_categories(connection)?; + let transaction_sums = sum_transaction_categorisation_quantity_per_category_id(connection)?; + let category_transfer_from_sums = + sum_category_transfer_quantity_per_from_category_id(connection)?; + let category_transfer_to_sums = sum_category_transfer_quantity_per_to_category_id(connection)?; + let budget_updates = get_all_budget_updates(connection)?; + + let mut balances = Vec::<CategoryBalance>::new(); + for category in categories { + let balance = calculate_category_balance( + &category, + &transaction_sums, + &category_transfer_from_sums, + &category_transfer_to_sums, + &budget_updates, + )?; + + balances.push(CategoryBalance { + category_id: category.id, + balance: balance.try_into().unwrap(), + }) + } + + Ok(balances) +} + +pub fn get_all_category_ids(connection: &mut SqliteConnection) -> Result<Vec<i32>> { + let all_category_ids = categories_table + .select(categories_schema::id) + .load(connection) + .with_context(|| "failed to get all category IDs")?; + Ok(all_category_ids) +} + +pub fn get_most_recent_category_budget_per_category_id( + connection: &mut SqliteConnection, +) -> Result<Vec<CategoryBudget>> { + get_most_recent_category_budget_per_category_id_without_context(connection) + .with_context(|| "failed to get most recent category budget per category ID") +} + +fn get_most_recent_category_budget_per_category_id_without_context( + connection: &mut SqliteConnection, +) -> Result<Vec<CategoryBudget>> { + let category_ids: Vec<i32> = get_all_category_ids(connection)?; + + let mut budgets = Vec::<CategoryBudget>::new(); + for category_id in category_ids { + let most_recent_budget_update_date = + get_most_recent_budget_update_date_with_category_id(category_id, connection)?; + + budgets.push(match most_recent_budget_update_date { + None => CategoryBudget { + category_id, + budget: Option::None, + }, + Some(most_recent_budget_update_date) => + get_most_recent_category_budget_with_date_and_category_id( + &most_recent_budget_update_date, + category_id, + connection, + )?, + }) + } + + Ok(budgets) +} + +fn get_most_recent_category_budget_with_date_and_category_id( + most_recent_budget_update_date: &DateUtc, + category_id: i32, + connection: &mut SqliteConnection +) -> Result<CategoryBudget> { + let most_recent_budget_update = get_first_budget_update_with_date_and_category_id( + &most_recent_budget_update_date, + category_id, + connection, + )?; + + let budget = match most_recent_budget_update { + None => None, + Some(most_recent_budget_update) => Some(Budget::from(&most_recent_budget_update)), + }; + + Ok(CategoryBudget { + category_id, + budget, + }) +} + +pub fn insert_categories( + categories: &[Category], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_categories_inserted = diesel::insert_into(categories_table) + .values(categories) + .execute(connection) + .with_context(|| insert_err_msg(categories))?; + Ok(num_categories_inserted) +} + +fn insert_err_msg(categories: &[Category]) -> String { + format!( + "failed to insert categories: [{}]", + categories + .iter() + .map(|c| format!("\"{}\": \"{}\"", c.id, c.name)) + .collect::<Vec<String>>() + .join(", ") + ) +} diff --git a/rust/schist_queries/src/category_transfers.rs b/rust/schist_queries/src/category_transfers.rs new file mode 100644 index 0000000..33a53ea --- /dev/null +++ b/rust/schist_queries/src/category_transfers.rs @@ -0,0 +1,74 @@ +use anyhow::{Context, Result}; +use diesel::{dsl::sum, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_schema::schema::category_transfers::{ + self as category_transfers_schema, + dsl::category_transfers as category_transfers_table, +}; +use schist_models::category_transfer::CategoryTransfer; + +pub fn delete_all_category_transfers(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(category_transfers_table) + .execute(connection) + .with_context(|| "failed to delete all category transfers")?; + Ok(num_rows_deleted) +} + +pub fn get_all_category_transfers(connection: &mut SqliteConnection) -> Result<Vec<CategoryTransfer>> { + let all_category_transfers = category_transfers_table + .select(CategoryTransfer::as_select()) + .load(connection) + .with_context(|| "failed to get all category transfers")?; + Ok(all_category_transfers) +} + +pub fn insert_category_transfers( + category_transfers: &[CategoryTransfer], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_rows_inserted = diesel::insert_into(category_transfers_table) + .values(category_transfers) + .execute(connection) + .with_context(|| insert_err_msg(&category_transfers))?; + Ok(num_rows_inserted) +} + +fn insert_err_msg(category_transfers: &[CategoryTransfer]) -> String { + format!( + "failed to insert category transfers: [{}]", + category_transfers + .iter() + .map(|ct| ct.id.to_string()) + .collect::<Vec<String>>() + .join(", ") + ) +} + +pub fn sum_category_transfer_quantity_per_from_category_id( + connection: &mut SqliteConnection, +) -> Result<Vec<(i32, i64)>> { + let sum = category_transfers_table + .group_by(category_transfers_schema::from_category_id) + .select(( + category_transfers_schema::from_category_id, + sum(category_transfers_schema::quantity), + )) + .load::<(i32, Option<i64>)>(connection) + .map(|result| result.iter().map(|sum| (sum.0, sum.1.unwrap_or(0))).collect()) + .with_context(|| "failed to sum category transfer quantity per from category ID")?; + Ok(sum) +} + +pub fn sum_category_transfer_quantity_per_to_category_id( + connection: &mut SqliteConnection, +) -> Result<Vec<(i32, i64)>> { + let sum = category_transfers_table + .group_by(category_transfers_schema::to_category_id) + .select(( + category_transfers_schema::to_category_id, + sum(category_transfers_schema::quantity), + )) + .load::<(i32, Option<i64>)>(connection) + .map(|vec| vec.iter().map(|(id, sum)| (*id, sum.unwrap_or(0))).collect()) + .with_context(|| "failed to sum category transfer quantity per to category ID")?; + Ok(sum) +} diff --git a/rust/schist_core/src/queries/clear.rs b/rust/schist_queries/src/clear.rs index e704634..c823bcc 100644 --- a/rust/schist_core/src/queries/clear.rs +++ b/rust/schist_queries/src/clear.rs @@ -1,5 +1,7 @@ use anyhow::Result; -use crate::queries::{ +use diesel::SqliteConnection; + +use crate::{ accounts::delete_all_accounts, budget_updates::delete_all_budget_updates, categories::delete_all_categories, @@ -7,7 +9,6 @@ use crate::queries::{ transactions::delete_all_transactions, transaction_categorisations::delete_all_transaction_categorisations, }; -use diesel::SqliteConnection; pub fn clear(connection: &mut SqliteConnection) -> Result<()> { delete_all_accounts(connection)?; diff --git a/rust/schist_core/src/queries/mod.rs b/rust/schist_queries/src/lib.rs index f0852ce..3cae464 100644 --- a/rust/schist_core/src/queries/mod.rs +++ b/rust/schist_queries/src/lib.rs @@ -5,3 +5,5 @@ pub mod category_transfers; pub mod clear; pub mod transactions; pub mod transaction_categorisations; + +mod utils; diff --git a/rust/schist_queries/src/transaction_categorisations.rs b/rust/schist_queries/src/transaction_categorisations.rs new file mode 100644 index 0000000..320782d --- /dev/null +++ b/rust/schist_queries/src/transaction_categorisations.rs @@ -0,0 +1,59 @@ +use anyhow::{Context, Result}; +use diesel::{dsl::sum, QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_models::transaction_categorisation::TransactionCategorisation; +use schist_schema::schema::transaction_categorisations::{ + self as transaction_categorisations_schema, + dsl::transaction_categorisations as transaction_categorisations_table, +}; + +pub fn delete_all_transaction_categorisations(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(transaction_categorisations_table) + .execute(connection) + .with_context(|| "failed to delete all transaction categorisations")?; + Ok(num_rows_deleted) +} + +pub fn get_all_transaction_categorisations(connection: &mut SqliteConnection) -> Result<Vec<TransactionCategorisation>> { + let all_transaction_categorisations = transaction_categorisations_table + .select(TransactionCategorisation::as_select()) + .load(connection) + .with_context(|| "failed to get all transaction categorisations")?; + Ok(all_transaction_categorisations) +} + +pub fn insert_transaction_categorisations( + transaction_categorisations: &[TransactionCategorisation], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_rows_inserted = diesel::insert_into(transaction_categorisations_table) + .values(transaction_categorisations) + .execute(connection) + .with_context(|| insert_err_msg(&transaction_categorisations))?; + Ok(num_rows_inserted) +} + +fn insert_err_msg(transaction_categorisations: &[TransactionCategorisation]) -> String { + format!( + "failed to insert transaction categorisations: [{}]", + transaction_categorisations + .iter() + .map(|tc| tc.id.to_string()) + .collect::<Vec<String>>() + .join(", ") + ) +} + +pub fn sum_transaction_categorisation_quantity_per_category_id( + connection: &mut SqliteConnection, +) -> Result<Vec<(i32, i64)>> { + let sum = transaction_categorisations_table + .group_by(transaction_categorisations_schema::category_id) + .select(( + transaction_categorisations_schema::category_id, + sum(transaction_categorisations_schema::quantity), + )) + .load::<(i32, Option<i64>)>(connection) + .map(|vec| vec.iter().map(|(category_id, sum)| (*category_id, sum.unwrap_or(0))).collect()) + .with_context(|| "failed to sum transaction categorisation quantity per category ID")?; + Ok(sum) +} diff --git a/rust/schist_queries/src/transactions.rs b/rust/schist_queries/src/transactions.rs new file mode 100644 index 0000000..70b14e7 --- /dev/null +++ b/rust/schist_queries/src/transactions.rs @@ -0,0 +1,41 @@ +use anyhow::{Context, Result}; +use diesel::{QueryDsl, RunQueryDsl, SelectableHelper, SqliteConnection}; +use schist_models::transaction::Transaction; +use schist_schema::schema::transactions::dsl::transactions as transactions_table; + +pub fn delete_all_transactions(connection: &mut SqliteConnection) -> Result<usize> { + let num_rows_deleted = diesel::delete(transactions_table) + .execute(connection) + .with_context(|| "failed to delete all transactions")?; + Ok(num_rows_deleted) +} + +pub fn get_all_transactions(connection: &mut SqliteConnection) -> Result<Vec<Transaction>> { + let all_transactions = transactions_table + .select(Transaction::as_select()) + .load(connection) + .with_context(|| "failed to get all category transfers")?; + Ok(all_transactions) +} + +pub fn insert_transactions( + transactions: &[Transaction], + connection: &mut SqliteConnection, +) -> Result<usize> { + let num_rows_inserted = diesel::insert_into(transactions_table) + .values(transactions) + .execute(connection) + .with_context(|| insert_err_msg(&transactions))?; + Ok(num_rows_inserted) +} + +fn insert_err_msg(transactions: &[Transaction]) -> String { + format!( + "failed to insert transactions: [{}]", + transactions + .iter() + .map(|t| t.id.to_string()) + .collect::<Vec<String>>() + .join(", ") + ) +} diff --git a/rust/schist_core/src/utils/calculate_budgets_accrual.rs b/rust/schist_queries/src/utils/calculate_budgets_accrual.rs index 56171ca..1d4ed02 100644 --- a/rust/schist_core/src/utils/calculate_budgets_accrual.rs +++ b/rust/schist_queries/src/utils/calculate_budgets_accrual.rs @@ -1,7 +1,8 @@ use anyhow::Result; -use crate::{models::{ - budget_update::BudgetUpdate, category::Category, date_utc::DateUtc -}, traits::nowlike::Nowlike}; +use schist_models::{ + budget_update::BudgetUpdate, category::Category, date_utc::DateUtc, +}; +use schist_traits::nowlike::Nowlike; pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUpdate]) -> Result<i64> { let mut budget_updates = budget_updates @@ -33,10 +34,10 @@ pub fn calculate_budgets_accrual(category: &Category, budget_updates: &[BudgetUp #[cfg(test)] mod test { use chrono::{Days, Utc}; + use schist_models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}; + use schist_traits::nowlike::Nowlike; - use crate::{ - models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}, traits::nowlike::Nowlike, utils::calculate_budgets_accrual - }; + use super::calculate_budgets_accrual; #[test] fn when_no_budget_updates_then_return_zero() { diff --git a/rust/schist_core/src/utils/calculate_category_balance.rs b/rust/schist_queries/src/utils/calculate_category_balance.rs index 61b94a8..acb56fb 100644 --- a/rust/schist_core/src/utils/calculate_category_balance.rs +++ b/rust/schist_queries/src/utils/calculate_category_balance.rs @@ -1,8 +1,7 @@ use anyhow::Result; -use crate::{ - models::{budget_update::BudgetUpdate, category::Category}, - utils::{calculate_budgets_accrual, find_by_id_or}, -}; +use schist_models::{budget_update::BudgetUpdate, category::Category}; + +use super::{calculate_budgets_accrual::calculate_budgets_accrual, find_by_id_or::find_by_id_or}; pub fn calculate_category_balance( category: &Category, @@ -27,11 +26,9 @@ pub fn calculate_category_balance( #[cfg(test)] mod test { use chrono::{Days, Utc}; + use schist_models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}; - use crate::{ - models::{budget_update::BudgetUpdate, category::Category, date_utc::DateUtc}, - utils::calculate_category_balance - }; + use super::calculate_category_balance; #[test] fn when_no_data_then_returns_zero() { diff --git a/rust/schist_core/src/utils/find_by_id_or.rs b/rust/schist_queries/src/utils/find_by_id_or.rs index 8335e5c..8335e5c 100644 --- a/rust/schist_core/src/utils/find_by_id_or.rs +++ b/rust/schist_queries/src/utils/find_by_id_or.rs diff --git a/rust/schist_core/src/utils/mod.rs b/rust/schist_queries/src/utils/mod.rs index 84a27af..6949ce5 100644 --- a/rust/schist_core/src/utils/mod.rs +++ b/rust/schist_queries/src/utils/mod.rs @@ -2,6 +2,4 @@ mod calculate_budgets_accrual; mod calculate_category_balance; mod find_by_id_or; -pub use calculate_budgets_accrual::calculate_budgets_accrual; pub use calculate_category_balance::calculate_category_balance; -pub use find_by_id_or::find_by_id_or; diff --git a/rust/schist_core/tests/queries/account.rs b/rust/schist_queries/tests/account.rs index ce4269d..e3bb7db 100644 --- a/rust/schist_core/tests/queries/account.rs +++ b/rust/schist_queries/tests/account.rs @@ -1,7 +1,9 @@ -use schist_core::queries; -use diesel::{Connection, SqliteConnection}; +mod common; -use crate::common::{fakes::account::make_fake_account, test_context::TestContext}; +use common::test_context::TestContext; +use diesel::{Connection, SqliteConnection}; +use schist_fakes::account::make_fake_account; +use schist_queries as queries; #[test] fn when_insert_accounts_then_returns_num_accounts() { diff --git a/rust/schist_core/tests/queries/budget_updates.rs b/rust/schist_queries/tests/budget_updates.rs index b9d60e2..bd84128 100644 --- a/rust/schist_core/tests/queries/budget_updates.rs +++ b/rust/schist_queries/tests/budget_updates.rs @@ -1,7 +1,11 @@ -use schist_core::{models::{category::Category, date_utc::DateUtc}, queries, traits::nowlike::Nowlike}; -use diesel::{Connection, SqliteConnection}; +mod common; -use crate::common::{fakes::{budget_update::make_fake_budget_update_builder, category::make_fake_category}, test_context::TestContext}; +use common::test_context::TestContext; +use diesel::{Connection, SqliteConnection}; +use schist_fakes::{budget_update::make_fake_budget_update_builder, category::make_fake_category}; +use schist_models::{category::Category, date_utc::DateUtc}; +use schist_queries as queries; +use schist_traits::nowlike::Nowlike; fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> { let categories = vec![make_fake_category(0), make_fake_category(1)]; diff --git a/rust/schist_core/tests/queries/categories.rs b/rust/schist_queries/tests/categories.rs index 51bd8eb..74c395d 100644 --- a/rust/schist_core/tests/queries/categories.rs +++ b/rust/schist_queries/tests/categories.rs @@ -1,8 +1,25 @@ -use schist_core::{models::{account::Account, budget::Budget, budget_update::BudgetUpdate, category::Category, date_utc::DateUtc, transaction::Transaction, transaction_categorisation::TransactionCategorisation}, queries}; +mod common; + use chrono::{Days, Utc}; +use common::test_context::TestContext; use diesel::{Connection, SqliteConnection}; - -use crate::common::{fakes::{account::make_fake_account, budget_update::make_fake_budget_update_builder, category::make_fake_category, transaction::make_fake_transaction_builder, transaction_categorisation::make_fake_transaction_categorisation_builder}, test_context::TestContext}; +use schist_fakes::{ + account::make_fake_account, + budget_update::make_fake_budget_update_builder, + category::make_fake_category, + transaction::make_fake_transaction_builder, + transaction_categorisation::make_fake_transaction_categorisation_builder, +}; +use schist_models::{ + account::Account, + budget::Budget, + budget_update::BudgetUpdate, + category::Category, + date_utc::DateUtc, + transaction::Transaction, + transaction_categorisation::TransactionCategorisation, +}; +use schist_queries as queries; fn given_categories(connection: &mut SqliteConnection) -> Vec<Category> { let categories = vec![make_fake_category(0), make_fake_category(1)]; diff --git a/rust/schist_core/tests/queries/category_transfers.rs b/rust/schist_queries/tests/category_transfers.rs index c68d4dc..f37a668 100644 --- a/rust/schist_core/tests/queries/category_transfers.rs +++ b/rust/schist_queries/tests/category_transfers.rs @@ -1,7 +1,9 @@ -use schist_core::queries; -use diesel::{Connection, SqliteConnection}; +mod common; -use crate::common::{fakes::{category::make_fake_category, category_transfer::make_fake_category_transfer_builder}, test_context::TestContext}; +use common::test_context::TestContext; +use diesel::{Connection, SqliteConnection}; +use schist_fakes::{category::make_fake_category, category_transfer::make_fake_category_transfer_builder}; +use schist_queries as queries; #[test] fn when_insert_category_transfers_then_returns_num_category_transfers() { diff --git a/rust/schist_queries/tests/common/mod.rs b/rust/schist_queries/tests/common/mod.rs new file mode 100644 index 0000000..5ff67da --- /dev/null +++ b/rust/schist_queries/tests/common/mod.rs @@ -0,0 +1 @@ +pub mod test_context; diff --git a/rust/schist_queries/tests/common/test_context.rs b/rust/schist_queries/tests/common/test_context.rs new file mode 100644 index 0000000..183cd9b --- /dev/null +++ b/rust/schist_queries/tests/common/test_context.rs @@ -0,0 +1,44 @@ +use std::sync::atomic::{AtomicU64, Ordering}; + +use diesel::{Connection, SqliteConnection}; +use diesel_migrations::MigrationHarness; +use schist_models::migrations::MIGRATIONS; +use schist_queries::clear::clear; + +pub struct TestContext { + pub db_url: String, +} + +static ID_COUNTER: AtomicU64 = AtomicU64::new(0); + +impl TestContext { + pub fn new() -> Self { + let db_url = Self::next_id() + ".sqlite"; + + let connection = &mut SqliteConnection + ::establish(&db_url) + .expect("failed to connect to database"); + + connection + .run_pending_migrations(MIGRATIONS) + .expect("failed to run migrations"); + + clear(connection) + .expect("failed to clear database"); + + Self { + db_url, + } + } + + fn next_id() -> String { + ID_COUNTER.fetch_add(1, Ordering::Relaxed).to_string() + } +} + +impl Drop for TestContext { + fn drop(&mut self) { + std::fs::remove_file(&self.db_url) + .expect(format!("failed to delete database {}", self.db_url).as_str()); + } +} diff --git a/rust/schist_core/tests/queries/transaction_categorisations.rs b/rust/schist_queries/tests/transaction_categorisations.rs index a4bbf83..13864b4 100644 --- a/rust/schist_core/tests/queries/transaction_categorisations.rs +++ b/rust/schist_queries/tests/transaction_categorisations.rs @@ -1,7 +1,10 @@ -use schist_core::{models::{account::Account, category::Category, transaction::Transaction}, queries}; -use diesel::{Connection, SqliteConnection}; +mod common; -use crate::common::{fakes::{account::make_fake_account, category::make_fake_category, transaction::make_fake_transaction_builder, transaction_categorisation::make_fake_transaction_categorisation_builder}, test_context::TestContext}; +use common::test_context::TestContext; +use diesel::{Connection, SqliteConnection}; +use schist_fakes::{account::make_fake_account, category::make_fake_category, transaction::make_fake_transaction_builder, transaction_categorisation::make_fake_transaction_categorisation_builder}; +use schist_models::{account::Account, category::Category, transaction::Transaction}; +use schist_queries as queries; fn given_accounts(connection: &mut SqliteConnection) -> Vec<Account> { let accounts = vec![make_fake_account(0)]; diff --git a/rust/schist_core/tests/queries/transactions.rs b/rust/schist_queries/tests/transactions.rs index 4e284bc..5e57074 100644 --- a/rust/schist_core/tests/queries/transactions.rs +++ b/rust/schist_queries/tests/transactions.rs @@ -1,7 +1,9 @@ -use schist_core::queries; -use diesel::{Connection, SqliteConnection}; +mod common; -use crate::common::{fakes::{account::make_fake_account, transaction::make_fake_transaction_builder}, test_context::TestContext}; +use common::test_context::TestContext; +use diesel::{Connection, SqliteConnection}; +use schist_fakes::{account::make_fake_account, transaction::make_fake_transaction_builder}; +use schist_queries as queries; #[test] fn when_insert_transactions_then_returns_num_transactions() { diff --git a/rust/schist_schema/Cargo.toml b/rust/schist_schema/Cargo.toml new file mode 100644 index 0000000..0af3470 --- /dev/null +++ b/rust/schist_schema/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "schist_schema" +version = "0.1.0" +edition = "2021" + +[dependencies] +schist_models = { path = "../schist_models" } diff --git a/rust/schist_schema/src/lib.rs b/rust/schist_schema/src/lib.rs new file mode 100644 index 0000000..c60d7d4 --- /dev/null +++ b/rust/schist_schema/src/lib.rs @@ -0,0 +1,2 @@ +pub use schist_models::schema; +pub use schist_models::migrations; diff --git a/rust/schist_core/Cargo.toml b/rust/schist_traits/Cargo.toml index ba49014..6e07c59 100644 --- a/rust/schist_core/Cargo.toml +++ b/rust/schist_traits/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "schist_core" +name = "schist_traits" version = "0.1.0" edition = "2021" diff --git a/rust/schist_core/src/traits/dateable.rs b/rust/schist_traits/src/dateable.rs index 05f2d74..05f2d74 100644 --- a/rust/schist_core/src/traits/dateable.rs +++ b/rust/schist_traits/src/dateable.rs diff --git a/rust/schist_core/src/traits/mod.rs b/rust/schist_traits/src/lib.rs index ab5caca..ab5caca 100644 --- a/rust/schist_core/src/traits/mod.rs +++ b/rust/schist_traits/src/lib.rs diff --git a/rust/schist_core/src/traits/nowlike.rs b/rust/schist_traits/src/nowlike.rs index bae2309..bae2309 100644 --- a/rust/schist_core/src/traits/nowlike.rs +++ b/rust/schist_traits/src/nowlike.rs diff --git a/rust/schist_core/src/traits/timeable.rs b/rust/schist_traits/src/timeable.rs index f6f9244..f6f9244 100644 --- a/rust/schist_core/src/traits/timeable.rs +++ b/rust/schist_traits/src/timeable.rs |