diff --git a/.sqlx/query-0bbafa839181369d932fb1deae71e2255c30d24779d37a703dcd3521fbac35cf.json b/.sqlx/query-0bbafa839181369d932fb1deae71e2255c30d24779d37a703dcd3521fbac35cf.json new file mode 100644 index 0000000..a382cda --- /dev/null +++ b/.sqlx/query-0bbafa839181369d932fb1deae71e2255c30d24779d37a703dcd3521fbac35cf.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT \n emp_id, version\n FROM\n cqrs_identity_employee_query\n WHERE\n emp_id = $1;", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "emp_id", + "type_info": "Uuid" + }, + { + "ordinal": 1, + "name": "version", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + false + ] + }, + "hash": "0bbafa839181369d932fb1deae71e2255c30d24779d37a703dcd3521fbac35cf" +} diff --git a/.sqlx/query-0ce99350a114d2bc5876ca038f079aac489d27d89d164d07ded62c71e5237b10.json b/.sqlx/query-0ce99350a114d2bc5876ca038f079aac489d27d89d164d07ded62c71e5237b10.json new file mode 100644 index 0000000..2bfe540 --- /dev/null +++ b/.sqlx/query-0ce99350a114d2bc5876ca038f079aac489d27d89d164d07ded62c71e5237b10.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM\n emp_verification_otp\n WHERE\n otp = $1\n AND\n emp_id = (\n SELECT emp_id\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $2\n AND\n phone_number_country_code = $3\n );", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Int8", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "0ce99350a114d2bc5876ca038f079aac489d27d89d164d07ded62c71e5237b10" +} diff --git a/.sqlx/query-4b8bf25b161a8337bc1ee7bcfba5a065417280cbae1527d3363f6f7561cb50c3.json b/.sqlx/query-4b8bf25b161a8337bc1ee7bcfba5a065417280cbae1527d3363f6f7561cb50c3.json new file mode 100644 index 0000000..4468b3c --- /dev/null +++ b/.sqlx/query-4b8bf25b161a8337bc1ee7bcfba5a065417280cbae1527d3363f6f7561cb50c3.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE\n cqrs_identity_employee_query\n SET\n version = $1,\n\n created_time = $2,\n store_id = $3,\n first_name = $4,\n last_name = $5,\n phone_number_number = $6,\n phone_number_country_code = $7,\n phone_verified = $8,\n\n\n deleted = $9;", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Timestamptz", + "Uuid", + "Text", + "Text", + "Int8", + "Int4", + "Bool", + "Bool" + ] + }, + "nullable": [] + }, + "hash": "4b8bf25b161a8337bc1ee7bcfba5a065417280cbae1527d3363f6f7561cb50c3" +} diff --git a/.sqlx/query-5ed9222039eabd6e564c035aae83227f5a8398d4892d62185fbf911f16bde10d.json b/.sqlx/query-5ed9222039eabd6e564c035aae83227f5a8398d4892d62185fbf911f16bde10d.json new file mode 100644 index 0000000..85196f4 --- /dev/null +++ b/.sqlx/query-5ed9222039eabd6e564c035aae83227f5a8398d4892d62185fbf911f16bde10d.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT EXISTS (\n SELECT 1\n FROM cqrs_identity_employee_query\n WHERE\n emp_id = $1\n );", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "exists", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + null + ] + }, + "hash": "5ed9222039eabd6e564c035aae83227f5a8398d4892d62185fbf911f16bde10d" +} diff --git a/.sqlx/query-6059e6de1cb1aaca0df97b3f6f95b567f0786bacecd4658776aefcaae41ca679.json b/.sqlx/query-6059e6de1cb1aaca0df97b3f6f95b567f0786bacecd4658776aefcaae41ca679.json new file mode 100644 index 0000000..f7475f6 --- /dev/null +++ b/.sqlx/query-6059e6de1cb1aaca0df97b3f6f95b567f0786bacecd4658776aefcaae41ca679.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT EXISTS (\n SELECT 1\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $1\n AND \n phone_number_country_code = $2\n );", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "exists", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Int8", + "Int4" + ] + }, + "nullable": [ + null + ] + }, + "hash": "6059e6de1cb1aaca0df97b3f6f95b567f0786bacecd4658776aefcaae41ca679" +} diff --git a/.sqlx/query-76b69da704bce81a71c5591ac3990a3dcbab3e9d8d67e71126a1ab1de99b839a.json b/.sqlx/query-76b69da704bce81a71c5591ac3990a3dcbab3e9d8d67e71126a1ab1de99b839a.json new file mode 100644 index 0000000..b39df36 --- /dev/null +++ b/.sqlx/query-76b69da704bce81a71c5591ac3990a3dcbab3e9d8d67e71126a1ab1de99b839a.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO emp_verification_otp (otp, created_at, purpose, emp_id)\n VALUES ($1, $2, $3, $4);", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Timestamptz", + "Text", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "76b69da704bce81a71c5591ac3990a3dcbab3e9d8d67e71126a1ab1de99b839a" +} diff --git a/.sqlx/query-796be4344e585654ea27252b02239158ed4691448b33d4427bf70717aad41263.json b/.sqlx/query-796be4344e585654ea27252b02239158ed4691448b33d4427bf70717aad41263.json new file mode 100644 index 0000000..0a7a842 --- /dev/null +++ b/.sqlx/query-796be4344e585654ea27252b02239158ed4691448b33d4427bf70717aad41263.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO cqrs_identity_employee_query (\n version,\n created_time,\n store_id,\n emp_id,\n first_name,\n last_name,\n phone_number_number,\n phone_number_country_code,\n phone_verified,\n deleted\n\n\n ) VALUES (\n $1, $2, $3, $4, $5, $6, $7, $8, $9, $10\n );", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Timestamptz", + "Uuid", + "Uuid", + "Text", + "Text", + "Int8", + "Int4", + "Bool", + "Bool" + ] + }, + "nullable": [] + }, + "hash": "796be4344e585654ea27252b02239158ed4691448b33d4427bf70717aad41263" +} diff --git a/.sqlx/query-7c2fd6e897bf18b1f2229eec5fd12932a86d4e88f2fd4ab8ac32246a55303b03.json b/.sqlx/query-7c2fd6e897bf18b1f2229eec5fd12932a86d4e88f2fd4ab8ac32246a55303b03.json new file mode 100644 index 0000000..f3f7002 --- /dev/null +++ b/.sqlx/query-7c2fd6e897bf18b1f2229eec5fd12932a86d4e88f2fd4ab8ac32246a55303b03.json @@ -0,0 +1,70 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT \n created_time,\n store_id,\n emp_id,\n first_name,\n last_name,\n phone_number_number,\n phone_number_country_code,\n phone_verified,\n deleted\n FROM\n cqrs_identity_employee_query\n WHERE\n emp_id = $1;", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "created_time", + "type_info": "Timestamptz" + }, + { + "ordinal": 1, + "name": "store_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "emp_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "first_name", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "last_name", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "phone_number_number", + "type_info": "Int8" + }, + { + "ordinal": 6, + "name": "phone_number_country_code", + "type_info": "Int4" + }, + { + "ordinal": 7, + "name": "phone_verified", + "type_info": "Bool" + }, + { + "ordinal": 8, + "name": "deleted", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + true, + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "7c2fd6e897bf18b1f2229eec5fd12932a86d4e88f2fd4ab8ac32246a55303b03" +} diff --git a/.sqlx/query-848f7c8250f7aba08fcf11491ee1a80c9fd0bfb8e37ca1051604bc2bb25d5356.json b/.sqlx/query-848f7c8250f7aba08fcf11491ee1a80c9fd0bfb8e37ca1051604bc2bb25d5356.json new file mode 100644 index 0000000..c5c5e41 --- /dev/null +++ b/.sqlx/query-848f7c8250f7aba08fcf11491ee1a80c9fd0bfb8e37ca1051604bc2bb25d5356.json @@ -0,0 +1,70 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT \n created_time,\n store_id,\n emp_id,\n first_name,\n last_name,\n phone_number_number,\n phone_number_country_code,\n phone_verified,\n deleted\n\n FROM\n cqrs_identity_employee_query\n WHERE\n emp_id = $1;", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "created_time", + "type_info": "Timestamptz" + }, + { + "ordinal": 1, + "name": "store_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "emp_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "first_name", + "type_info": "Text" + }, + { + "ordinal": 4, + "name": "last_name", + "type_info": "Text" + }, + { + "ordinal": 5, + "name": "phone_number_number", + "type_info": "Int8" + }, + { + "ordinal": 6, + "name": "phone_number_country_code", + "type_info": "Int4" + }, + { + "ordinal": 7, + "name": "phone_verified", + "type_info": "Bool" + }, + { + "ordinal": 8, + "name": "deleted", + "type_info": "Bool" + } + ], + "parameters": { + "Left": [ + "Uuid" + ] + }, + "nullable": [ + false, + true, + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "848f7c8250f7aba08fcf11491ee1a80c9fd0bfb8e37ca1051604bc2bb25d5356" +} diff --git a/.sqlx/query-14e8d7a1c8f80701b76b2bac69b1ecd99f7694d620f1945ad5c4ae474a17be1b.json b/.sqlx/query-8ae34e8c47972ce113f235888fd52ca6f48a6a6130538256827f03ea11b8cc78.json similarity index 50% rename from .sqlx/query-14e8d7a1c8f80701b76b2bac69b1ecd99f7694d620f1945ad5c4ae474a17be1b.json rename to .sqlx/query-8ae34e8c47972ce113f235888fd52ca6f48a6a6130538256827f03ea11b8cc78.json index 1cb0ae4..b64c230 100644 --- a/.sqlx/query-14e8d7a1c8f80701b76b2bac69b1ecd99f7694d620f1945ad5c4ae474a17be1b.json +++ b/.sqlx/query-8ae34e8c47972ce113f235888fd52ca6f48a6a6130538256827f03ea11b8cc78.json @@ -1,11 +1,10 @@ { "db_name": "PostgreSQL", - "query": "UPDATE\n user_query\n SET\n user_id = $1, version = $2, first_name = $3, email = $4,\n hashed_password = $5, is_admin = $6, is_verified = $7, deleted = $8,\n last_name=$9;", + "query": "UPDATE\n user_query\n SET\n version = $1, first_name = $2, email = $3,\n hashed_password = $4, is_admin = $5, is_verified = $6, deleted = $7,\n last_name=$8;", "describe": { "columns": [], "parameters": { "Left": [ - "Uuid", "Int8", "Text", "Text", @@ -18,5 +17,5 @@ }, "nullable": [] }, - "hash": "14e8d7a1c8f80701b76b2bac69b1ecd99f7694d620f1945ad5c4ae474a17be1b" + "hash": "8ae34e8c47972ce113f235888fd52ca6f48a6a6130538256827f03ea11b8cc78" } diff --git a/.sqlx/query-901bd28d7ec82aae1b5b7a2add1f0b0bd8625c365a9de30b176d023333c3d266.json b/.sqlx/query-901bd28d7ec82aae1b5b7a2add1f0b0bd8625c365a9de30b176d023333c3d266.json new file mode 100644 index 0000000..a902164 --- /dev/null +++ b/.sqlx/query-901bd28d7ec82aae1b5b7a2add1f0b0bd8625c365a9de30b176d023333c3d266.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT emp_id\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $1\n AND\n phone_number_country_code = $2;", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "emp_id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Int8", + "Int4" + ] + }, + "nullable": [ + false + ] + }, + "hash": "901bd28d7ec82aae1b5b7a2add1f0b0bd8625c365a9de30b176d023333c3d266" +} diff --git a/.sqlx/query-cee6873f40b9a442ec4764e22a6885994c5fb3cd1f9367a073d6333eadbdb8e8.json b/.sqlx/query-cee6873f40b9a442ec4764e22a6885994c5fb3cd1f9367a073d6333eadbdb8e8.json new file mode 100644 index 0000000..4a9ca1a --- /dev/null +++ b/.sqlx/query-cee6873f40b9a442ec4764e22a6885994c5fb3cd1f9367a073d6333eadbdb8e8.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n otp\n FROM\n emp_verification_otp\n WHERE\n emp_id = (\n SELECT emp_id\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $1\n AND\n phone_number_country_code = $2\n );", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "otp", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Int8", + "Int4" + ] + }, + "nullable": [ + false + ] + }, + "hash": "cee6873f40b9a442ec4764e22a6885994c5fb3cd1f9367a073d6333eadbdb8e8" +} diff --git a/.sqlx/query-d7ca0856c700be37f5ec475b8bbc2d4a443923c8afdd37742d75d381a8831873.json b/.sqlx/query-d7ca0856c700be37f5ec475b8bbc2d4a443923c8afdd37742d75d381a8831873.json new file mode 100644 index 0000000..e5af3a2 --- /dev/null +++ b/.sqlx/query-d7ca0856c700be37f5ec475b8bbc2d4a443923c8afdd37742d75d381a8831873.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n otp\n FROM\n emp_login_otp\n WHERE\n emp_id = (\n SELECT emp_id\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $1\n AND\n phone_number_country_code = $2\n );", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "otp", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Int8", + "Int4" + ] + }, + "nullable": [ + false + ] + }, + "hash": "d7ca0856c700be37f5ec475b8bbc2d4a443923c8afdd37742d75d381a8831873" +} diff --git a/.sqlx/query-e56fe1dadd3536ea549a30c36005982be07e3d34a1782399bee188dddd2c85a8.json b/.sqlx/query-e56fe1dadd3536ea549a30c36005982be07e3d34a1782399bee188dddd2c85a8.json new file mode 100644 index 0000000..6a3298b --- /dev/null +++ b/.sqlx/query-e56fe1dadd3536ea549a30c36005982be07e3d34a1782399bee188dddd2c85a8.json @@ -0,0 +1,17 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO emp_login_otp (otp, created_at, purpose, emp_id)\n VALUES ($1, $2, $3, $4);", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Timestamptz", + "Text", + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "e56fe1dadd3536ea549a30c36005982be07e3d34a1782399bee188dddd2c85a8" +} diff --git a/.sqlx/query-e665b7147456bc27158a24a8bd705bcae867b257d0eb1f963c029a665e2b9f38.json b/.sqlx/query-e665b7147456bc27158a24a8bd705bcae867b257d0eb1f963c029a665e2b9f38.json new file mode 100644 index 0000000..da45c9c --- /dev/null +++ b/.sqlx/query-e665b7147456bc27158a24a8bd705bcae867b257d0eb1f963c029a665e2b9f38.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM\n emp_login_otp\n WHERE\n otp = $1\n AND\n emp_id = (\n SELECT emp_id\n FROM cqrs_identity_employee_query\n WHERE\n phone_number_number = $2\n AND\n phone_number_country_code = $3\n );", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Int8", + "Int4" + ] + }, + "nullable": [] + }, + "hash": "e665b7147456bc27158a24a8bd705bcae867b257d0eb1f963c029a665e2b9f38" +} diff --git a/Cargo.lock b/Cargo.lock index ea6520f..f13b6e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -81,7 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -216,14 +216,14 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "ammonia" @@ -342,15 +342,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "argon2-creds" @@ -370,10 +370,16 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.8" +name = "arraydeque" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -389,7 +395,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -409,9 +415,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -504,9 +510,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8" dependencies = [ "memchr", "serde", @@ -526,24 +532,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", ] [[package]] name = "cc" -version = "1.1.18" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" dependencies = [ "jobserver", "libc", @@ -557,10 +563,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.38" +name = "cfg_aliases" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -612,14 +624,13 @@ dependencies = [ [[package]] name = "config" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" dependencies = [ "async-trait", "convert_case 0.6.0", "json5", - "lazy_static", "nom", "pathdiff", "ron", @@ -627,7 +638,7 @@ dependencies = [ "serde", "serde_json", "toml", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -713,9 +724,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -729,7 +740,7 @@ dependencies = [ "async-trait", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -759,9 +770,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -778,18 +789,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -841,7 +852,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -889,7 +900,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -911,7 +922,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -943,7 +954,7 @@ checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -985,7 +996,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -1005,7 +1016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core 0.20.2", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -1018,7 +1029,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -1038,7 +1049,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", "unicode-xid", ] @@ -1068,7 +1079,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -1127,9 +1138,9 @@ dependencies = [ [[package]] name = "email-encoding" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" dependencies = [ "base64 0.22.1", "memchr", @@ -1143,9 +1154,9 @@ checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1171,12 +1182,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1198,9 +1209,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fiat-crypto" @@ -1210,9 +1221,9 @@ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1220,9 +1231,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", @@ -1277,9 +1288,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1292,9 +1303,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1302,15 +1313,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1330,38 +1341,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1410,9 +1421,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "globset" @@ -1459,16 +1470,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http 1.1.0", + "http 1.2.0", "indexmap", "slab", "tokio", @@ -1476,12 +1487,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - [[package]] name = "hashbrown" version = "0.14.5" @@ -1492,6 +1497,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.8.4" @@ -1510,12 +1521,6 @@ dependencies = [ "unicode-segmentation", ] -[[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" @@ -1548,11 +1553,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1582,9 +1587,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1598,7 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -1609,16 +1614,16 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1643,15 +1648,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body", "httparse", "itoa", @@ -1668,15 +1673,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.2.0", "hyper", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.20", "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.5", + "webpki-roots 0.26.7", ] [[package]] @@ -1697,29 +1702,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "hyper", "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1853,7 +1857,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -1884,14 +1888,23 @@ dependencies = [ [[package]] name = "idna" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ "icu_normalizer", "icu_properties", - "smallvec", - "utf8_iter", ] [[package]] @@ -1918,18 +1931,18 @@ dependencies = [ [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] @@ -1943,9 +1956,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1953,7 +1966,7 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -1969,9 +1982,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -1984,10 +1997,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -2032,9 +2046,9 @@ dependencies = [ [[package]] name = "lettre" -version = "0.11.9" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f204773bab09b150320ea1c83db41dc6ee606a4bc36dc1f43005fe7b58ce06" +checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5" dependencies = [ "async-trait", "base64 0.22.1", @@ -2046,15 +2060,15 @@ dependencies = [ "futures-io", "futures-util", "httpdate", - "idna 1.0.2", + "idna 1.0.3", "mime", "native-tls", "nom", "percent-encoding", "quoted_printable", "rsa", - "rustls 0.23.13", - "rustls-pemfile 2.1.3", + "rustls 0.23.20", + "rustls-pemfile 2.2.0", "rustls-pki-types", "sha2", "socket2", @@ -2063,20 +2077,20 @@ dependencies = [ "tokio-rustls", "tracing", "url", - "webpki-roots 0.26.5", + "webpki-roots 0.26.7", ] [[package]] name = "libc" -version = "0.2.158" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libsqlite3-sys" @@ -2089,12 +2103,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2103,9 +2111,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "local-channel" @@ -2201,7 +2209,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -2223,7 +2231,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "time", "uuid", "wasm-bindgen-futures", @@ -2251,20 +2259,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "log", "wasi", @@ -2273,9 +2280,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" dependencies = [ "cfg-if", "downcast", @@ -2287,14 +2294,14 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -2391,18 +2398,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -2412,9 +2419,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", "cfg-if", @@ -2433,7 +2440,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -2453,9 +2460,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -2466,12 +2473,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown 0.13.2", + "hashbrown 0.14.5", ] [[package]] @@ -2514,9 +2521,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "pem-rfc7468" @@ -2535,20 +2542,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.8", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.12" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -2556,22 +2563,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.12" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "pest_meta" -version = "2.7.12" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -2656,29 +2663,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2709,9 +2716,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polyval" @@ -2823,63 +2830,67 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.13", + "rustls 0.23.20", "socket2", - "thiserror", + "thiserror 2.0.8", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring", "rustc-hash", - "rustls 0.23.13", + "rustls 0.23.20", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.8", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -2934,18 +2945,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2955,9 +2966,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2972,9 +2983,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -2987,8 +2998,8 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.4.6", - "http 1.1.0", + "h2 0.4.7", + "http 1.2.0", "http-body", "http-body-util", "hyper", @@ -3004,8 +3015,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-pemfile 2.1.3", + "rustls 0.23.20", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -3022,7 +3033,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.5", + "webpki-roots 0.26.7", "windows-registry", ] @@ -3055,9 +3066,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" dependencies = [ "const-oid", "digest", @@ -3104,7 +3115,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.90", "walkdir", ] @@ -3121,9 +3132,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ "cfg-if", "ordered-multimap", @@ -3137,9 +3148,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc_version" @@ -3152,15 +3163,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3176,9 +3187,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "log", "once_cell", @@ -3200,19 +3211,21 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -3252,9 +3265,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -3290,9 +3303,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -3300,35 +3313,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -3338,9 +3351,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3437,9 +3450,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3521,7 +3534,7 @@ dependencies = [ "sha2", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "time", "tokio", "tokio-stream", @@ -3607,7 +3620,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "uuid", @@ -3647,7 +3660,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "time", "tracing", "uuid", @@ -3756,7 +3769,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -3767,7 +3780,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -3789,9 +3802,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -3800,9 +3813,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -3815,7 +3828,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -3841,9 +3854,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", @@ -3902,29 +3915,49 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +dependencies = [ + "thiserror-impl 2.0.8", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -3943,9 +3976,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -3987,9 +4020,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -4011,7 +4044,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -4026,20 +4059,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.13", - "rustls-pki-types", + "rustls 0.23.20", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -4048,9 +4080,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -4082,9 +4114,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -4093,27 +4125,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -4122,9 +4133,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -4134,9 +4145,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b87073920bcce23e9f5cb0d2671e9f01d6803bb5229c159b2f5ce6806d73ffc" +checksum = "54a9f5c1aca50ebebf074ee665b9f99f2e84906dcf6b993a0d0090edb835166d" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -4147,20 +4158,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -4179,9 +4190,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unic-char-property" @@ -4235,42 +4246,42 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -4296,12 +4307,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", "serde", ] @@ -4400,7 +4411,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] @@ -4436,7 +4447,6 @@ dependencies = [ "postgres-es", "pretty_env_logger", "rand", - "reqwest", "rust-embed", "serde", "serde_json", @@ -4495,9 +4505,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -4506,36 +4516,36 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4543,28 +4553,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -4575,9 +4585,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4591,9 +4611,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -4614,7 +4634,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -4806,9 +4826,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -4826,12 +4846,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] @@ -4842,14 +4864,14 @@ checksum = "b0144f1a16a199846cb21024da74edd930b43443463292f536b7110b4855b5c6" dependencies = [ "form_urlencoded", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -4859,13 +4881,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", "synstructure", ] @@ -4887,27 +4909,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", "synstructure", ] @@ -4936,7 +4958,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.90", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e5e5511..8326ebd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,5 +39,5 @@ uuid = { version = "1.10.0", features = ["v4", "serde"] } validator = { version = "0.18.1", features = ["derive"] } [dev-dependencies] -reqwest = { version = "0.12.4", features = ["json"] } +#reqwest = { version = "0.12.4", features = ["json"] } mailpit_client = { path = "./mailpit_client" } diff --git a/devenv.nix b/devenv.nix index 6521c96..2207b27 100644 --- a/devenv.nix +++ b/devenv.nix @@ -19,7 +19,6 @@ pkgs.podman pkgs.podman-compose pkgs.openssl - pkgs.openssl pkgs.direnv ]; diff --git a/migrations/20241007081332_emp_login_otp.sql b/migrations/20241007081332_emp_login_otp.sql new file mode 100644 index 0000000..369e225 --- /dev/null +++ b/migrations/20241007081332_emp_login_otp.sql @@ -0,0 +1,11 @@ +-- SPDX-FileCopyrightText: 2024 Aravinth Manivannan +-- +-- SPDX-License-Identifier: AGPL-3.0-or-later + +CREATE TABLE IF NOT EXISTS emp_login_otp ( + otp INTEGER NOT NULL UNIQUE, + created_at timestamp with time zone DEFAULT (CURRENT_TIMESTAMP), + purpose TEXT NOT NULL, + emp_id UUID NOT NULL, + ID SERIAL PRIMARY KEY NOT NULL +); diff --git a/migrations/20241007081336_emp_verification_otp.sql b/migrations/20241007081336_emp_verification_otp.sql new file mode 100644 index 0000000..0c68f53 --- /dev/null +++ b/migrations/20241007081336_emp_verification_otp.sql @@ -0,0 +1,11 @@ +-- SPDX-FileCopyrightText: 2024 Aravinth Manivannan +-- +-- SPDX-License-Identifier: AGPL-3.0-or-later + +CREATE TABLE IF NOT EXISTS emp_verification_otp ( + otp INTEGER NOT NULL UNIQUE, + created_at timestamp with time zone DEFAULT (CURRENT_TIMESTAMP), + purpose TEXT NOT NULL, + emp_id UUID NOT NULL, + ID SERIAL PRIMARY KEY NOT NULL +); diff --git a/migrations/20241007085926_employee_query.sql b/migrations/20241007085926_employee_query.sql new file mode 100644 index 0000000..4e98039 --- /dev/null +++ b/migrations/20241007085926_employee_query.sql @@ -0,0 +1,28 @@ +-- SPDX-FileCopyrightText: 2024 Aravinth Manivannan +-- +-- SPDX-License-Identifier: AGPL-3.0-or-later + +CREATE TABLE IF NOT EXISTS cqrs_identity_employee_query +( + version bigint CHECK (version >= 0) NOT NULL, + + created_time timestamp with time zone DEFAULT (CURRENT_TIMESTAMP) NOT NULL, + + first_name TEXT NOT NULL, + last_name TEXT NOT NULL, + + emp_id UUID NOT NULL UNIQUE, + + + + phone_number_country_code INTEGER NOT NULL, + phone_number_number BIGINT NOT NULL, + + phone_verified BOOLEAN NOT NULL DEFAULT FALSE, + + store_id UUID DEFAULT NULL, + + deleted BOOLEAN NOT NULL DEFAULT FALSE, + + PRIMARY KEY (emp_id) +); diff --git a/rustc-ice-2024-10-01T11_03_41-594641.txt b/rustc-ice-2024-10-01T11_03_41-594641.txt new file mode 100644 index 0000000..b13a3d8 --- /dev/null +++ b/rustc-ice-2024-10-01T11_03_41-594641.txt @@ -0,0 +1,37 @@ +thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:736:21: +Failed to convert DefPathHash DefPathHash(Fingerprint(9597590199268592635, 17791879502897349522)) +stack backtrace: + 0: 0x7fbfbb48d025 - std::backtrace::Backtrace::create::hbc256ff4bc983c0b + 1: 0x7fbfb9c8c865 - std::backtrace::Backtrace::force_capture::h1ebb6042c5b424a8 + 2: 0x7fbfb8db2217 - std[11ac8361619e45fd]::panicking::update_hook::>::{closure#0} + 3: 0x7fbfb9ca3ee8 - std::panicking::rust_panic_with_hook::ha6cfc51100acb1ab + 4: 0x7fbfb9ca3cb7 - std::panicking::begin_panic_handler::{{closure}}::he56e1efe5ba67ce1 + 5: 0x7fbfb9ca1699 - std::sys::backtrace::__rust_end_short_backtrace::hcc7bf1345a5f7ae3 + 6: 0x7fbfb9ca3984 - rust_begin_unwind + 7: 0x7fbfb6ad55c3 - core::panicking::panic_fmt::h146c2ef4416c8c7b + 8: 0x7fbfba61abc5 - ::decode_span + 9: 0x7fbfba94bc1c - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 10: 0x7fbfba94929a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::def_span::get_query_incr::__rust_end_short_backtrace + 11: 0x7fbfbaa190c0 - rustc_middle[62c17eb200ed25ef]::query::plumbing::query_get_at::>> + 12: 0x7fbfbacaaf7d - ::check_for_duplicate_items_in_impl + 13: 0x7fbfbb39e280 - rustc_hir_analysis[198913e0276c9380]::coherence::inherent_impls_overlap::crate_inherent_impls_overlap_check + 14: 0x7fbfbb39dc6d - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 15: 0x7fbfbb39d1fd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 16: 0x7fbfbb39c867 - rustc_query_impl[2b1ee272ecafb82c]::query_impl::crate_inherent_impls_overlap_check::get_query_incr::__rust_end_short_backtrace + 17: 0x7fbfba5bb6f3 - rustc_hir_analysis[198913e0276c9380]::check_crate + 18: 0x7fbfba5b1351 - rustc_interface[d7e86b952eb641e5]::passes::run_required_analyses + 19: 0x7fbfbb1bac1e - rustc_interface[d7e86b952eb641e5]::passes::analysis + 20: 0x7fbfbb1babf1 - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 21: 0x7fbfbb39cecd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 22: 0x7fbfbb39cb7a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::analysis::get_query_incr::__rust_end_short_backtrace + 23: 0x7fbfbb1b30bc - rustc_interface[d7e86b952eb641e5]::interface::run_compiler::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1} + 24: 0x7fbfbb2c0504 - std[11ac8361619e45fd]::sys::backtrace::__rust_begin_short_backtrace::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>> + 25: 0x7fbfbb2c0b70 - <::spawn_unchecked_, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#1} as core[dcc560a250502550]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} + 26: 0x7fbfbb2c0f6b - std::sys::pal::unix::thread::Thread::new::thread_start::h1921d0f3a7850262 + 27: 0x7fbfbcbf8272 - start_thread + 28: 0x7fbfbcc73dcc - clone3 + 29: 0x0 - + + +rustc version: 1.83.0-nightly (0ee7cb5e3 2024-09-10) +platform: x86_64-unknown-linux-gnu \ No newline at end of file diff --git a/rustc-ice-2024-10-01T11_03_53-595154.txt b/rustc-ice-2024-10-01T11_03_53-595154.txt new file mode 100644 index 0000000..b26a907 --- /dev/null +++ b/rustc-ice-2024-10-01T11_03_53-595154.txt @@ -0,0 +1,37 @@ +thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:736:21: +Failed to convert DefPathHash DefPathHash(Fingerprint(9597590199268592635, 17791879502897349522)) +stack backtrace: + 0: 0x77c2cca8d025 - std::backtrace::Backtrace::create::hbc256ff4bc983c0b + 1: 0x77c2cb28c865 - std::backtrace::Backtrace::force_capture::h1ebb6042c5b424a8 + 2: 0x77c2ca3b2217 - std[11ac8361619e45fd]::panicking::update_hook::>::{closure#0} + 3: 0x77c2cb2a3ee8 - std::panicking::rust_panic_with_hook::ha6cfc51100acb1ab + 4: 0x77c2cb2a3cb7 - std::panicking::begin_panic_handler::{{closure}}::he56e1efe5ba67ce1 + 5: 0x77c2cb2a1699 - std::sys::backtrace::__rust_end_short_backtrace::hcc7bf1345a5f7ae3 + 6: 0x77c2cb2a3984 - rust_begin_unwind + 7: 0x77c2c80d55c3 - core::panicking::panic_fmt::h146c2ef4416c8c7b + 8: 0x77c2cbc1abc5 - ::decode_span + 9: 0x77c2cbf4bc1c - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 10: 0x77c2cbf4929a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::def_span::get_query_incr::__rust_end_short_backtrace + 11: 0x77c2cc0190c0 - rustc_middle[62c17eb200ed25ef]::query::plumbing::query_get_at::>> + 12: 0x77c2cc2aaf7d - ::check_for_duplicate_items_in_impl + 13: 0x77c2cc99e280 - rustc_hir_analysis[198913e0276c9380]::coherence::inherent_impls_overlap::crate_inherent_impls_overlap_check + 14: 0x77c2cc99dc6d - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 15: 0x77c2cc99d1fd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 16: 0x77c2cc99c867 - rustc_query_impl[2b1ee272ecafb82c]::query_impl::crate_inherent_impls_overlap_check::get_query_incr::__rust_end_short_backtrace + 17: 0x77c2cbbbb6f3 - rustc_hir_analysis[198913e0276c9380]::check_crate + 18: 0x77c2cbbb1351 - rustc_interface[d7e86b952eb641e5]::passes::run_required_analyses + 19: 0x77c2cc7bac1e - rustc_interface[d7e86b952eb641e5]::passes::analysis + 20: 0x77c2cc7babf1 - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 21: 0x77c2cc99cecd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 22: 0x77c2cc99cb7a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::analysis::get_query_incr::__rust_end_short_backtrace + 23: 0x77c2cc7b30bc - rustc_interface[d7e86b952eb641e5]::interface::run_compiler::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1} + 24: 0x77c2cc8c0504 - std[11ac8361619e45fd]::sys::backtrace::__rust_begin_short_backtrace::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>> + 25: 0x77c2cc8c0b70 - <::spawn_unchecked_, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#1} as core[dcc560a250502550]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} + 26: 0x77c2cc8c0f6b - std::sys::pal::unix::thread::Thread::new::thread_start::h1921d0f3a7850262 + 27: 0x77c2ce089272 - start_thread + 28: 0x77c2ce104dcc - clone3 + 29: 0x0 - + + +rustc version: 1.83.0-nightly (0ee7cb5e3 2024-09-10) +platform: x86_64-unknown-linux-gnu \ No newline at end of file diff --git a/rustc-ice-2024-10-01T11_04_04-595752.txt b/rustc-ice-2024-10-01T11_04_04-595752.txt new file mode 100644 index 0000000..ae8ab3b --- /dev/null +++ b/rustc-ice-2024-10-01T11_04_04-595752.txt @@ -0,0 +1,37 @@ +thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:736:21: +Failed to convert DefPathHash DefPathHash(Fingerprint(9597590199268592635, 17791879502897349522)) +stack backtrace: + 0: 0x704a8948d025 - std::backtrace::Backtrace::create::hbc256ff4bc983c0b + 1: 0x704a87c8c865 - std::backtrace::Backtrace::force_capture::h1ebb6042c5b424a8 + 2: 0x704a86db2217 - std[11ac8361619e45fd]::panicking::update_hook::>::{closure#0} + 3: 0x704a87ca3ee8 - std::panicking::rust_panic_with_hook::ha6cfc51100acb1ab + 4: 0x704a87ca3cb7 - std::panicking::begin_panic_handler::{{closure}}::he56e1efe5ba67ce1 + 5: 0x704a87ca1699 - std::sys::backtrace::__rust_end_short_backtrace::hcc7bf1345a5f7ae3 + 6: 0x704a87ca3984 - rust_begin_unwind + 7: 0x704a84ad55c3 - core::panicking::panic_fmt::h146c2ef4416c8c7b + 8: 0x704a8861abc5 - ::decode_span + 9: 0x704a8894bc1c - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 10: 0x704a8894929a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::def_span::get_query_incr::__rust_end_short_backtrace + 11: 0x704a88a190c0 - rustc_middle[62c17eb200ed25ef]::query::plumbing::query_get_at::>> + 12: 0x704a88caaf7d - ::check_for_duplicate_items_in_impl + 13: 0x704a8939e280 - rustc_hir_analysis[198913e0276c9380]::coherence::inherent_impls_overlap::crate_inherent_impls_overlap_check + 14: 0x704a8939dc6d - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 15: 0x704a8939d1fd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 16: 0x704a8939c867 - rustc_query_impl[2b1ee272ecafb82c]::query_impl::crate_inherent_impls_overlap_check::get_query_incr::__rust_end_short_backtrace + 17: 0x704a885bb6f3 - rustc_hir_analysis[198913e0276c9380]::check_crate + 18: 0x704a885b1351 - rustc_interface[d7e86b952eb641e5]::passes::run_required_analyses + 19: 0x704a891bac1e - rustc_interface[d7e86b952eb641e5]::passes::analysis + 20: 0x704a891babf1 - rustc_query_impl[2b1ee272ecafb82c]::plumbing::__rust_begin_short_backtrace::> + 21: 0x704a8939cecd - rustc_query_system[4b3461eb5f3eee8]::query::plumbing::try_execute_query::>, false, false, false>, rustc_query_impl[2b1ee272ecafb82c]::plumbing::QueryCtxt, true> + 22: 0x704a8939cb7a - rustc_query_impl[2b1ee272ecafb82c]::query_impl::analysis::get_query_incr::__rust_end_short_backtrace + 23: 0x704a891b30bc - rustc_interface[d7e86b952eb641e5]::interface::run_compiler::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1} + 24: 0x704a892c0504 - std[11ac8361619e45fd]::sys::backtrace::__rust_begin_short_backtrace::, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>> + 25: 0x704a892c0b70 - <::spawn_unchecked_, rustc_driver_impl[8c32a9dec5e4d0f0]::run_compiler::{closure#0}>::{closure#1}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#0}::{closure#0}, core[dcc560a250502550]::result::Result<(), rustc_span[e2902ef3f031f316]::ErrorGuaranteed>>::{closure#1} as core[dcc560a250502550]::ops::function::FnOnce<()>>::call_once::{shim:vtable#0} + 26: 0x704a892c0f6b - std::sys::pal::unix::thread::Thread::new::thread_start::h1921d0f3a7850262 + 27: 0x704a8ac0b272 - start_thread + 28: 0x704a8ac86dcc - clone3 + 29: 0x0 - + + +rustc version: 1.83.0-nightly (0ee7cb5e3 2024-09-10) +platform: x86_64-unknown-linux-gnu \ No newline at end of file diff --git a/src/identity/adapters/output/db/postgres/create_login_otp.rs b/src/identity/adapters/output/db/postgres/create_login_otp.rs new file mode 100644 index 0000000..56e1920 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/create_login_otp.rs @@ -0,0 +1,59 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use sqlx::types::time::OffsetDateTime; + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{create_login_otp::*, errors::*}; + +#[async_trait::async_trait] +impl CreateLoginOTPOutDBPort for DBOutPostgresAdapter { + async fn create_login_otp(&self, msg: CreateOTPMsg) -> OutDBPortResult<()> { + sqlx::query!( + "INSERT INTO emp_login_otp (otp, created_at, purpose, emp_id) + VALUES ($1, $2, $3, $4);", + msg.otp as i32, + OffsetDateTime::now_utc(), + REGISTRATION_OTP_PURPOSE, + &msg.emp_id, + ) + .execute(&self.pool) + .await?; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + #[actix_rt::test] + async fn test_postgres_create_login_otp() { + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + let msg = CreateOTPMsgBuilder::default() + .otp(1010) + .emp_id(UUID) + .build() + .unwrap(); + + db.create_login_otp(msg.clone()).await.unwrap(); + + // duplicate: secret exists + assert_eq!( + db.create_login_otp(msg).await.err(), + Some(OutDBPortError::DuplicateEmpLoginOTP) + ); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/create_verification_otp.rs b/src/identity/adapters/output/db/postgres/create_verification_otp.rs new file mode 100644 index 0000000..96955c9 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/create_verification_otp.rs @@ -0,0 +1,59 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use sqlx::types::time::OffsetDateTime; + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{create_verification_otp::*, errors::*}; + +#[async_trait::async_trait] +impl CreateVerificationOTPOutDBPort for DBOutPostgresAdapter { + async fn create_verification_otp(&self, msg: CreateOTPMsg) -> OutDBPortResult<()> { + sqlx::query!( + "INSERT INTO emp_verification_otp (otp, created_at, purpose, emp_id) + VALUES ($1, $2, $3, $4);", + msg.otp as i32, + OffsetDateTime::now_utc(), + REGISTRATION_OTP_PURPOSE, + &msg.emp_id, + ) + .execute(&self.pool) + .await?; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + #[actix_rt::test] + async fn test_postgres_create_verification_otp() { + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + let msg = CreateOTPMsgBuilder::default() + .otp(1010) + .emp_id(UUID) + .build() + .unwrap(); + + db.create_verification_otp(msg.clone()).await.unwrap(); + + // duplicate: secret exists + assert_eq!( + db.create_verification_otp(msg).await.err(), + Some(OutDBPortError::DuplicateEmpVerificationOTP) + ); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/delete_login_otp.rs b/src/identity/adapters/output/db/postgres/delete_login_otp.rs new file mode 100644 index 0000000..499bfa1 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/delete_login_otp.rs @@ -0,0 +1,84 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{delete_login_otp::*, errors::*}; +use crate::identity::domain::employee_aggregate::*; + +#[async_trait::async_trait] +impl DeleteLoginOTPOutDBPort for DBOutPostgresAdapter { + async fn delete_login_otp( + &self, + otp: usize, + phone_number: &PhoneNumber, + ) -> OutDBPortResult<()> { + sqlx::query!( + "DELETE FROM + emp_login_otp + WHERE + otp = $1 + AND + emp_id = ( + SELECT emp_id + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $2 + AND + phone_number_country_code = $3 + );", + otp as i32, + *phone_number.number() as i64, + *phone_number.country_code() as i32, + ) + .execute(&self.pool) + .await?; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + identity::{ + adapters::output::db::postgres::emp_id_exists::tests::create_dummy_employee, + application::port::output::db::{ + create_login_otp::*, create_login_otp::*, get_login_otp::*, + }, + }, + utils::uuid::tests::UUID, + }; + + #[actix_rt::test] + async fn test_postgres_delete_login_otp() { + let otp = 9999; + let e = Employee::default(); + + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + create_dummy_employee(&e, &db).await; + + db.create_login_otp( + CreateOTPMsgBuilder::default() + .otp(otp) + .emp_id(*e.emp_id()) + .build() + .unwrap(), + ) + .await + .unwrap(); + assert!(db.get_login_otp(e.phone_number()).await.unwrap().is_some()); + + db.delete_login_otp(otp, e.phone_number()).await.unwrap(); + assert!(db.get_login_otp(e.phone_number()).await.unwrap().is_none()); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/delete_verification_otp.rs b/src/identity/adapters/output/db/postgres/delete_verification_otp.rs new file mode 100644 index 0000000..3bf836a --- /dev/null +++ b/src/identity/adapters/output/db/postgres/delete_verification_otp.rs @@ -0,0 +1,94 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{delete_verification_otp::*, errors::*}; +use crate::identity::domain::employee_aggregate::*; + +#[async_trait::async_trait] +impl DeleteVerificationOTPOutDBPort for DBOutPostgresAdapter { + async fn delete_verification_otp( + &self, + otp: usize, + phone_number: &PhoneNumber, + ) -> OutDBPortResult<()> { + sqlx::query!( + "DELETE FROM + emp_verification_otp + WHERE + otp = $1 + AND + emp_id = ( + SELECT emp_id + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $2 + AND + phone_number_country_code = $3 + );", + otp as i32, + *phone_number.number() as i64, + *phone_number.country_code() as i32, + ) + .execute(&self.pool) + .await?; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + identity::{ + adapters::output::db::postgres::emp_id_exists::tests::create_dummy_employee, + application::port::output::db::{ + create_verification_otp::*, create_verification_otp::*, get_verification_otp::*, + }, + }, + utils::uuid::tests::UUID, + }; + + #[actix_rt::test] + async fn test_postgres_delete_verification_otp() { + let otp = 9999; + let e = Employee::default(); + + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + create_dummy_employee(&e, &db).await; + + db.create_verification_otp( + CreateOTPMsgBuilder::default() + .otp(otp) + .emp_id(*e.emp_id()) + .build() + .unwrap(), + ) + .await + .unwrap(); + assert!(db + .get_verification_otp(e.phone_number()) + .await + .unwrap() + .is_some()); + + db.delete_verification_otp(otp, e.phone_number()) + .await + .unwrap(); + assert!(db + .get_verification_otp(e.phone_number()) + .await + .unwrap() + .is_none()); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/emp_id_exists.rs b/src/identity/adapters/output/db/postgres/emp_id_exists.rs new file mode 100644 index 0000000..050c8bb --- /dev/null +++ b/src/identity/adapters/output/db/postgres/emp_id_exists.rs @@ -0,0 +1,93 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use uuid::Uuid; + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{emp_id_exists::*, errors::*}; + +#[async_trait::async_trait] +impl EmpIDExistsOutDBPort for DBOutPostgresAdapter { + async fn emp_id_exists(&self, emp_id: &Uuid) -> OutDBPortResult { + let res = sqlx::query!( + "SELECT EXISTS ( + SELECT 1 + FROM cqrs_identity_employee_query + WHERE + emp_id = $1 + );", + emp_id, + ) + .fetch_one(&self.pool) + .await?; + if let Some(x) = res.exists { + Ok(x) + } else { + Ok(false) + } + } +} + +#[cfg(test)] +pub mod tests { + use super::*; + + use crate::utils::uuid::tests::UUID; + + use crate::identity::adapters::output::db::postgres::employee_view::EmployeeView; + use crate::identity::domain::aggregate::*; + use crate::identity::domain::employee_aggregate::*; + + pub async fn create_dummy_employee(e: &Employee, db: &DBOutPostgresAdapter) { + sqlx::query!( + "INSERT INTO cqrs_identity_employee_query ( + version, + emp_id, + first_name, + last_name, + phone_number_number, + phone_number_country_code, + phone_verified, + deleted + + ) VALUES ( + $1, $2, $3, $4, $5, $6, $7, $8 + );", + 0, + e.emp_id(), + e.first_name(), + e.last_name(), + *e.phone_number().number() as i64, + *e.phone_number().country_code() as i32, + *e.phone_verified(), + *e.deleted(), + ) + .execute(&db.pool) + .await + .unwrap(); + } + + #[actix_rt::test] + async fn test_postgres_emp_id_exists() { + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + let e = Employee::default(); + + // state doesn't exist + assert!(!db.emp_id_exists(e.emp_id()).await.unwrap()); + + create_dummy_employee(&e, &db).await; + + // state exists + assert!(db.emp_id_exists(e.emp_id()).await.unwrap()); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/employee_view.rs b/src/identity/adapters/output/db/postgres/employee_view.rs new file mode 100644 index 0000000..8037ee3 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/employee_view.rs @@ -0,0 +1,430 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use std::str::FromStr; + +use async_trait::async_trait; +use cqrs_es::persist::{PersistenceError, ViewContext, ViewRepository}; +use cqrs_es::{EventEnvelope, Query, View}; +use serde::{Deserialize, Serialize}; +use time::OffsetDateTime; +use uuid::Uuid; + +use super::errors::*; +use super::DBOutPostgresAdapter; +use crate::identity::application::services::events::IdentityEvent; +use crate::identity::domain::employee_aggregate::*; +use crate::types::currency::{self, Currency, PriceBuilder}; +use crate::utils::parse_aggregate_id::parse_aggregate_id; + +pub const NEW_BILL_NON_UUID: &str = "identity_new_bill_non_uuid-asdfa"; + +// The view for a Employee query, for a standard http application this should +// be designed to reflect the response dto that will be returned to a user. +#[derive(Debug, Serialize, Deserialize)] +pub struct EmployeeView { + created_time: OffsetDateTime, + first_name: String, + last_name: String, + emp_id: Uuid, + phone_number_country_code: i32, + phone_number_number: i64, + + phone_verified: bool, + store_id: Option, + deleted: bool, +} + +impl From for Employee { + fn from(v: EmployeeView) -> Self { + EmployeeBuilder::default() + .first_name(v.first_name) + .last_name(v.last_name) + .phone_number( + PhoneNumberBuilder::default() + .number(v.phone_number_number as u64) + .country_code(v.phone_number_country_code as usize) + .build() + .unwrap(), + ) + .emp_id(v.emp_id) + .phone_verified(v.phone_verified) + .store_id(v.store_id) + .deleted(v.deleted) + .build() + .unwrap() + } +} + +impl Default for EmployeeView { + fn default() -> Self { + let e = Employee::default(); + Self { + created_time: OffsetDateTime::now_utc(), + first_name: e.first_name().clone(), + last_name: e.last_name().clone(), + phone_number_number: *e.phone_number().number() as i64, + phone_number_country_code: *e.phone_number().country_code() as i32, + phone_verified: *e.phone_verified(), + emp_id: *e.emp_id(), + store_id: e.store_id().clone(), + deleted: false, + } + } +} + +impl EmployeeView { + fn merge(&mut self, e: &Employee) { + self.first_name = e.first_name().clone(); + self.last_name = e.last_name().clone(); + self.phone_number_number = *e.phone_number().number() as i64; + self.phone_number_country_code = *e.phone_number().country_code() as i32; + self.phone_verified = *e.phone_verified(); + self.emp_id = *e.emp_id(); + self.store_id = e.store_id().clone(); + self.deleted = *e.deleted(); + } +} + +// This updates the view with events as they are committed. +// The logic should be minimal here, e.g., don't calculate the account balance, +// design the events to carry the balance information instead. +impl View for EmployeeView { + fn update(&mut self, event: &EventEnvelope) { + match &event.payload { + IdentityEvent::EmployeeRegistered(e) => self.merge(e.employee()), + IdentityEvent::EmployeeLoggedIn(e) => (), + IdentityEvent::EmployeeInitLoggedIn(e) => (), + IdentityEvent::ResentLoginOTP(e) => (), + IdentityEvent::PhoneNumberVerified(e) => self.phone_verified = true, + IdentityEvent::VerificationOTPResent(e) => (), + IdentityEvent::PhoneNumberChanged(e) => unimplemented!(), + IdentityEvent::InviteAccepted(e) => self.store_id = Some(*e.store_id()), + IdentityEvent::OrganizationExited(e) => self.store_id = None, + + _ => (), + } + } +} + +#[async_trait] +impl ViewRepository for DBOutPostgresAdapter { + async fn load(&self, emp_id: &str) -> Result, PersistenceError> { + let emp_id = match parse_aggregate_id(emp_id, NEW_BILL_NON_UUID)? { + Some((val, _)) => return Ok(Some(val)), + None => Uuid::parse_str(emp_id).unwrap(), + }; + + let res = sqlx::query_as!( + EmployeeView, + "SELECT + created_time, + store_id, + emp_id, + first_name, + last_name, + phone_number_number, + phone_number_country_code, + phone_verified, + deleted + FROM + cqrs_identity_employee_query + WHERE + emp_id = $1;", + emp_id + ) + .fetch_one(&self.pool) + .await + .map_err(PostgresAggregateError::from)?; + Ok(Some(res)) + } + + async fn load_with_context( + &self, + emp_id: &str, + ) -> Result, PersistenceError> { + let emp_id = match parse_aggregate_id(emp_id, NEW_BILL_NON_UUID)? { + Some(val) => return Ok(Some(val)), + None => Uuid::parse_str(emp_id).unwrap(), + }; + + let res = sqlx::query_as!( + EmployeeView, + "SELECT + created_time, + store_id, + emp_id, + first_name, + last_name, + phone_number_number, + phone_number_country_code, + phone_verified, + deleted + + FROM + cqrs_identity_employee_query + WHERE + emp_id = $1;", + &emp_id, + ) + .fetch_one(&self.pool) + .await + .map_err(PostgresAggregateError::from)?; + + struct Context { + version: i64, + emp_id: Uuid, + } + + let ctx = sqlx::query_as!( + Context, + "SELECT + emp_id, version + FROM + cqrs_identity_employee_query + WHERE + emp_id = $1;", + emp_id + ) + .fetch_one(&self.pool) + .await + .map_err(PostgresAggregateError::from)?; + + let view_context = ViewContext::new(ctx.emp_id.to_string(), ctx.version); + Ok(Some((res, view_context))) + } + + async fn update_view( + &self, + view: EmployeeView, + context: ViewContext, + ) -> Result<(), PersistenceError> { + match context.version { + 0 => { + let version = context.version + 1; + sqlx::query!( + "INSERT INTO cqrs_identity_employee_query ( + version, + created_time, + store_id, + emp_id, + first_name, + last_name, + phone_number_number, + phone_number_country_code, + phone_verified, + deleted + + + ) VALUES ( + $1, $2, $3, $4, $5, $6, $7, $8, $9, $10 + );", + version, + view.created_time, + view.store_id, + view.emp_id, + view.first_name, + view.last_name, + view.phone_number_number, + view.phone_number_country_code, + view.phone_verified, + view.deleted, + ) + .execute(&self.pool) + .await + .map_err(PostgresAggregateError::from)?; + } + _ => { + let version = context.version + 1; + sqlx::query!( + "UPDATE + cqrs_identity_employee_query + SET + version = $1, + + created_time = $2, + store_id = $3, + first_name = $4, + last_name = $5, + phone_number_number = $6, + phone_number_country_code = $7, + phone_verified = $8, + + + deleted = $9;", + version, + view.created_time, + view.store_id, + view.first_name, + view.last_name, + view.phone_number_number, + view.phone_number_country_code, + view.phone_verified, + view.deleted, + ) + .execute(&self.pool) + .await + .map_err(PostgresAggregateError::from)?; + } + } + + Ok(()) + } +} + +#[async_trait] +impl Query for DBOutPostgresAdapter { + async fn dispatch(&self, emp_id: &str, events: &[EventEnvelope]) { + let res = self.load_with_context(emp_id).await.unwrap_or_else(|_| { + Some((EmployeeView::default(), ViewContext::new(emp_id.into(), 0))) + }); + let (mut view, view_context): (EmployeeView, ViewContext) = res.unwrap(); + for event in events { + view.update(event); + } + self.update_view(view, view_context).await.unwrap(); + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use postgres_es::PostgresCqrs; + + use crate::{ + db::migrate::*, + identity::{ + application::{ + port::output::{ + db::get_verification_otp::GetVerificationOTPOutDBPort, + phone::account_validation_otp::mock_account_validation_otp_phone_port, + }, + services::{ + employee_register_service::*, employee_verify_phone_number_service::*, + IdentityCommand, MockIdentityServicesInterface, + }, + }, + domain::{ + employee_aggregate::*, employee_register_command::*, verify_phone_number_command::*, + }, + }, + tests::bdd::*, + utils::{random_number::tests::mock_generate_random_number, uuid::tests::*}, + }; + use std::sync::Arc; + + #[actix_rt::test] + async fn pg_query_identity_employee_view() { + let settings = crate::settings::tests::get_settings().await; + //let settings = crate::settings::Settings::new().unwrap(); + settings.create_db().await; + + let db = crate::db::sqlx_postgres::Postgres::init(&settings.database.url).await; + db.migrate().await; + let db = DBOutPostgresAdapter::new(db.pool.clone()); + + let queries: Vec>> = vec![Box::new(db.clone())]; + + let mut mock_services = MockIdentityServicesInterface::new(); + + //let store = Store::default(); + //crate::identity::adapters::output::db::postgres::store_id_exists::tests::create_dummy_store_record(&store, &db).await; + + let db2 = Arc::new(db.clone()); + mock_services + .expect_employee_register_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .returning(move || { + Arc::new( + EmployeeRegisterUserServiceBuilder::default() + .db_emp_id_exists_adapter(db2.clone()) + .db_create_verification_otp_adapter(db2.clone()) + .db_phone_exists_adapter(db2.clone()) + .random_number_adapter(mock_generate_random_number( + IS_CALLED_ONLY_ONCE, + 999, + )) + .phone_account_validation_otp_adapter( + mock_account_validation_otp_phone_port(IS_CALLED_ONLY_ONCE), + ) + .build() + .unwrap(), + ) + }); + + let db2 = Arc::new(db.clone()); + mock_services + .expect_employee_verify_phone_number_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .returning(move || { + Arc::new( + EmployeeVerifyPhoneNumberServiceBuilder::default() + .db_get_emp_id_from_phone_number_adapter(db2.clone()) + .db_delete_verification_otp(db2.clone()) + .db_get_verification_otp(db2.clone()) + .build() + .unwrap(), + ) + }); + + let (cqrs, employee_query): ( + Arc>, + Arc>, + ) = ( + Arc::new(postgres_es::postgres_cqrs( + db.pool.clone(), + queries, + Arc::new(mock_services), + )), + Arc::new(db.clone()), + ); + + let cmd = EmployeeRegisterCommandBuilder::default() + .first_name("foooint".into()) + .last_name("foooint".into()) + .phone_number(PhoneNumber::default()) + .emp_id(Uuid::new_v4()) + .build() + .unwrap(); + + let emp_id_str = cmd.emp_id().to_string(); + + cqrs.execute(&emp_id_str, IdentityCommand::EmployeeRegister(cmd.clone())) + .await + .unwrap(); + let emp = employee_query.load(&emp_id_str).await.unwrap().unwrap(); + let emp: Employee = emp.into(); + assert_eq!(emp.first_name(), cmd.first_name()); + assert_eq!(emp.last_name(), cmd.last_name()); + assert_eq!(emp.emp_id(), cmd.emp_id()); + assert_eq!(emp.phone_number(), cmd.phone_number()); + assert!(!*emp.phone_verified()); + assert!(!*emp.deleted()); + assert!(emp.store_id().is_none()); + + let otp = db + .get_verification_otp(emp.phone_number()) + .await + .unwrap() + .unwrap(); + cqrs.execute( + &emp_id_str, + IdentityCommand::EmployeeVerifyPhoneNumber( + VerifyPhoneNumberCommandBuilder::default() + .otp(otp.into()) + .phone_number(emp.phone_number().clone()) + .build() + .unwrap(), + ), + ) + .await + .unwrap(); + + let emp = employee_query.load(&emp_id_str).await.unwrap().unwrap(); + assert!(emp.phone_verified); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/errors.rs b/src/identity/adapters/output/db/postgres/errors.rs index bbde1ae..bc0befd 100644 --- a/src/identity/adapters/output/db/postgres/errors.rs +++ b/src/identity/adapters/output/db/postgres/errors.rs @@ -21,6 +21,10 @@ impl From for OutDBPortError { return Self::InternalError; } else if msg.contains("verification_otp_secret_key") { return Self::DuplicateVerificationOTPSecret; + } else if msg.contains("emp_login_otp_otp_key") { + return Self::DuplicateEmpLoginOTP; + } else if msg.contains("emp_verification_otp_otp_key") { + return Self::DuplicateEmpVerificationOTP; } else { println!("{msg}"); } diff --git a/src/identity/adapters/output/db/postgres/get_emp_id_from_phone_number.rs b/src/identity/adapters/output/db/postgres/get_emp_id_from_phone_number.rs new file mode 100644 index 0000000..6c0aca1 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/get_emp_id_from_phone_number.rs @@ -0,0 +1,81 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use uuid::Uuid; + +use super::errors::map_row_not_found_err; +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{errors::*, get_emp_id_from_phone_number::*}; +use crate::identity::domain::employee_aggregate::*; + +struct EmpID { + emp_id: Uuid, +} + +#[async_trait::async_trait] +impl GetEmpIDFromPhoneNumberOutDBPort for DBOutPostgresAdapter { + async fn get_emp_id_from_phone_number( + &self, + phone_number: &PhoneNumber, + ) -> OutDBPortResult { + let res = sqlx::query_as!( + EmpID, + "SELECT emp_id + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $1 + AND + phone_number_country_code = $2;", + *phone_number.number() as i64, + *phone_number.country_code() as i32, + ) + .fetch_one(&self.pool) + .await + .map_err(|e| map_row_not_found_err(e, OutDBPortError::PhoneNumberNotFound))?; + Ok(res.emp_id) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use crate::identity::adapters::output::db::postgres::emp_id_exists::tests::create_dummy_employee; + use crate::utils::uuid::tests::UUID; + + use crate::identity::adapters::output::db::postgres::employee_view::EmployeeView; + use crate::identity::domain::aggregate::*; + use crate::identity::domain::employee_aggregate::*; + + #[actix_rt::test] + async fn test_postgres_get_emp_id_from_phone() { + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + let e = Employee::default(); + + // state doesn't exist + assert_eq!( + db.get_emp_id_from_phone_number(e.phone_number()).await, + Err(OutDBPortError::PhoneNumberNotFound) + ); + + create_dummy_employee(&e, &db).await; + + // state exists + assert_eq!( + db.get_emp_id_from_phone_number(e.phone_number()) + .await + .unwrap(), + *e.emp_id() + ); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/get_login_otp.rs b/src/identity/adapters/output/db/postgres/get_login_otp.rs new file mode 100644 index 0000000..8139c75 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/get_login_otp.rs @@ -0,0 +1,97 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use uuid::Uuid; + +use super::errors::*; +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{errors::*, get_login_otp::*}; +use crate::identity::domain::employee_aggregate::*; + +#[async_trait::async_trait] +impl GetLoginOTPOutDBPort for DBOutPostgresAdapter { + async fn get_login_otp(&self, phone_number: &PhoneNumber) -> OutDBPortResult> { + struct Secret { + otp: i32, + } + let res = sqlx::query_as!( + Secret, + "SELECT + otp + FROM + emp_login_otp + WHERE + emp_id = ( + SELECT emp_id + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $1 + AND + phone_number_country_code = $2 + );", + *phone_number.number() as i64, + *phone_number.country_code() as i32, + ) + .fetch_one(&self.pool) + .await + .map_err(|e| map_row_not_found_err(e, OutDBPortError::EmpLoginOTPNotFound)); + + let res = match res { + Ok(res) => Some(res.otp as usize), + Err(OutDBPortError::EmpLoginOTPNotFound) => None, + Err(e) => return Err(e), + }; + + Ok(res) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + identity::{ + adapters::output::db::postgres::{ + create_login_otp::*, emp_id_exists::tests::create_dummy_employee, + }, + application::port::output::db::create_login_otp::*, + }, + utils::uuid::tests::UUID, + }; + + #[actix_rt::test] + async fn test_postgres_get_verification_secret() { + let otp = 999; + let e = Employee::default(); + + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + create_dummy_employee(&e, &db).await; + + assert!(db.get_login_otp(e.phone_number()).await.unwrap().is_none(),); + + db.create_login_otp( + CreateOTPMsgBuilder::default() + .otp(otp) + .emp_id(*e.emp_id()) + .build() + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!( + db.get_login_otp(e.phone_number()).await.unwrap(), + Some(otp.into()) + ); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/get_verification_otp.rs b/src/identity/adapters/output/db/postgres/get_verification_otp.rs new file mode 100644 index 0000000..2b0e09a --- /dev/null +++ b/src/identity/adapters/output/db/postgres/get_verification_otp.rs @@ -0,0 +1,104 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use uuid::Uuid; + +use super::errors::*; +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{errors::*, get_verification_otp::*}; +use crate::identity::domain::employee_aggregate::*; + +#[async_trait::async_trait] +impl GetVerificationOTPOutDBPort for DBOutPostgresAdapter { + async fn get_verification_otp( + &self, + phone_number: &PhoneNumber, + ) -> OutDBPortResult> { + struct Secret { + otp: i32, + } + let res = sqlx::query_as!( + Secret, + "SELECT + otp + FROM + emp_verification_otp + WHERE + emp_id = ( + SELECT emp_id + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $1 + AND + phone_number_country_code = $2 + );", + *phone_number.number() as i64, + *phone_number.country_code() as i32, + ) + .fetch_one(&self.pool) + .await + .map_err(|e| map_row_not_found_err(e, OutDBPortError::EmpVerificationOTPNotFound)); + + let res = match res { + Ok(res) => Some(res.otp as usize), + Err(OutDBPortError::EmpVerificationOTPNotFound) => None, + Err(e) => return Err(e), + }; + + Ok(res) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + identity::{ + adapters::output::db::postgres::{ + create_verification_otp::*, emp_id_exists::tests::create_dummy_employee, + }, + application::port::output::db::create_verification_otp::*, + }, + utils::uuid::tests::UUID, + }; + + #[actix_rt::test] + async fn test_postgres_get_verification_secret() { + let otp = 999; + let e = Employee::default(); + + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + create_dummy_employee(&e, &db).await; + + assert!(db + .get_verification_otp(e.phone_number()) + .await + .unwrap() + .is_none(),); + + db.create_verification_otp( + CreateOTPMsgBuilder::default() + .otp(otp) + .emp_id(*e.emp_id()) + .build() + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!( + db.get_verification_otp(e.phone_number()).await.unwrap(), + Some(otp.into()) + ); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/get_verification_secret.rs b/src/identity/adapters/output/db/postgres/get_verification_secret.rs index 3b70782..237c358 100644 --- a/src/identity/adapters/output/db/postgres/get_verification_secret.rs +++ b/src/identity/adapters/output/db/postgres/get_verification_secret.rs @@ -29,7 +29,7 @@ impl GetVerificationSecretOutDBPort for DBOutPostgresAdapter { ) .fetch_one(&self.pool) .await - .map_err(|e| map_row_not_found_err(e, OutDBPortError::VerificationOTPSecretNotFound))?; + .map_err(|e| map_row_not_found_err(e, OutDBPortError::VerificationOTPNotFound))?; Ok(res.secret) } } @@ -55,7 +55,7 @@ mod tests { ); assert_eq!( db.get_verification_secret(&user_id).await.err(), - Some(OutDBPortError::VerificationOTPSecretNotFound) + Some(OutDBPortError::VerificationOTPNotFound) ); let create_msg = CreateSecretMsgBuilder::default() diff --git a/src/identity/adapters/output/db/postgres/mod.rs b/src/identity/adapters/output/db/postgres/mod.rs index 9b57f8c..5092ebd 100644 --- a/src/identity/adapters/output/db/postgres/mod.rs +++ b/src/identity/adapters/output/db/postgres/mod.rs @@ -12,12 +12,27 @@ use crate::db::{migrate::RunMigrations, sqlx_postgres::Postgres}; pub mod create_verification_secret; pub mod delete_verification_secret; pub mod email_exists; +pub mod employee_view; mod errors; pub mod get_verification_secret; pub mod user_id_exists; pub mod user_view; pub mod verification_secret_exists; +pub mod create_login_otp; +pub mod create_verification_otp; +pub mod delete_login_otp; +pub mod delete_verification_otp; +pub mod emp_id_exists; +pub mod get_emp_id_from_phone_number; +pub mod get_login_otp; +pub mod get_verification_otp; +pub mod phone_exists; + +//pub mod get_invite; +//pub mod invite_id_exists; +//pub mod store_id_exists; + #[derive(Clone)] pub struct DBOutPostgresAdapter { pool: PgPool, diff --git a/src/identity/adapters/output/db/postgres/phone_exists.rs b/src/identity/adapters/output/db/postgres/phone_exists.rs new file mode 100644 index 0000000..5265ad0 --- /dev/null +++ b/src/identity/adapters/output/db/postgres/phone_exists.rs @@ -0,0 +1,69 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use uuid::Uuid; + +use super::DBOutPostgresAdapter; +use crate::identity::application::port::output::db::{errors::*, phone_exists::*}; +use crate::identity::domain::employee_aggregate::*; + +#[async_trait::async_trait] +impl PhoneNumberExistsOutDBPort for DBOutPostgresAdapter { + async fn phone_exists(&self, phone: &PhoneNumber) -> OutDBPortResult { + let res = sqlx::query!( + "SELECT EXISTS ( + SELECT 1 + FROM cqrs_identity_employee_query + WHERE + phone_number_number = $1 + AND + phone_number_country_code = $2 + );", + *phone.number() as i64, + *phone.country_code() as i32, + ) + .fetch_one(&self.pool) + .await?; + if let Some(x) = res.exists { + Ok(x) + } else { + Ok(false) + } + } +} + +#[cfg(test)] +pub mod tests { + use super::*; + + use crate::identity::adapters::output::db::postgres::emp_id_exists::tests::create_dummy_employee; + use crate::utils::uuid::tests::UUID; + + use crate::identity::adapters::output::db::postgres::employee_view::EmployeeView; + use crate::identity::domain::aggregate::*; + use crate::identity::domain::employee_aggregate::*; + + #[actix_rt::test] + async fn test_postgres_phone_exists() { + let settings = crate::settings::tests::get_settings().await; + settings.create_db().await; + let db = super::DBOutPostgresAdapter::new( + sqlx::postgres::PgPool::connect(&settings.database.url) + .await + .unwrap(), + ); + + let e = Employee::default(); + + // state doesn't exist + assert!(!db.phone_exists(e.phone_number()).await.unwrap()); + + create_dummy_employee(&e, &db).await; + + // state exists + assert!(db.phone_exists(e.phone_number()).await.unwrap()); + + settings.drop_db().await; + } +} diff --git a/src/identity/adapters/output/db/postgres/user_view.rs b/src/identity/adapters/output/db/postgres/user_view.rs index 0f27705..c5429a1 100644 --- a/src/identity/adapters/output/db/postgres/user_view.rs +++ b/src/identity/adapters/output/db/postgres/user_view.rs @@ -11,7 +11,7 @@ use uuid::Uuid; use super::errors::*; use super::DBOutPostgresAdapter; -use crate::identity::application::services::events::UserEvent; +use crate::identity::application::services::events::IdentityEvent; use crate::identity::domain::aggregate::User; use crate::utils::parse_aggregate_id::parse_aggregate_id; @@ -37,7 +37,7 @@ pub struct UserView { impl View for UserView { fn update(&mut self, event: &EventEnvelope) { match &event.payload { - UserEvent::UserRegistered(val) => { + IdentityEvent::UserRegistered(val) => { self.email = val.email().into(); self.hashed_password = val.hashed_password().into(); self.is_admin = val.is_admin().to_owned(); @@ -47,19 +47,20 @@ impl View for UserView { self.last_name = val.last_name().into(); self.user_id = *val.user_id(); } - UserEvent::UserDeleted => self.deleted = true, - UserEvent::Loggedin(_) => (), - UserEvent::PasswordUpdated(_) => (), - UserEvent::EmailUpdated(val) => { + IdentityEvent::UserDeleted => self.deleted = true, + IdentityEvent::Loggedin(_) => (), + IdentityEvent::PasswordUpdated(_) => (), + IdentityEvent::EmailUpdated(val) => { self.email = val.new_email().into(); } - UserEvent::UserVerified => { + IdentityEvent::UserVerified => { self.is_verified = true; } - UserEvent::UserPromotedToAdmin(_) => { + IdentityEvent::UserPromotedToAdmin(_) => { self.is_admin = true; } - UserEvent::VerificationEmailResent => (), + IdentityEvent::VerificationEmailResent => (), + _ => (), } } } @@ -169,10 +170,9 @@ impl ViewRepository for DBOutPostgresAdapter { "UPDATE user_query SET - user_id = $1, version = $2, first_name = $3, email = $4, - hashed_password = $5, is_admin = $6, is_verified = $7, deleted = $8, - last_name=$9;", - view.user_id, + version = $1, first_name = $2, email = $3, + hashed_password = $4, is_admin = $5, is_verified = $6, deleted = $7, + last_name=$8;", version, view.first_name, view.email, diff --git a/src/identity/application/port/output/db/create_login_otp.rs b/src/identity/application/port/output/db/create_login_otp.rs new file mode 100644 index 0000000..35d3fb5 --- /dev/null +++ b/src/identity/application/port/output/db/create_login_otp.rs @@ -0,0 +1,49 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Builder)] +pub struct CreateOTPMsg { + pub otp: usize, + pub emp_id: Uuid, +} +pub const REGISTRATION_OTP_PURPOSE: &str = "account_login"; + +#[automock] +#[async_trait::async_trait] +pub trait CreateLoginOTPOutDBPort: Send + Sync { + async fn create_login_otp(&self, msg: CreateOTPMsg) -> OutDBPortResult<()>; +} + +pub type CreateLoginOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_create_login_otp_db_port(times: Option) -> CreateLoginOTPOutDBPortObj { + let mut m = MockCreateLoginOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_create_login_otp() + .times(times) + .returning(|_| Ok(())); + } else { + m.expect_create_login_otp().returning(|_| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/create_verification_otp.rs b/src/identity/application/port/output/db/create_verification_otp.rs new file mode 100644 index 0000000..59a8136 --- /dev/null +++ b/src/identity/application/port/output/db/create_verification_otp.rs @@ -0,0 +1,51 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Builder)] +pub struct CreateOTPMsg { + pub otp: usize, + pub emp_id: Uuid, +} +pub const REGISTRATION_OTP_PURPOSE: &str = "account_validation"; + +#[automock] +#[async_trait::async_trait] +pub trait CreateVerificationOTPOutDBPort: Send + Sync { + async fn create_verification_otp(&self, msg: CreateOTPMsg) -> OutDBPortResult<()>; +} + +pub type CreateVerificationOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_create_verification_otp_db_port( + times: Option, + ) -> CreateVerificationOTPOutDBPortObj { + let mut m = MockCreateVerificationOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_create_verification_otp() + .times(times) + .returning(|_| Ok(())); + } else { + m.expect_create_verification_otp().returning(|_| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/delete_login_otp.rs b/src/identity/application/port/output/db/delete_login_otp.rs new file mode 100644 index 0000000..b0233d6 --- /dev/null +++ b/src/identity/application/port/output/db/delete_login_otp.rs @@ -0,0 +1,46 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +pub use super::create_login_otp::REGISTRATION_OTP_PURPOSE; +use super::errors::*; +use super::phone_exists; +use crate::identity::domain::employee_aggregate::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait DeleteLoginOTPOutDBPort: Send + Sync { + async fn delete_login_otp(&self, otp: usize, phone_number: &PhoneNumber) + -> OutDBPortResult<()>; +} + +pub type DeleteLoginOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_delete_login_otp_db_port(times: Option) -> DeleteLoginOTPOutDBPortObj { + let mut m = MockDeleteLoginOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_delete_login_otp() + .times(times) + .returning(|_, _| Ok(())); + } else { + m.expect_delete_login_otp().returning(|_, _| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/delete_verification_otp.rs b/src/identity/application/port/output/db/delete_verification_otp.rs new file mode 100644 index 0000000..c4a5332 --- /dev/null +++ b/src/identity/application/port/output/db/delete_verification_otp.rs @@ -0,0 +1,50 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; + +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait DeleteVerificationOTPOutDBPort: Send + Sync { + async fn delete_verification_otp( + &self, + otp: usize, + phone_number: &PhoneNumber, + ) -> OutDBPortResult<()>; +} + +pub type DeleteVerificationOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_delete_verification_otp_db_port( + times: Option, + ) -> DeleteVerificationOTPOutDBPortObj { + let mut m = MockDeleteVerificationOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_delete_verification_otp() + .times(times) + .returning(|_, _| Ok(())); + } else { + m.expect_delete_verification_otp().returning(|_, _| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/emp_id_exists.rs b/src/identity/application/port/output/db/emp_id_exists.rs new file mode 100644 index 0000000..ddb98b2 --- /dev/null +++ b/src/identity/application/port/output/db/emp_id_exists.rs @@ -0,0 +1,43 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; +use uuid::Uuid; + +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmpIDExistsOutDBPort: Send + Sync { + async fn emp_id_exists(&self, emp_id: &Uuid) -> OutDBPortResult; +} + +pub type EmpIDExistsOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_emp_id_exists_db_port( + times: Option, + returning: bool, + ) -> EmpIDExistsOutDBPortObj { + let mut m = MockEmpIDExistsOutDBPort::new(); + if let Some(times) = times { + m.expect_emp_id_exists() + .times(times) + .returning(move |_| Ok(returning)); + } else { + m.expect_emp_id_exists().returning(move |_| Ok(returning)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/errors.rs b/src/identity/application/port/output/db/errors.rs index fb34cd8..93df497 100644 --- a/src/identity/application/port/output/db/errors.rs +++ b/src/identity/application/port/output/db/errors.rs @@ -10,6 +10,12 @@ pub type OutDBPortResult = Result; #[derive(Debug, Display, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)] pub enum OutDBPortError { InternalError, + DuplicateEmpLoginOTP, + DuplicateEmpVerificationOTP, DuplicateVerificationOTPSecret, - VerificationOTPSecretNotFound, + VerificationSecretNotFound, + VerificationOTPNotFound, + PhoneNumberNotFound, + EmpLoginOTPNotFound, + EmpVerificationOTPNotFound, } diff --git a/src/identity/application/port/output/db/get_emp_id_from_phone_number.rs b/src/identity/application/port/output/db/get_emp_id_from_phone_number.rs new file mode 100644 index 0000000..eb12c7a --- /dev/null +++ b/src/identity/application/port/output/db/get_emp_id_from_phone_number.rs @@ -0,0 +1,47 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; +use uuid::Uuid; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; + +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait GetEmpIDFromPhoneNumberOutDBPort: Send + Sync { + async fn get_emp_id_from_phone_number(&self, phone: &PhoneNumber) -> OutDBPortResult; +} + +pub type GetEmpIDFromPhoneNumberOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + use std::sync::Arc; + + pub fn mock_get_emp_id_from_phone_number_db_port( + times: Option, + ) -> GetEmpIDFromPhoneNumberOutDBPortObj { + let mut m = MockGetEmpIDFromPhoneNumberOutDBPort::new(); + if let Some(times) = times { + m.expect_get_emp_id_from_phone_number() + .times(times) + .returning(move |_| Ok(UUID)); + } else { + m.expect_get_emp_id_from_phone_number() + .returning(move |_| Ok(UUID)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/get_invite.rs b/src/identity/application/port/output/db/get_invite.rs new file mode 100644 index 0000000..1a8131e --- /dev/null +++ b/src/identity/application/port/output/db/get_invite.rs @@ -0,0 +1,58 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait GetInviteOutDBPort: Send + Sync { + async fn get_invite(&self, invitge_id: Uuid) -> OutDBPortResult>; +} + +pub type GetInviteOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + use crate::utils::uuid::tests::*; + + pub fn mock_get_invite_db_port_returns_none(times: Option) -> GetInviteOutDBPortObj { + let mut m = MockGetInviteOutDBPort::new(); + if let Some(times) = times { + m.expect_get_invite() + .times(times) + .returning(move |_| Ok(None)); + } else { + m.expect_get_invite().returning(move |_| Ok(None)); + } + + Arc::new(m) + } + + pub fn mock_get_invite_db_port(times: Option) -> GetInviteOutDBPortObj { + let mut m = MockGetInviteOutDBPort::new(); + if let Some(times) = times { + m.expect_get_invite() + .times(times) + .returning(move |_| Ok(Some(UUID))); + } else { + m.expect_get_invite().returning(move |_| Ok(Some(UUID))); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/get_login_otp.rs b/src/identity/application/port/output/db/get_login_otp.rs new file mode 100644 index 0000000..8c1635c --- /dev/null +++ b/src/identity/application/port/output/db/get_login_otp.rs @@ -0,0 +1,59 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +pub use super::create_login_otp::REGISTRATION_OTP_PURPOSE; +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait GetLoginOTPOutDBPort: Send + Sync { + async fn get_login_otp(&self, phone_number: &PhoneNumber) -> OutDBPortResult>; +} + +pub type GetLoginOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_get_login_otp_db_port_returns_none( + times: Option, + ) -> GetLoginOTPOutDBPortObj { + let mut m = MockGetLoginOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_get_login_otp() + .times(times) + .returning(move |_| Ok(None)); + } else { + m.expect_get_login_otp().returning(move |_| Ok(None)); + } + + Arc::new(m) + } + + pub fn mock_get_login_otp_db_port(times: Option) -> GetLoginOTPOutDBPortObj { + let mut m = MockGetLoginOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_get_login_otp() + .times(times) + .returning(move |_| Ok(Some(0))); + } else { + m.expect_get_login_otp().returning(move |_| Ok(Some(0))); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/get_verification_otp.rs b/src/identity/application/port/output/db/get_verification_otp.rs new file mode 100644 index 0000000..27e991f --- /dev/null +++ b/src/identity/application/port/output/db/get_verification_otp.rs @@ -0,0 +1,65 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +pub use super::create_verification_otp::REGISTRATION_OTP_PURPOSE; +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait GetVerificationOTPOutDBPort: Send + Sync { + async fn get_verification_otp( + &self, + phone_number: &PhoneNumber, + ) -> OutDBPortResult>; +} + +pub type GetVerificationOTPOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_get_verification_otp_db_port_returns_none( + times: Option, + ) -> GetVerificationOTPOutDBPortObj { + let mut m = MockGetVerificationOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_get_verification_otp() + .times(times) + .returning(move |_| Ok(None)); + } else { + m.expect_get_verification_otp().returning(move |_| Ok(None)); + } + + Arc::new(m) + } + + pub fn mock_get_verification_otp_db_port( + times: Option, + ) -> GetVerificationOTPOutDBPortObj { + let mut m = MockGetVerificationOTPOutDBPort::new(); + if let Some(times) = times { + m.expect_get_verification_otp() + .times(times) + .returning(move |_| Ok(Some(0))); + } else { + m.expect_get_verification_otp() + .returning(move |_| Ok(Some(0))); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/invite_id_exists.rs b/src/identity/application/port/output/db/invite_id_exists.rs new file mode 100644 index 0000000..a283620 --- /dev/null +++ b/src/identity/application/port/output/db/invite_id_exists.rs @@ -0,0 +1,53 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; +use uuid::Uuid; + +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait InviteIDExistsDBPort: Send + Sync { + async fn invite_id_exists(&self, invite_id: &Uuid) -> OutDBPortResult; +} + +pub type InviteIDExistsDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_invite_id_exists_db_port_false(times: Option) -> InviteIDExistsDBPortObj { + let mut m = MockInviteIDExistsDBPort::new(); + if let Some(times) = times { + m.expect_invite_id_exists() + .times(times) + .returning(|_| Ok(false)); + } else { + m.expect_invite_id_exists().returning(|_| Ok(false)); + } + + Arc::new(m) + } + + pub fn mock_invite_id_exists_db_port_true(times: Option) -> InviteIDExistsDBPortObj { + let mut m = MockInviteIDExistsDBPort::new(); + if let Some(times) = times { + m.expect_invite_id_exists() + .times(times) + .returning(|_| Ok(true)); + } else { + m.expect_invite_id_exists().returning(|_| Ok(true)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/login_otp_exists.rs b/src/identity/application/port/output/db/login_otp_exists.rs new file mode 100644 index 0000000..2ce8582 --- /dev/null +++ b/src/identity/application/port/output/db/login_otp_exists.rs @@ -0,0 +1,52 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +pub use super::create_login_otp::REGISTRATION_OTP_PURPOSE; +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait LoginOTPExistsOutDBPort: Send + Sync { + async fn login_otp_exists( + &self, + otp: usize, + phone_number: &PhoneNumber, + ) -> OutDBPortResult; +} + +pub type LoginOTPExistsOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_login_otp_exists_db_port( + times: Option, + returning: bool, + ) -> LoginOTPExistsOutDBPortObj { + let mut m = MockLoginOTPExistsOutDBPort::new(); + if let Some(times) = times { + m.expect_login_otp_exists() + .times(times) + .returning(move |_, _| Ok(returning)); + } else { + m.expect_login_otp_exists() + .returning(move |_, _| Ok(returning)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/mod.rs b/src/identity/application/port/output/db/mod.rs index d3e2ec3..b6f884d 100644 --- a/src/identity/application/port/output/db/mod.rs +++ b/src/identity/application/port/output/db/mod.rs @@ -2,10 +2,23 @@ // // SPDX-License-Identifier: AGPL-3.0-or-later +pub mod create_login_otp; +pub mod create_verification_otp; pub mod create_verification_secret; +pub mod delete_login_otp; +pub mod delete_verification_otp; pub mod delete_verification_secret; pub mod email_exists; +pub mod emp_id_exists; pub mod errors; +pub mod get_emp_id_from_phone_number; +pub mod get_invite; +pub mod get_login_otp; +pub mod get_verification_otp; pub mod get_verification_secret; +pub mod invite_id_exists; +pub mod phone_exists; +pub mod store_id_exists; pub mod user_id_exists; +//pub mod verification_otp_exists; pub mod verification_secret_exists; diff --git a/src/identity/application/port/output/db/phone_exists.rs b/src/identity/application/port/output/db/phone_exists.rs new file mode 100644 index 0000000..aa04f27 --- /dev/null +++ b/src/identity/application/port/output/db/phone_exists.rs @@ -0,0 +1,44 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::*; + +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait PhoneNumberExistsOutDBPort: Send + Sync { + async fn phone_exists(&self, phone: &PhoneNumber) -> OutDBPortResult; +} + +pub type PhoneNumberExistsOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_phone_exists_db_port( + times: Option, + returning: bool, + ) -> PhoneNumberExistsOutDBPortObj { + let mut m = MockPhoneNumberExistsOutDBPort::new(); + if let Some(times) = times { + m.expect_phone_exists() + .times(times) + .returning(move |_| Ok(returning)); + } else { + m.expect_phone_exists().returning(move |_| Ok(returning)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/store_id_exists.rs b/src/identity/application/port/output/db/store_id_exists.rs new file mode 100644 index 0000000..4d53ac6 --- /dev/null +++ b/src/identity/application/port/output/db/store_id_exists.rs @@ -0,0 +1,53 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; +use uuid::Uuid; + +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait StoreIDExistsDBPort: Send + Sync { + async fn store_id_exists(&self, store_id: &Uuid) -> OutDBPortResult; +} + +pub type StoreIDExistsDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_store_id_exists_db_port_false(times: Option) -> StoreIDExistsDBPortObj { + let mut m = MockStoreIDExistsDBPort::new(); + if let Some(times) = times { + m.expect_store_id_exists() + .times(times) + .returning(|_| Ok(false)); + } else { + m.expect_store_id_exists().returning(|_| Ok(false)); + } + + Arc::new(m) + } + + pub fn mock_store_id_exists_db_port_true(times: Option) -> StoreIDExistsDBPortObj { + let mut m = MockStoreIDExistsDBPort::new(); + if let Some(times) = times { + m.expect_store_id_exists() + .times(times) + .returning(|_| Ok(true)); + } else { + m.expect_store_id_exists().returning(|_| Ok(true)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/db/verification_otp_exists.rs b/src/identity/application/port/output/db/verification_otp_exists.rs new file mode 100644 index 0000000..85bf873 --- /dev/null +++ b/src/identity/application/port/output/db/verification_otp_exists.rs @@ -0,0 +1,53 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +pub use super::create_verification_otp::REGISTRATION_OTP_PURPOSE; +use super::errors::*; +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Builder)] +pub struct VerifyOTPExistsMsg { + pub otp: String, + pub emp_id: Uuid, +} + +#[automock] +#[async_trait::async_trait] +pub trait VerificationOTPExistsOutDBPort: Send + Sync { + async fn verification_otp_exists(&self, msg: &VerifyOTPExistsMsg) -> OutDBPortResult; +} + +pub type VerificationOTPExistsOutDBPortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_verification_otp_exists_db_port( + times: Option, + returning: bool, + ) -> VerificationOTPExistsOutDBPortObj { + let mut m = MockVerificationOTPExistsOutDBPort::new(); + if let Some(times) = times { + m.expect_verification_otp_exists() + .times(times) + .returning(move |_| Ok(returning)); + } else { + m.expect_verification_otp_exists() + .returning(move |_| Ok(returning)); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/mod.rs b/src/identity/application/port/output/mod.rs index 7462528..abf311a 100644 --- a/src/identity/application/port/output/mod.rs +++ b/src/identity/application/port/output/mod.rs @@ -4,3 +4,4 @@ pub mod db; pub mod mailer; +pub mod phone; diff --git a/src/identity/application/port/output/phone/account_login_otp.rs b/src/identity/application/port/output/phone/account_login_otp.rs new file mode 100644 index 0000000..4a047a2 --- /dev/null +++ b/src/identity/application/port/output/phone/account_login_otp.rs @@ -0,0 +1,43 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::PhoneNumber; + +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait AccountLoginOTPOutPhonePort: Send + Sync { + async fn account_login_otp(&self, to: &PhoneNumber, otp: usize) -> OutPhonePortResult<()>; +} + +pub type AccountLoginOTPOutPhonePortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_account_login_otp_phone_port( + times: Option, + ) -> AccountLoginOTPOutPhonePortObj { + let mut m = MockAccountLoginOTPOutPhonePort::new(); + if let Some(times) = times { + m.expect_account_login_otp() + .times(times) + .returning(|_, _| Ok(())); + } else { + m.expect_account_login_otp().returning(|_, _| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/phone/account_validation_otp.rs b/src/identity/application/port/output/phone/account_validation_otp.rs new file mode 100644 index 0000000..6471146 --- /dev/null +++ b/src/identity/application/port/output/phone/account_validation_otp.rs @@ -0,0 +1,43 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use mockall::predicate::*; +use mockall::*; + +use super::errors::*; +use crate::identity::domain::employee_aggregate::PhoneNumber; + +#[cfg(test)] +#[allow(unused_imports)] +pub use tests::*; + +#[automock] +#[async_trait::async_trait] +pub trait AccountValidationOTPOutPhonePort: Send + Sync { + async fn account_validation_otp(&self, to: &PhoneNumber, otp: usize) -> OutPhonePortResult<()>; +} + +pub type AccountValidationOTPOutPhonePortObj = std::sync::Arc; + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_account_validation_otp_phone_port( + times: Option, + ) -> AccountValidationOTPOutPhonePortObj { + let mut m = MockAccountValidationOTPOutPhonePort::new(); + if let Some(times) = times { + m.expect_account_validation_otp() + .times(times) + .returning(|_, _| Ok(())); + } else { + m.expect_account_validation_otp().returning(|_, _| Ok(())); + } + + Arc::new(m) + } +} diff --git a/src/identity/application/port/output/phone/errors.rs b/src/identity/application/port/output/phone/errors.rs new file mode 100644 index 0000000..dfe76a4 --- /dev/null +++ b/src/identity/application/port/output/phone/errors.rs @@ -0,0 +1,13 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_more::Display; +use serde::{Deserialize, Serialize}; + +pub type OutPhonePortResult = Result; + +#[derive(Debug, Display, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)] +pub enum OutPhonePortError { + InternalError, +} diff --git a/src/identity/application/port/output/phone/mod.rs b/src/identity/application/port/output/phone/mod.rs new file mode 100644 index 0000000..b8755b5 --- /dev/null +++ b/src/identity/application/port/output/phone/mod.rs @@ -0,0 +1,7 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +pub mod account_login_otp; +pub mod account_validation_otp; +pub mod errors; diff --git a/src/identity/application/services/employee_accept_invite_service.rs b/src/identity/application/services/employee_accept_invite_service.rs new file mode 100644 index 0000000..f4fef1d --- /dev/null +++ b/src/identity/application/services/employee_accept_invite_service.rs @@ -0,0 +1,151 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use crate::identity::application::port::output::db::{emp_id_exists::*, get_invite::*}; +use crate::identity::domain::{accept_invite_command::*, invite_accepted_event::*}; + +use super::errors::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeAcceptInviteUseCase: Send + Sync { + async fn accept_invite(&self, cmd: AcceptInviteCommand) -> IdentityResult; + async fn reject_invite(&self, cmd: AcceptInviteCommand) -> IdentityResult; +} + +pub type EmployeeAcceptInviteServiceObj = std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeAcceptInviteService { + db_emp_id_exists_adapter: EmpIDExistsOutDBPortObj, + db_get_invite_adapter: GetInviteOutDBPortObj, +} + +#[async_trait::async_trait] +impl EmployeeAcceptInviteUseCase for EmployeeAcceptInviteService { + async fn reject_invite(&self, cmd: AcceptInviteCommand) -> IdentityResult { + todo!("also change input and output types"); + } + async fn accept_invite(&self, cmd: AcceptInviteCommand) -> IdentityResult { + if !self + .db_emp_id_exists_adapter + .emp_id_exists(cmd.emp_id()) + .await? + { + return Err(IdentityError::EmployeeNotFound); + } + + let invite = match self + .db_get_invite_adapter + .get_invite(*cmd.invite_id()) + .await? + { + None => return Err(IdentityError::InviteNotFound), + Some(invite) => invite, + }; + + Ok(InviteAcceptedEventBuilder::default() + .emp_id(*cmd.emp_id()) + .invite_id(*cmd.invite_id()) + .store_id(invite) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{tests::bdd::*, utils::uuid::tests::*}; + + use super::*; + + impl EmployeeAcceptInviteService { + pub fn mock_service( + times: Option, + cmd: AcceptInviteCommand, + ) -> EmployeeAcceptInviteServiceObj { + let res = InviteAcceptedEvent::get_event(&cmd); + let mut m = MockEmployeeAcceptInviteUseCase::default(); + + if let Some(times) = times { + m.expect_accept_invite() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_accept_invite().returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service() { + let s = EmployeeAcceptInviteServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_invite_adapter(mock_get_invite_db_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = AcceptInviteCommandBuilder::default() + .emp_id(UUID) + .invite_id(UUID) + .build() + .unwrap(); + + let res = s.accept_invite(cmd.clone()).await.unwrap(); + assert_eq!(*res.emp_id(), UUID); + assert_eq!(*res.invite_id(), UUID); + assert_eq!(*res.store_id(), UUID); + } + } + + #[actix_rt::test] + async fn test_service_invite_no_exist() { + let s = EmployeeAcceptInviteServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_invite_adapter(mock_get_invite_db_port_returns_none(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = AcceptInviteCommandBuilder::default() + .emp_id(UUID) + .invite_id(UUID) + .build() + .unwrap(); + + assert_eq!( + s.accept_invite(cmd.clone()).await.err(), + Some(IdentityError::InviteNotFound) + ); + } + } + + #[actix_rt::test] + async fn test_service_emp_no_exist() { + let s = EmployeeAcceptInviteServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, false)) + .db_get_invite_adapter(mock_get_invite_db_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = AcceptInviteCommandBuilder::default() + .emp_id(UUID) + .invite_id(UUID) + .build() + .unwrap(); + + assert_eq!( + s.accept_invite(cmd.clone()).await.err(), + Some(IdentityError::EmployeeNotFound) + ); + } + } +} diff --git a/src/identity/application/services/employee_change_phone_number_service.rs b/src/identity/application/services/employee_change_phone_number_service.rs new file mode 100644 index 0000000..e69de29 diff --git a/src/identity/application/services/employee_exit_organization_service.rs b/src/identity/application/services/employee_exit_organization_service.rs new file mode 100644 index 0000000..1649cb9 --- /dev/null +++ b/src/identity/application/services/employee_exit_organization_service.rs @@ -0,0 +1,151 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use crate::identity::application::port::output::db::{emp_id_exists::*, store_id_exists::*}; +use crate::identity::domain::{exit_organization_command::*, organization_exited_event::*}; + +use super::errors::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeExitOrganizationUseCase: Send + Sync { + async fn exit_organization( + &self, + cmd: ExitOrganizationCommand, + ) -> IdentityResult; +} + +pub type EmployeeExitOrganizationServiceObj = std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeExitOrganizationService { + db_emp_id_exists_adapter: EmpIDExistsOutDBPortObj, + db_store_id_exists_adapter: StoreIDExistsDBPortObj, +} + +#[async_trait::async_trait] +impl EmployeeExitOrganizationUseCase for EmployeeExitOrganizationService { + async fn exit_organization( + &self, + cmd: ExitOrganizationCommand, + ) -> IdentityResult { + if !self + .db_emp_id_exists_adapter + .emp_id_exists(cmd.emp_id()) + .await? + { + return Err(IdentityError::EmployeeNotFound); + } + + if !self + .db_store_id_exists_adapter + .store_id_exists(cmd.emp_id()) + .await? + { + return Err(IdentityError::StoreNotFound); + } + + Ok(OrganizationExitedEventBuilder::default() + .emp_id(*cmd.emp_id()) + .store_id(*cmd.store_id()) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{tests::bdd::*, utils::uuid::tests::*}; + + use super::*; + + impl EmployeeExitOrganizationService { + pub fn mock_service( + times: Option, + cmd: ExitOrganizationCommand, + ) -> EmployeeExitOrganizationServiceObj { + let res = OrganizationExitedEvent::get_event(&cmd); + let mut m = MockEmployeeExitOrganizationUseCase::default(); + + if let Some(times) = times { + m.expect_exit_organization() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_exit_organization() + .returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service() { + let s = EmployeeExitOrganizationServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_store_id_exists_adapter(mock_store_id_exists_db_port_true(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = ExitOrganizationCommandBuilder::default() + .emp_id(UUID) + .store_id(UUID) + .build() + .unwrap(); + + let res = s.exit_organization(cmd.clone()).await.unwrap(); + assert_eq!(*res.emp_id(), UUID); + assert_eq!(*res.store_id(), UUID); + } + } + + #[actix_rt::test] + async fn test_service_store_no_exist() { + let s = EmployeeExitOrganizationServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_store_id_exists_adapter(mock_store_id_exists_db_port_false(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = ExitOrganizationCommandBuilder::default() + .emp_id(UUID) + .store_id(UUID) + .build() + .unwrap(); + + assert_eq!( + s.exit_organization(cmd.clone()).await.err(), + Some(IdentityError::StoreNotFound) + ); + } + } + + #[actix_rt::test] + async fn test_service_emp_no_exist() { + let s = EmployeeExitOrganizationServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IS_CALLED_ONLY_ONCE, false)) + .db_store_id_exists_adapter(mock_store_id_exists_db_port_true(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = ExitOrganizationCommandBuilder::default() + .emp_id(UUID) + .store_id(UUID) + .build() + .unwrap(); + + assert_eq!( + s.exit_organization(cmd.clone()).await.err(), + Some(IdentityError::EmployeeNotFound) + ); + } + } +} diff --git a/src/identity/application/services/employee_login_service.rs b/src/identity/application/services/employee_login_service.rs new file mode 100644 index 0000000..9dbf518 --- /dev/null +++ b/src/identity/application/services/employee_login_service.rs @@ -0,0 +1,338 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use crate::identity::application::port::output::{ + db::{ + create_login_otp::*, delete_login_otp::*, emp_id_exists::*, + get_emp_id_from_phone_number::*, get_login_otp::*, phone_exists::*, + }, + phone::account_login_otp::*, +}; +use crate::identity::domain::{ + employee_aggregate::*, employee_logged_in_event::*, employee_login_command::*, +}; +use crate::utils::random_number::*; + +use super::employee_register_service::OTP_LEN; +use super::errors::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeLoginUseCase: Send + Sync { + async fn finish_login( + &self, + cmd: EmployeeFinishLoginCommand, + ) -> IdentityResult; + + async fn init_login( + &self, + cmd: EmployeeInitLoginCommand, + ) -> IdentityResult; +} + +pub type EmployeeLoginServiceObj = std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeLoginService { + db_phone_exists_adapter: PhoneNumberExistsOutDBPortObj, + db_get_emp_id_from_phone_number_adapter: GetEmpIDFromPhoneNumberOutDBPortObj, + db_create_login_otp_adapter: CreateLoginOTPOutDBPortObj, + db_delete_login_otp: DeleteLoginOTPOutDBPortObj, + db_get_login_otp: GetLoginOTPOutDBPortObj, + random_number_adapter: GenerateRandomNumberInterfaceObj, + phone_login_otp_adapter: AccountLoginOTPOutPhonePortObj, +} + +#[async_trait::async_trait] +impl EmployeeLoginUseCase for EmployeeLoginService { + async fn finish_login( + &self, + cmd: EmployeeFinishLoginCommand, + ) -> IdentityResult { + match self + .db_get_login_otp + .get_login_otp(cmd.phone_number()) + .await? + { + Some(otp) => { + if otp == *cmd.otp() { + self.db_delete_login_otp + .delete_login_otp(*cmd.otp(), cmd.phone_number()) + .await?; + } else { + return Err(IdentityError::LoginFailed); + } + } + None => return Err(IdentityError::LoginOTPNotFound), + } + let emp_id = self + .db_get_emp_id_from_phone_number_adapter + .get_emp_id_from_phone_number(cmd.phone_number()) + .await?; + + Ok(EmployeeLoggedInEventBuilder::default() + .emp_id(emp_id) + .build() + .unwrap()) + } + + async fn init_login( + &self, + cmd: EmployeeInitLoginCommand, + ) -> IdentityResult { + if !self + .db_phone_exists_adapter + .phone_exists(cmd.phone_number()) + .await? + { + return Err(IdentityError::PhoneNumberNotFound); + } + + let emp_id = self + .db_get_emp_id_from_phone_number_adapter + .get_emp_id_from_phone_number(cmd.phone_number()) + .await?; + + let otp = match self + .db_get_login_otp + .get_login_otp(cmd.phone_number()) + .await? + { + Some(otp) => otp, + None => { + let otp = self.random_number_adapter.get_random(OTP_LEN); + + self.db_create_login_otp_adapter + .create_login_otp( + CreateOTPMsgBuilder::default() + .otp(otp.clone()) + .emp_id(emp_id) + .build() + .unwrap(), + ) + .await + .unwrap(); + + otp + } + }; + + self.phone_login_otp_adapter + .account_login_otp(cmd.phone_number(), otp) + .await?; + + Ok(EmployeeInitLoggedInEventBuilder::default() + .emp_id(emp_id) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{ + tests::bdd::*, + utils::{random_number::tests::mock_generate_random_number, uuid::tests::*}, + }; + + use super::*; + + impl EmployeeLoginService { + pub fn mock_finish_login( + times: Option, + _cmd: EmployeeFinishLoginCommand, + ) -> EmployeeLoginServiceObj { + let res = EmployeeLoggedInEvent::get_event(); + + let mut m = MockEmployeeLoginUseCase::default(); + + if let Some(times) = times { + m.expect_finish_login() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_finish_login().returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + + pub fn mock_init_login( + times: Option, + cmd: EmployeeInitLoginCommand, + ) -> EmployeeLoginServiceObj { + let res = EmployeeInitLoggedInEvent::get_event(); + + let mut m = MockEmployeeLoginUseCase::default(); + + if let Some(times) = times { + m.expect_init_login() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_init_login().returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service_init_login() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_NEVER_CALLED)) + .db_get_login_otp(mock_get_login_otp_db_port_returns_none(IS_CALLED_ONLY_ONCE)) + .random_number_adapter(mock_generate_random_number(IS_CALLED_ONLY_ONCE, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = EmployeeInitLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + let res = s.init_login(cmd.clone()).await.unwrap(); + assert_eq!(res.emp_id(), &UUID) + } + } + + #[actix_rt::test] + async fn test_service_init_login_phone_doesnt_exist() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, false)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_NEVER_CALLED)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_NEVER_CALLED)) + .db_get_login_otp(mock_get_login_otp_db_port_returns_none(IS_NEVER_CALLED)) + .random_number_adapter(mock_generate_random_number(IS_NEVER_CALLED, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = EmployeeInitLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + let res = s.init_login(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::PhoneNumberNotFound)) + } + } + + #[actix_rt::test] + async fn test_service_init_login_otp_exists() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_NEVER_CALLED)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_NEVER_CALLED)) + .db_get_login_otp(mock_get_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .random_number_adapter(mock_generate_random_number(IS_NEVER_CALLED, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = EmployeeInitLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + let res = s.init_login(cmd.clone()).await.unwrap(); + assert_eq!(res.emp_id(), &UUID) + } + } + + #[actix_rt::test] + async fn test_service_finish_login() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_NEVER_CALLED, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_NEVER_CALLED)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .db_get_login_otp(mock_get_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .random_number_adapter(mock_generate_random_number(IS_NEVER_CALLED, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = EmployeeFinishLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp( + 0, // same as the val used in mock + ) + .build() + .unwrap(); + let res = s.finish_login(cmd.clone()).await.unwrap(); + assert_eq!(*res.emp_id(), UUID); + } + } + + #[actix_rt::test] + async fn test_service_finish_login_wrong_otp() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_NEVER_CALLED, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_NEVER_CALLED)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_NEVER_CALLED)) + .db_get_login_otp(mock_get_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .random_number_adapter(mock_generate_random_number(IS_NEVER_CALLED, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = EmployeeFinishLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp(9999) + .build() + .unwrap(); + let res = s.finish_login(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::LoginFailed)); + } + } + + #[actix_rt::test] + async fn test_service_finish_login_otp_doesnt_exist() { + let s = EmployeeLoginServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_NEVER_CALLED, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_create_login_otp_adapter(mock_create_login_otp_db_port(IS_NEVER_CALLED)) + .db_delete_login_otp(mock_delete_login_otp_db_port(IS_NEVER_CALLED)) + .db_get_login_otp(mock_get_login_otp_db_port_returns_none(IS_CALLED_ONLY_ONCE)) + .random_number_adapter(mock_generate_random_number(IS_NEVER_CALLED, 0)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = EmployeeFinishLoginCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp(0) + .build() + .unwrap(); + let res = s.finish_login(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::LoginOTPNotFound)); + } + } +} diff --git a/src/identity/application/services/employee_register_service.rs b/src/identity/application/services/employee_register_service.rs new file mode 100644 index 0000000..2141690 --- /dev/null +++ b/src/identity/application/services/employee_register_service.rs @@ -0,0 +1,221 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use super::errors::*; +use super::*; +use crate::identity::application::port::output::{ + db::{create_verification_otp::*, emp_id_exists::*, phone_exists::*}, + phone::account_validation_otp::*, +}; +use crate::identity::domain::{ + employee_aggregate::*, employee_register_command::*, employee_registered_event::*, +}; +use crate::utils::random_number::*; + +pub const OTP_LEN: u32 = 6; + +#[derive(Builder)] +pub struct EmployeeRegisterUserService { + db_phone_exists_adapter: PhoneNumberExistsOutDBPortObj, + db_emp_id_exists_adapter: EmpIDExistsOutDBPortObj, + db_create_verification_otp_adapter: CreateVerificationOTPOutDBPortObj, + phone_account_validation_otp_adapter: AccountValidationOTPOutPhonePortObj, + random_number_adapter: GenerateRandomNumberInterfaceObj, +} + +pub type EmployeeRegisterServiceObj = std::sync::Arc; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeRegisterUserUseCase: Send + Sync { + async fn register_employee( + &self, + cmd: EmployeeRegisterCommand, + ) -> IdentityResult; +} + +#[async_trait::async_trait] +impl EmployeeRegisterUserUseCase for EmployeeRegisterUserService { + async fn register_employee( + &self, + cmd: EmployeeRegisterCommand, + ) -> IdentityResult { + if self + .db_phone_exists_adapter + .phone_exists(cmd.phone_number()) + .await + .unwrap() + { + return Err(IdentityError::DuplicatePhoneNumber); + } + + if self + .db_emp_id_exists_adapter + .emp_id_exists(cmd.emp_id()) + .await + .unwrap() + { + return Err(IdentityError::DuplicateEmployeeID); + } + + let otp = self.random_number_adapter.get_random(OTP_LEN); + + self.db_create_verification_otp_adapter + .create_verification_otp( + CreateOTPMsgBuilder::default() + .otp(otp.clone()) + .emp_id(*cmd.emp_id()) + .build() + .unwrap(), + ) + .await + .unwrap(); + + self.phone_account_validation_otp_adapter + .account_validation_otp(cmd.phone_number(), otp) + .await?; + + let e = EmployeeBuilder::default() + .first_name(cmd.first_name().clone()) + .last_name(cmd.last_name().clone()) + .emp_id(*cmd.emp_id()) + .phone_number(cmd.phone_number().clone()) + .phone_verified(false) + .deleted(false) + .build() + .unwrap(); + + Ok(EmployeeRegisteredEventBuilder::default() + .employee(e) + .build() + .unwrap()) + } +} + +#[cfg(test)] +pub mod tests { + use super::*; + + use crate::tests::bdd::*; + use crate::utils::random_number::tests::*; + use crate::utils::uuid::tests::*; + + impl EmployeeRegisterUserService { + pub fn mock( + times: Option, + cmd: EmployeeRegisterCommand, + ) -> EmployeeRegisterServiceObj { + let res = EmployeeRegisteredEventBuilder::default() + .employee( + EmployeeBuilder::default() + .first_name(cmd.first_name().clone()) + .last_name(cmd.last_name().clone()) + .emp_id(*cmd.emp_id()) + .phone_number(cmd.phone_number().clone()) + .phone_verified(false) + .deleted(false) + .build() + .unwrap(), + ) + .build() + .unwrap(); + + let mut m = MockEmployeeRegisterUserUseCase::default(); + + if let Some(times) = times { + m.expect_register_employee() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_register_employee() + .returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service() { + let username = "realaravinth"; + let phone_number = PhoneNumber::default(); + + let cmd = EmployeeRegisterCommandBuilder::default() + .first_name(username.into()) + .last_name(username.into()) + .phone_number(phone_number) + .emp_id(UUID) + .build() + .unwrap(); + + let s = EmployeeRegisterUserServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port( + IS_CALLED_ONLY_ONCE, + RETURNS_FALSE, + )) + .db_create_verification_otp_adapter(mock_create_verification_otp_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_phone_exists_adapter(mock_phone_exists_db_port( + IS_CALLED_ONLY_ONCE, + RETURNS_FALSE, + )) + .random_number_adapter(mock_generate_random_number( + IS_CALLED_ONLY_ONCE, + RETURNS_RANDOM_NUMBER.into(), + )) + .phone_account_validation_otp_adapter(mock_account_validation_otp_phone_port( + IS_CALLED_ONLY_ONCE, + )) + .build() + .unwrap(); + + let res = s.register_employee(cmd.clone()).await.unwrap(); + let emp = res.employee(); + assert_eq!(emp.first_name(), cmd.first_name()); + assert_eq!(emp.last_name(), cmd.last_name()); + assert_eq!(emp.emp_id(), &UUID); + assert_eq!(emp.phone_number(), cmd.phone_number()); + assert!(!emp.deleted()); + assert!(!emp.phone_verified()); + } + #[actix_rt::test] + async fn test_service_phone_exists() { + let username = "realaravinth"; + let phone_number = PhoneNumber::default(); + + let cmd = EmployeeRegisterCommandBuilder::default() + .first_name(username.into()) + .last_name(username.into()) + .phone_number(phone_number) + .emp_id(UUID) + .build() + .unwrap(); + + let s = EmployeeRegisterUserServiceBuilder::default() + .db_emp_id_exists_adapter(mock_emp_id_exists_db_port(IGNORE_CALL_COUNT, RETURNS_FALSE)) + .db_create_verification_otp_adapter(mock_create_verification_otp_db_port( + IS_NEVER_CALLED, + )) + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, RETURNS_TRUE)) + .random_number_adapter(mock_generate_random_number( + IS_NEVER_CALLED, + RETURNS_RANDOM_NUMBER.into(), + )) + .phone_account_validation_otp_adapter(mock_account_validation_otp_phone_port( + IS_NEVER_CALLED, + )) + .build() + .unwrap(); + + assert_eq!( + s.register_employee(cmd.clone()).await.err(), + Some(IdentityError::DuplicatePhoneNumber) + ); + } +} diff --git a/src/identity/application/services/employee_resend_login_otp_service.rs b/src/identity/application/services/employee_resend_login_otp_service.rs new file mode 100644 index 0000000..94676c5 --- /dev/null +++ b/src/identity/application/services/employee_resend_login_otp_service.rs @@ -0,0 +1,172 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use crate::identity::application::port::output::{ + db::{ + create_login_otp::*, delete_login_otp::*, emp_id_exists::*, + get_emp_id_from_phone_number::*, get_login_otp::*, phone_exists::*, + }, + phone::account_login_otp::*, +}; +use crate::identity::domain::{ + employee_aggregate::*, resend_login_otp_command::*, resend_login_otp_event::*, +}; +use crate::utils::random_number::*; + +use super::employee_register_service::OTP_LEN; +use super::errors::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeResendLoginOTPUseCase: Send + Sync { + async fn resend_otp(&self, cmd: ResendLoginOTPCommand) -> IdentityResult; +} + +pub type EmployeeResendLoginOTPServiceObj = std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeResendLoginOTPService { + db_phone_exists_adapter: PhoneNumberExistsOutDBPortObj, + db_get_emp_id_from_phone_number_adapter: GetEmpIDFromPhoneNumberOutDBPortObj, + db_get_login_otp: GetLoginOTPOutDBPortObj, + phone_login_otp_adapter: AccountLoginOTPOutPhonePortObj, +} + +#[async_trait::async_trait] +impl EmployeeResendLoginOTPUseCase for EmployeeResendLoginOTPService { + async fn resend_otp(&self, cmd: ResendLoginOTPCommand) -> IdentityResult { + if !self + .db_phone_exists_adapter + .phone_exists(cmd.phone_number()) + .await? + { + return Err(IdentityError::PhoneNumberNotFound); + } + + let otp = match self + .db_get_login_otp + .get_login_otp(cmd.phone_number()) + .await? + { + Some(otp) => otp, + None => { + return Err(IdentityError::LoginOTPNotFound); + } + }; + + self.phone_login_otp_adapter + .account_login_otp(cmd.phone_number(), otp) + .await?; + + let emp_id = self + .db_get_emp_id_from_phone_number_adapter + .get_emp_id_from_phone_number(cmd.phone_number()) + .await?; + Ok(ResentLoginOTPEventBuilder::default() + .emp_id(emp_id) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{ + tests::bdd::*, + utils::{random_number::tests::mock_generate_random_number, uuid::tests::*}, + }; + + use super::*; + + impl EmployeeResendLoginOTPService { + pub fn mock_service( + times: Option, + _cmd: ResendLoginOTPCommand, + ) -> EmployeeResendLoginOTPServiceObj { + let res = ResentLoginOTPEvent::get_event(); + let mut m = MockEmployeeResendLoginOTPUseCase::default(); + + if let Some(times) = times { + m.expect_resend_otp() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_resend_otp().returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service_init_login() { + let s = EmployeeResendLoginOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_get_login_otp(mock_get_login_otp_db_port(IS_CALLED_ONLY_ONCE)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = ResendLoginOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + let res = s.resend_otp(cmd.clone()).await.unwrap(); + assert_eq!(res.emp_id(), &UUID); + } + } + + #[actix_rt::test] + async fn test_service_phone_doesnt_exist() { + let s = EmployeeResendLoginOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, false)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_get_login_otp(mock_get_login_otp_db_port_returns_none(IS_NEVER_CALLED)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = ResendLoginOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + + let res = s.resend_otp(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::PhoneNumberNotFound)) + } + } + + #[actix_rt::test] + async fn test_service_otp_doesnt_exist() { + let s = EmployeeResendLoginOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_get_login_otp(mock_get_login_otp_db_port_returns_none(IS_CALLED_ONLY_ONCE)) + .phone_login_otp_adapter(mock_account_login_otp_phone_port(IS_NEVER_CALLED)) + .build() + .unwrap(); + + { + let cmd = ResendLoginOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + + let res = s.resend_otp(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::LoginOTPNotFound)) + } + } +} diff --git a/src/identity/application/services/employee_resend_verification_otp_service.rs b/src/identity/application/services/employee_resend_verification_otp_service.rs new file mode 100644 index 0000000..c7615d6 --- /dev/null +++ b/src/identity/application/services/employee_resend_verification_otp_service.rs @@ -0,0 +1,185 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use super::errors::*; +use crate::identity::domain::resend_verification_otp_command::*; +use crate::identity::{ + application::port::output::{ + db::{get_emp_id_from_phone_number::*, get_verification_otp::*, phone_exists::*}, + phone::account_validation_otp::*, + }, + domain::verification_otp_resent_event::*, +}; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeResendVerificationOTPUseCase: Send + Sync { + async fn resend_otp( + &self, + cmd: ResendVerificationOTPCommand, + ) -> IdentityResult; +} + +pub type EmployeeResendVerificationOTPServiceObj = + std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeResendVerificationOTPService { + db_phone_exists_adapter: PhoneNumberExistsOutDBPortObj, + db_get_emp_id_from_phone_number_adapter: GetEmpIDFromPhoneNumberOutDBPortObj, + db_get_verification_otp: GetVerificationOTPOutDBPortObj, + phone_account_validation_otp_adapter: AccountValidationOTPOutPhonePortObj, +} + +#[async_trait::async_trait] +impl EmployeeResendVerificationOTPUseCase for EmployeeResendVerificationOTPService { + async fn resend_otp( + &self, + cmd: ResendVerificationOTPCommand, + ) -> IdentityResult { + if !self + .db_phone_exists_adapter + .phone_exists(cmd.phone_number()) + .await? + { + return Err(IdentityError::PhoneNumberNotFound); + } + + let otp = match self + .db_get_verification_otp + .get_verification_otp(cmd.phone_number()) + .await? + { + Some(otp) => otp, + None => { + return Err(IdentityError::VerificationOTPNotFound); + } + }; + + self.phone_account_validation_otp_adapter + .account_validation_otp(cmd.phone_number(), otp) + .await?; + + let emp_id = self + .db_get_emp_id_from_phone_number_adapter + .get_emp_id_from_phone_number(cmd.phone_number()) + .await?; + Ok(VerificationOTPResentEventBuilder::default() + .emp_id(emp_id) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{ + identity::{application::services::ResendLoginOTPCommand, domain::employee_aggregate::*}, + tests::bdd::*, + utils::uuid::tests::*, + }; + + use super::*; + + impl EmployeeResendVerificationOTPService { + pub fn mock_service( + times: Option, + _cmd: ResendVerificationOTPCommand, + ) -> EmployeeResendVerificationOTPServiceObj { + let res = VerificationOTPResentEvent::get_event(); + let mut m = MockEmployeeResendVerificationOTPUseCase::default(); + + if let Some(times) = times { + m.expect_resend_otp() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_resend_otp().returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service_init_login() { + let s = EmployeeResendVerificationOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_get_verification_otp(mock_get_verification_otp_db_port(IS_CALLED_ONLY_ONCE)) + .phone_account_validation_otp_adapter(mock_account_validation_otp_phone_port( + IS_CALLED_ONLY_ONCE, + )) + .build() + .unwrap(); + + { + let cmd = ResendVerificationOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + let res = s.resend_otp(cmd.clone()).await.unwrap(); + assert_eq!(res.emp_id(), &UUID); + } + } + + #[actix_rt::test] + async fn test_service_phone_doesnt_exist() { + let s = EmployeeResendVerificationOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, false)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_get_verification_otp(mock_get_verification_otp_db_port_returns_none( + IS_NEVER_CALLED, + )) + .phone_account_validation_otp_adapter(mock_account_validation_otp_phone_port( + IS_NEVER_CALLED, + )) + .build() + .unwrap(); + + { + let cmd = ResendVerificationOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + + let res = s.resend_otp(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::PhoneNumberNotFound)) + } + } + + #[actix_rt::test] + async fn test_service_otp_doesnt_exist() { + let s = EmployeeResendVerificationOTPServiceBuilder::default() + .db_phone_exists_adapter(mock_phone_exists_db_port(IS_CALLED_ONLY_ONCE, true)) + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_get_verification_otp(mock_get_verification_otp_db_port_returns_none( + IS_CALLED_ONLY_ONCE, + )) + .phone_account_validation_otp_adapter(mock_account_validation_otp_phone_port( + IS_NEVER_CALLED, + )) + .build() + .unwrap(); + + { + let cmd = ResendVerificationOTPCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .build() + .unwrap(); + + let res = s.resend_otp(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::VerificationOTPNotFound)) + } + } +} diff --git a/src/identity/application/services/employee_verify_phone_number_service.rs b/src/identity/application/services/employee_verify_phone_number_service.rs new file mode 100644 index 0000000..f8038d9 --- /dev/null +++ b/src/identity/application/services/employee_verify_phone_number_service.rs @@ -0,0 +1,166 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use mockall::predicate::*; +use mockall::*; + +use crate::identity::application::port::output::db::{ + delete_verification_otp::*, get_emp_id_from_phone_number::*, get_verification_otp::*, +}; +use crate::identity::domain::{phone_number_verified_event::*, verify_phone_number_command::*}; + +use super::errors::*; + +#[automock] +#[async_trait::async_trait] +pub trait EmployeeVerifyPhoneNumberUseCase: Send + Sync { + async fn verify_phone_number( + &self, + cmd: VerifyPhoneNumberCommand, + ) -> IdentityResult; +} + +pub type EmployeeVerifyPhoneNumberServiceObj = std::sync::Arc; + +#[derive(Clone, Builder)] +pub struct EmployeeVerifyPhoneNumberService { + db_get_emp_id_from_phone_number_adapter: GetEmpIDFromPhoneNumberOutDBPortObj, + db_delete_verification_otp: DeleteVerificationOTPOutDBPortObj, + db_get_verification_otp: GetVerificationOTPOutDBPortObj, +} + +#[async_trait::async_trait] +impl EmployeeVerifyPhoneNumberUseCase for EmployeeVerifyPhoneNumberService { + async fn verify_phone_number( + &self, + cmd: VerifyPhoneNumberCommand, + ) -> IdentityResult { + match self + .db_get_verification_otp + .get_verification_otp(cmd.phone_number()) + .await? + { + Some(otp) => { + if otp == *cmd.otp() { + self.db_delete_verification_otp + .delete_verification_otp(*cmd.otp(), cmd.phone_number()) + .await?; + } else { + return Err(IdentityError::PhoneNumberVerificationFailed); + } + } + None => return Err(IdentityError::VerificationOTPNotFound), + } + let emp_id = self + .db_get_emp_id_from_phone_number_adapter + .get_emp_id_from_phone_number(cmd.phone_number()) + .await?; + + Ok(PhoneNumberVerifiedEventBuilder::default() + .emp_id(emp_id) + .build() + .unwrap()) + } +} + +#[cfg(test)] +mod tests { + use crate::{identity::domain::employee_aggregate::*, tests::bdd::*, utils::uuid::tests::*}; + + use super::*; + + impl EmployeeVerifyPhoneNumberService { + pub fn mock_service( + times: Option, + _cmd: VerifyPhoneNumberCommand, + ) -> EmployeeVerifyPhoneNumberServiceObj { + let res = PhoneNumberVerifiedEvent::get_event(); + let mut m = MockEmployeeVerifyPhoneNumberUseCase::default(); + + if let Some(times) = times { + m.expect_verify_phone_number() + .times(times) + .returning(move |_| Ok(res.clone())); + } else { + m.expect_verify_phone_number() + .returning(move |_| Ok(res.clone())); + } + + std::sync::Arc::new(m) + } + } + + #[actix_rt::test] + async fn test_service_verify_phone_number() { + let s = EmployeeVerifyPhoneNumberServiceBuilder::default() + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_CALLED_ONLY_ONCE, + )) + .db_delete_verification_otp(mock_delete_verification_otp_db_port(IS_CALLED_ONLY_ONCE)) + .db_get_verification_otp(mock_get_verification_otp_db_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = VerifyPhoneNumberCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp( + 0, // same as the val used in mock + ) + .build() + .unwrap(); + let res = s.verify_phone_number(cmd.clone()).await.unwrap(); + assert_eq!(*res.emp_id(), UUID); + } + } + + #[actix_rt::test] + async fn test_service_verify_phone_number_wrong_otp() { + let s = EmployeeVerifyPhoneNumberServiceBuilder::default() + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_delete_verification_otp(mock_delete_verification_otp_db_port(IS_NEVER_CALLED)) + .db_get_verification_otp(mock_get_verification_otp_db_port(IS_CALLED_ONLY_ONCE)) + .build() + .unwrap(); + + { + let cmd = VerifyPhoneNumberCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp(9999) + .build() + .unwrap(); + let res = s.verify_phone_number(cmd.clone()).await; + assert_eq!( + res.err(), + Some(IdentityError::PhoneNumberVerificationFailed) + ); + } + } + + #[actix_rt::test] + async fn test_service_verify_phone_number_otp_doesnt_exist() { + let s = EmployeeVerifyPhoneNumberServiceBuilder::default() + .db_get_emp_id_from_phone_number_adapter(mock_get_emp_id_from_phone_number_db_port( + IS_NEVER_CALLED, + )) + .db_delete_verification_otp(mock_delete_verification_otp_db_port(IS_NEVER_CALLED)) + .db_get_verification_otp(mock_get_verification_otp_db_port_returns_none( + IS_CALLED_ONLY_ONCE, + )) + .build() + .unwrap(); + + { + let cmd = VerifyPhoneNumberCommandBuilder::default() + .phone_number(PhoneNumber::default()) + .otp(0) + .build() + .unwrap(); + let res = s.verify_phone_number(cmd.clone()).await; + assert_eq!(res.err(), Some(IdentityError::VerificationOTPNotFound)); + } + } +} diff --git a/src/identity/application/services/errors.rs b/src/identity/application/services/errors.rs index f03fe92..2730859 100644 --- a/src/identity/application/services/errors.rs +++ b/src/identity/application/services/errors.rs @@ -6,13 +6,29 @@ use argon2_creds::CredsError; use derive_more::{Display, Error}; use serde::{Deserialize, Serialize}; +use crate::identity::application::port::output::{ + db::errors::OutDBPortError, phone::errors::OutPhonePortError, +}; + pub type IdentityResult = Result; #[derive(Debug, Error, Display, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)] pub enum IdentityError { DuplicateUsername, - VerificationOTPSecretNotFound, + VerificationOTPNotFound, + VerificationSecretNotFound, + PhoneNumberVerificationFailed, + LoginOTPNotFound, + LoginFailed, DuplicateEmail, + DuplicateEmployeeID, + DuplicatePhoneNumber, + DuplicateVerificationOTP, + InternalError, + PhoneNumberNotFound, + EmployeeNotFound, + InviteNotFound, + StoreNotFound, } pub type IdentityCommandResult = Result; @@ -37,3 +53,27 @@ impl From for IdentityCommandError { } } } + +impl From for IdentityError { + fn from(v: OutPhonePortError) -> Self { + match v { + OutPhonePortError::InternalError => Self::InternalError, + } + } +} +impl From for IdentityError { + fn from(v: OutDBPortError) -> Self { + match v { + OutDBPortError::InternalError => Self::InternalError, + OutDBPortError::DuplicateVerificationOTPSecret => Self::DuplicateVerificationOTP, + OutDBPortError::VerificationSecretNotFound => Self::VerificationSecretNotFound, + OutDBPortError::VerificationOTPNotFound => Self::VerificationOTPNotFound, + OutDBPortError::DuplicateEmpLoginOTP | OutDBPortError::DuplicateEmpVerificationOTP => { + Self::InternalError + } + OutDBPortError::PhoneNumberNotFound => Self::PhoneNumberNotFound, + OutDBPortError::EmpLoginOTPNotFound => Self::LoginOTPNotFound, + OutDBPortError::EmpVerificationOTPNotFound => Self::VerificationOTPNotFound, + } + } +} diff --git a/src/identity/application/services/events.rs b/src/identity/application/services/events.rs index c3fc5cd..fc59564 100644 --- a/src/identity/application/services/events.rs +++ b/src/identity/application/services/events.rs @@ -11,8 +11,15 @@ use super::set_user_admin::events::*; use super::update_email::events::*; use super::update_password::events::*; +use crate::identity::domain::{ + employee_logged_in_event::*, employee_registered_event::*, invite_accepted_event::*, + login_otp_sent_event::*, organization_exited_event::*, phone_number_changed_event::*, + phone_number_verified_event::*, resend_login_otp_event::*, verification_otp_resent_event::*, + verification_otp_sent_event::*, +}; + #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd)] -pub enum UserEvent { +pub enum IdentityEvent { UserRegistered(UserRegisteredEvent), UserDeleted, Loggedin(LoginEvent), @@ -21,25 +28,47 @@ pub enum UserEvent { UserVerified, VerificationEmailResent, UserPromotedToAdmin(UserPromotedToAdminEvent), + + // employee + EmployeeRegistered(EmployeeRegisteredEvent), + EmployeeLoggedIn(EmployeeLoggedInEvent), + EmployeeInitLoggedIn(EmployeeInitLoggedInEvent), + ResentLoginOTP(ResentLoginOTPEvent), + PhoneNumberVerified(PhoneNumberVerifiedEvent), + VerificationOTPResent(VerificationOTPResentEvent), + PhoneNumberChanged(PhoneNumberChangedEvent), + InviteAccepted(InviteAcceptedEvent), + OrganizationExited(OrganizationExitedEvent), } //TODO: define password type that takes string and converts to hash -impl DomainEvent for UserEvent { +impl DomainEvent for IdentityEvent { fn event_version(&self) -> String { "1.0".to_string() } fn event_type(&self) -> String { let e: &str = match self { - UserEvent::UserRegistered { .. } => "UserRegisteredAccount", - UserEvent::UserDeleted => "UserDeletedAccount", - UserEvent::Loggedin { .. } => "UserLoggedIn", - UserEvent::PasswordUpdated { .. } => "UserUpdatedAccountPassword", - UserEvent::EmailUpdated { .. } => "UserUpdatedAccountEmail", - UserEvent::UserVerified => "UserIsVerified", - UserEvent::UserPromotedToAdmin { .. } => "UserPromotedToAdmin", - UserEvent::VerificationEmailResent => "VerficationEmailResent", + IdentityEvent::UserRegistered { .. } => "IdentityUserRegisteredAccount", + IdentityEvent::UserDeleted => "IdentityUserDeletedAccount", + IdentityEvent::Loggedin { .. } => "IdentityUserLoggedIn", + IdentityEvent::Loggedin { .. } => "IdentityUserLoggedIn", + IdentityEvent::PasswordUpdated { .. } => "IdentityUserUpdatedAccountPassword", + IdentityEvent::EmailUpdated { .. } => "IdentityUserUpdatedAccountEmail", + IdentityEvent::UserVerified => "IdentityUserIsVerified", + IdentityEvent::UserPromotedToAdmin { .. } => "IdentityUserPromotedToAdmin", + IdentityEvent::VerificationEmailResent => "IdentityVerficationEmailResent", + // employee + IdentityEvent::EmployeeRegistered { .. } => "EmployeeRegistered", + IdentityEvent::EmployeeLoggedIn { .. } => "EmployeeLoggedIn", + IdentityEvent::EmployeeInitLoggedIn { .. } => "EmployeeInitLoggedIn", + IdentityEvent::ResentLoginOTP { .. } => "EmployeeResentLoginOTP", + IdentityEvent::PhoneNumberVerified { .. } => "EmployeePhoneNumberVerified", + IdentityEvent::VerificationOTPResent { .. } => "EmployeeVerificationOTPResent", + IdentityEvent::PhoneNumberChanged { .. } => "EmployeePhoneNumberChanged", + IdentityEvent::InviteAccepted { .. } => "EmployeeInviteAccepted", + IdentityEvent::OrganizationExited { .. } => "EmployeeOrganizationExited", }; e.to_string() diff --git a/src/identity/application/services/mark_user_verified/service.rs b/src/identity/application/services/mark_user_verified/service.rs index 885d184..2752d10 100644 --- a/src/identity/application/services/mark_user_verified/service.rs +++ b/src/identity/application/services/mark_user_verified/service.rs @@ -32,7 +32,7 @@ impl MarkUserVerifiedUseCase for MarkUserVerifiedService { .await .unwrap() { - return Err(IdentityError::VerificationOTPSecretNotFound); + return Err(IdentityError::VerificationOTPNotFound); } self.db_delete_verification_secret_adapter @@ -87,7 +87,7 @@ mod tests { assert_eq!( s.mark_user_verified(cmd.clone()).await.err(), - Some(IdentityError::VerificationOTPSecretNotFound) + Some(IdentityError::VerificationOTPNotFound) ); } } diff --git a/src/identity/application/services/mod.rs b/src/identity/application/services/mod.rs index 686c180..d468359 100644 --- a/src/identity/application/services/mod.rs +++ b/src/identity/application/services/mod.rs @@ -7,17 +7,29 @@ use mockall::predicate::*; use mockall::*; use serde::{Deserialize, Serialize}; -mod delete_user; +pub mod delete_user; +pub mod employee_accept_invite_service; +pub mod employee_exit_organization_service; +pub mod employee_login_service; +pub mod employee_register_service; +pub mod employee_resend_login_otp_service; +pub mod employee_resend_verification_otp_service; +pub mod employee_verify_phone_number_service; pub mod errors; pub mod events; -mod login; -mod mark_user_verified; -mod register_user; -mod resend_verification_email; -mod set_user_admin; -mod update_email; -mod update_password; +pub mod login; +pub mod mark_user_verified; +pub mod register_user; +pub mod resend_verification_email; +pub mod set_user_admin; +pub mod update_email; +pub mod update_password; +use crate::identity::domain::{ + accept_invite_command::*, change_phone_number_command::*, employee_login_command::*, + employee_register_command::*, exit_organization_command::*, resend_login_otp_command::*, + resend_verification_otp_command::*, verify_phone_number_command::*, +}; use delete_user::command::*; use login::command::*; use mark_user_verified::command::*; @@ -28,7 +40,7 @@ use update_email::command::*; use update_password::command::*; #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd)] -pub enum UserCommand { +pub enum IdentityCommand { RegisterUser(RegisterUserCommand), DeleteUser(DeleteUserCommand), Login(LoginCommand), @@ -37,10 +49,20 @@ pub enum UserCommand { MarkUserVerified(MarkUserVerifiedCommand), SetAdmin(SetAdminCommand), ResendVerificationEmail(ResendVerificationEmailCommand), + // employee + EmployeeRegister(EmployeeRegisterCommand), + EmployeeInitLogin(EmployeeInitLoginCommand), + EmployeeFinishLogin(EmployeeFinishLoginCommand), + EmployeeResendLoginOTP(ResendLoginOTPCommand), + EmployeeVerifyPhoneNumber(VerifyPhoneNumberCommand), + EmployeeResendVerificationOTP(ResendVerificationOTPCommand), + EmployeeChangePhoneNumber(ChangePhoneNumberCommand), + EmployeeAcceptInvite(AcceptInviteCommand), + EmployeeExitOrganization(ExitOrganizationCommand), } #[automock] -pub trait UserServicesInterface: Send + Sync { +pub trait IdentityServicesInterface: Send + Sync { fn delete_user(&self) -> delete_user::DeleteUserServiceObj; fn login(&self) -> login::LoginServiceObj; fn mark_user_verified(&self) -> mark_user_verified::MarkUserVerifiedServiceObj; @@ -51,10 +73,29 @@ pub trait UserServicesInterface: Send + Sync { fn set_user_admin(&self) -> set_user_admin::SetUserAdminServiceObj; fn update_email(&self) -> update_email::UpdateEmailServiceObj; fn update_password(&self) -> update_password::UpdatePasswordServiceObj; + + // employee + fn employee_accept_invite_service( + &self, + ) -> employee_accept_invite_service::EmployeeAcceptInviteServiceObj; + fn employee_exit_organization_service( + &self, + ) -> employee_exit_organization_service::EmployeeExitOrganizationServiceObj; + fn employee_login_service(&self) -> employee_login_service::EmployeeLoginServiceObj; + fn employee_register_service(&self) -> employee_register_service::EmployeeRegisterServiceObj; + fn employee_resend_login_otp_service( + &self, + ) -> employee_resend_login_otp_service::EmployeeResendLoginOTPServiceObj; + fn employee_resend_verification_otp_service( + &self, + ) -> employee_resend_verification_otp_service::EmployeeResendVerificationOTPServiceObj; + fn employee_verify_phone_number_service( + &self, + ) -> employee_verify_phone_number_service::EmployeeVerifyPhoneNumberServiceObj; } #[derive(Clone, Builder)] -pub struct UserServices { +pub struct IdentityServices { delete_user: delete_user::DeleteUserServiceObj, login: login::LoginServiceObj, mark_user_verified: mark_user_verified::MarkUserVerifiedServiceObj, @@ -63,9 +104,21 @@ pub struct UserServices { set_user_admin: set_user_admin::SetUserAdminServiceObj, update_email: update_email::UpdateEmailServiceObj, update_password: update_password::UpdatePasswordServiceObj, + + employee_accept_invite_service: employee_accept_invite_service::EmployeeAcceptInviteServiceObj, + employee_exit_organization_service: + employee_exit_organization_service::EmployeeExitOrganizationServiceObj, + employee_login_service: employee_login_service::EmployeeLoginServiceObj, + employee_register_service: employee_register_service::EmployeeRegisterServiceObj, + employee_resend_login_otp_service: + employee_resend_login_otp_service::EmployeeResendLoginOTPServiceObj, + employee_resend_verification_otp_service: + employee_resend_verification_otp_service::EmployeeResendVerificationOTPServiceObj, + employee_verify_phone_number_service: + employee_verify_phone_number_service::EmployeeVerifyPhoneNumberServiceObj, } -impl UserServicesInterface for UserServices { +impl IdentityServicesInterface for IdentityServices { fn delete_user(&self) -> delete_user::DeleteUserServiceObj { self.delete_user.clone() } @@ -92,4 +145,37 @@ impl UserServicesInterface for UserServices { fn update_password(&self) -> update_password::UpdatePasswordServiceObj { self.update_password.clone() } + + // employee + fn employee_accept_invite_service( + &self, + ) -> employee_accept_invite_service::EmployeeAcceptInviteServiceObj { + self.employee_accept_invite_service.clone() + } + fn employee_exit_organization_service( + &self, + ) -> employee_exit_organization_service::EmployeeExitOrganizationServiceObj { + self.employee_exit_organization_service.clone() + } + fn employee_login_service(&self) -> employee_login_service::EmployeeLoginServiceObj { + self.employee_login_service.clone() + } + fn employee_register_service(&self) -> employee_register_service::EmployeeRegisterServiceObj { + self.employee_register_service.clone() + } + fn employee_resend_login_otp_service( + &self, + ) -> employee_resend_login_otp_service::EmployeeResendLoginOTPServiceObj { + self.employee_resend_login_otp_service.clone() + } + fn employee_resend_verification_otp_service( + &self, + ) -> employee_resend_verification_otp_service::EmployeeResendVerificationOTPServiceObj { + self.employee_resend_verification_otp_service.clone() + } + fn employee_verify_phone_number_service( + &self, + ) -> employee_verify_phone_number_service::EmployeeVerifyPhoneNumberServiceObj { + self.employee_verify_phone_number_service.clone() + } } diff --git a/src/identity/domain/accept_invite_command.rs b/src/identity/domain/accept_invite_command.rs new file mode 100644 index 0000000..d830463 --- /dev/null +++ b/src/identity/domain/accept_invite_command.rs @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct AcceptInviteCommand { + emp_id: Uuid, + invite_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl AcceptInviteCommand { + pub fn get_cmd() -> Self { + Self { + emp_id: UUID, + invite_id: UUID, + } + } + } +} diff --git a/src/identity/domain/aggregate.rs b/src/identity/domain/aggregate.rs index f5b1aaa..d4752cb 100644 --- a/src/identity/domain/aggregate.rs +++ b/src/identity/domain/aggregate.rs @@ -10,9 +10,9 @@ use serde::{Deserialize, Serialize}; use uuid::Uuid; use crate::identity::application::services::errors::*; -use crate::identity::application::services::events::UserEvent; -use crate::identity::application::services::UserCommand; -use crate::identity::application::services::UserServicesInterface; +use crate::identity::application::services::events::IdentityEvent; +use crate::identity::application::services::IdentityCommand; +use crate::identity::application::services::IdentityServicesInterface; #[derive( Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, @@ -78,10 +78,10 @@ impl User { #[async_trait] impl Aggregate for User { - type Command = UserCommand; - type Event = UserEvent; + type Command = IdentityCommand; + type Event = IdentityEvent; type Error = IdentityError; - type Services = std::sync::Arc; + type Services = std::sync::Arc; // This identifier should be unique to the system. fn aggregate_type() -> String { @@ -96,50 +96,51 @@ impl Aggregate for User { services: &Self::Services, ) -> Result, Self::Error> { match command { - UserCommand::RegisterUser(cmd) => { + IdentityCommand::RegisterUser(cmd) => { let res = services.register_user().register_user(cmd).await?; - Ok(vec![UserEvent::UserRegistered(res)]) + Ok(vec![IdentityEvent::UserRegistered(res)]) } - UserCommand::DeleteUser(cmd) => { + IdentityCommand::DeleteUser(cmd) => { services.delete_user().delete_user(cmd).await; - Ok(vec![UserEvent::UserDeleted]) + Ok(vec![IdentityEvent::UserDeleted]) } - UserCommand::Login(cmd) => { + IdentityCommand::Login(cmd) => { let res = services.login().login(cmd).await; - Ok(vec![UserEvent::Loggedin(res)]) + Ok(vec![IdentityEvent::Loggedin(res)]) } - UserCommand::UpdatePassword(cmd) => { + IdentityCommand::UpdatePassword(cmd) => { let res = services.update_password().update_password(cmd).await; - Ok(vec![UserEvent::PasswordUpdated(res)]) + Ok(vec![IdentityEvent::PasswordUpdated(res)]) } - UserCommand::UpdateEmail(cmd) => { + IdentityCommand::UpdateEmail(cmd) => { let res = services.update_email().update_email(cmd).await?; - Ok(vec![UserEvent::EmailUpdated(res)]) + Ok(vec![IdentityEvent::EmailUpdated(res)]) } - UserCommand::MarkUserVerified(cmd) => { + IdentityCommand::MarkUserVerified(cmd) => { services .mark_user_verified() .mark_user_verified(cmd) .await?; - Ok(vec![UserEvent::UserVerified]) + Ok(vec![IdentityEvent::UserVerified]) } - UserCommand::SetAdmin(cmd) => { + IdentityCommand::SetAdmin(cmd) => { let res = services.set_user_admin().set_user_admin(cmd).await; - Ok(vec![UserEvent::UserPromotedToAdmin(res)]) + Ok(vec![IdentityEvent::UserPromotedToAdmin(res)]) } - UserCommand::ResendVerificationEmail(cmd) => { + IdentityCommand::ResendVerificationEmail(cmd) => { services .resend_verification_email() .resend_verification_email(cmd) .await?; - Ok(vec![UserEvent::VerificationEmailResent]) + Ok(vec![IdentityEvent::VerificationEmailResent]) } + _ => Ok(Vec::new()), } } fn apply(&mut self, event: Self::Event) { match event { - UserEvent::UserRegistered(e) => { + IdentityEvent::UserRegistered(e) => { self.first_name = e.first_name().into(); self.last_name = e.last_name().into(); self.user_id = *e.user_id(); @@ -150,23 +151,24 @@ impl Aggregate for User { self.is_verified = *e.is_verified(); self.deleted = false; } - UserEvent::UserDeleted => { + IdentityEvent::UserDeleted => { self.set_deleted(true); } - UserEvent::Loggedin(_) => (), - UserEvent::PasswordUpdated(_) => (), - UserEvent::EmailUpdated(e) => { + IdentityEvent::Loggedin(_) => (), + IdentityEvent::PasswordUpdated(_) => (), + IdentityEvent::EmailUpdated(e) => { self.set_email(e.new_email().into()); self.set_email_verified(false); } - UserEvent::UserVerified => { + IdentityEvent::UserVerified => { self.set_is_verified(true); self.set_email_verified(true); } - UserEvent::UserPromotedToAdmin(_) => { + IdentityEvent::UserPromotedToAdmin(_) => { self.set_is_admin(true); } - UserEvent::VerificationEmailResent => (), + IdentityEvent::VerificationEmailResent => (), + _ => (), } } } diff --git a/src/identity/domain/change_phone_number_command.rs b/src/identity/domain/change_phone_number_command.rs new file mode 100644 index 0000000..f2f3265 --- /dev/null +++ b/src/identity/domain/change_phone_number_command.rs @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct ChangePhoneNumberCommand { + phone_number: PhoneNumber, +} diff --git a/src/identity/domain/employee_aggregate.rs b/src/identity/domain/employee_aggregate.rs new file mode 100644 index 0000000..585854f --- /dev/null +++ b/src/identity/domain/employee_aggregate.rs @@ -0,0 +1,371 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use async_trait::async_trait; +use cqrs_es::Aggregate; +use derive_builder::Builder; +use derive_getters::Getters; +use events::IdentityEvent; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use crate::identity::application::services::{errors::*, *}; + +//use crate::identity::application::services::EmployeeServicesInterface; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct Employee { + first_name: String, + last_name: String, + emp_id: Uuid, + phone_number: PhoneNumber, + phone_verified: bool, + #[builder(default = "None")] + store_id: Option, + deleted: bool, +} +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +#[builder(build_fn(validate = "Self::validate"))] +pub struct PhoneNumber { + country_code: usize, + number: u64, +} + +impl PhoneNumberBuilder { + pub fn validate(&self) -> Result<(), String> { + if self.country_code.unwrap() == 91 { + if self.number.unwrap().to_string().len() != 10 { + return Err("Indian phone number must have 10 digits".into()); + } + } + Ok(()) + } +} + +impl Default for PhoneNumber { + fn default() -> Self { + Self { + country_code: 91, + number: 1234567890, + } + } +} + +impl Default for Employee { + fn default() -> Self { + Employee { + first_name: "".to_string(), + last_name: "".to_string(), + phone_number: Default::default(), + phone_verified: false, + deleted: false, + emp_id: Uuid::new_v4(), + store_id: None, + } + } +} + +#[async_trait] +impl Aggregate for Employee { + type Command = IdentityCommand; + type Event = IdentityEvent; + type Error = IdentityError; + type Services = std::sync::Arc; + + // This identifier should be unique to the system. + fn aggregate_type() -> String { + "identity.employee".to_string() + } + + // The aggregate logic goes here. Note that this will be the _bulk_ of a CQRS system + // so expect to use helper functions elsewhere to keep the code clean. + async fn handle( + &self, + command: Self::Command, + services: &Self::Services, + ) -> Result, Self::Error> { + match command { + IdentityCommand::EmployeeRegister(cmd) => Ok(vec![IdentityEvent::EmployeeRegistered( + services + .employee_register_service() + .register_employee(cmd) + .await?, + )]), + IdentityCommand::EmployeeInitLogin(cmd) => { + Ok(vec![IdentityEvent::EmployeeInitLoggedIn( + services.employee_login_service().init_login(cmd).await?, + )]) + } + IdentityCommand::EmployeeFinishLogin(cmd) => Ok(vec![IdentityEvent::EmployeeLoggedIn( + services.employee_login_service().finish_login(cmd).await?, + )]), + IdentityCommand::EmployeeResendLoginOTP(cmd) => { + Ok(vec![IdentityEvent::ResentLoginOTP( + services + .employee_resend_login_otp_service() + .resend_otp(cmd) + .await?, + )]) + } + IdentityCommand::EmployeeVerifyPhoneNumber(cmd) => { + Ok(vec![IdentityEvent::PhoneNumberVerified( + services + .employee_verify_phone_number_service() + .verify_phone_number(cmd) + .await?, + )]) + } + IdentityCommand::EmployeeResendVerificationOTP(cmd) => { + Ok(vec![IdentityEvent::VerificationOTPResent( + services + .employee_resend_verification_otp_service() + .resend_otp(cmd) + .await?, + )]) + } + IdentityCommand::EmployeeAcceptInvite(cmd) => Ok(vec![IdentityEvent::InviteAccepted( + services + .employee_accept_invite_service() + .accept_invite(cmd) + .await?, + )]), + IdentityCommand::EmployeeExitOrganization(cmd) => { + Ok(vec![IdentityEvent::OrganizationExited( + services + .employee_exit_organization_service() + .exit_organization(cmd) + .await?, + )]) + } + + _ => Ok(Vec::new()), + } + } + + fn apply(&mut self, event: Self::Event) { + match event { + IdentityEvent::EmployeeRegistered(e) => { + *self = e.employee().clone(); + } + IdentityEvent::EmployeeLoggedIn(e) => (), + IdentityEvent::EmployeeInitLoggedIn(e) => (), + IdentityEvent::ResentLoginOTP(e) => (), + IdentityEvent::PhoneNumberVerified(e) => self.phone_verified = true, + IdentityEvent::VerificationOTPResent(e) => (), + IdentityEvent::PhoneNumberChanged(e) => unimplemented!(), + IdentityEvent::InviteAccepted(e) => self.store_id = Some(*e.store_id()), + IdentityEvent::OrganizationExited(e) => self.store_id = None, + + _ => (), + } + } +} + +#[cfg(test)] +mod tests { + use std::sync::Arc; + + use cqrs_es::test::TestFramework; + use employee_accept_invite_service::EmployeeAcceptInviteService; + use employee_exit_organization_service::EmployeeExitOrganizationService; + use employee_login_service::EmployeeLoginService; + use employee_resend_login_otp_service::EmployeeResendLoginOTPService; + use employee_resend_verification_otp_service::EmployeeResendVerificationOTPService; + use employee_verify_phone_number_service::EmployeeVerifyPhoneNumberService; + + use crate::identity::domain::{ + accept_invite_command::AcceptInviteCommand, + employee_logged_in_event::{EmployeeInitLoggedInEvent, EmployeeLoggedInEvent}, + employee_login_command::{EmployeeFinishLoginCommand, EmployeeInitLoginCommand}, + employee_register_command::EmployeeRegisterCommand, + employee_registered_event::EmployeeRegisteredEvent, + exit_organization_command::ExitOrganizationCommand, + invite_accepted_event::InviteAcceptedEvent, + organization_exited_event::OrganizationExitedEvent, + phone_number_verified_event::PhoneNumberVerifiedEvent, + resend_login_otp_command::ResendLoginOTPCommand, + resend_login_otp_event::ResentLoginOTPEvent, + resend_verification_otp_command::ResendVerificationOTPCommand, + verification_otp_resent_event::VerificationOTPResentEvent, + verify_phone_number_command::VerifyPhoneNumberCommand, + }; + use employee_register_service::EmployeeRegisterUserService; + + use super::*; + use crate::tests::bdd::*; + + type EmployeeTestFramework = TestFramework; + + #[test] + fn test_register_employee() { + let cmd = EmployeeRegisterCommand::get_cmd(); + let expected = EmployeeRegisteredEvent::get_event(); + let expected = IdentityEvent::EmployeeRegistered(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_register_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeRegisterUserService::mock( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeRegister(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_init_login() { + let cmd = EmployeeInitLoginCommand::get_cmd(); + let expected = EmployeeInitLoggedInEvent::get_event(); + let expected = IdentityEvent::EmployeeInitLoggedIn(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_login_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeLoginService::mock_init_login( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeInitLogin(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_finish_login() { + let cmd = EmployeeFinishLoginCommand::get_cmd(); + let expected = EmployeeLoggedInEvent::get_event(); + let expected = IdentityEvent::EmployeeLoggedIn(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_login_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeLoginService::mock_finish_login( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeFinishLogin(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_resend_login_otp() { + let cmd = ResendLoginOTPCommand::get_cmd(); + let expected = ResentLoginOTPEvent::get_event(); + let expected = IdentityEvent::ResentLoginOTP(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_resend_login_otp_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeResendLoginOTPService::mock_service( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeResendLoginOTP(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_verify_phone_number() { + let cmd = VerifyPhoneNumberCommand::get_cmd(); + let expected = PhoneNumberVerifiedEvent::get_event(); + let expected = IdentityEvent::PhoneNumberVerified(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_verify_phone_number_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeVerifyPhoneNumberService::mock_service( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeVerifyPhoneNumber(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_resend_verification_otp() { + let cmd = ResendVerificationOTPCommand::get_cmd(); + let expected = VerificationOTPResentEvent::get_event(); + let expected = IdentityEvent::VerificationOTPResent(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_resend_verification_otp_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeResendVerificationOTPService::mock_service( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeResendVerificationOTP(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_accept_invite() { + let cmd = AcceptInviteCommand::get_cmd(); + let expected = InviteAcceptedEvent::get_event(&cmd); + let expected = IdentityEvent::InviteAccepted(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_accept_invite_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeAcceptInviteService::mock_service( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeAcceptInvite(cmd)) + .then_expect_events(vec![expected]); + } + + #[test] + fn test_exit_organization() { + let cmd = ExitOrganizationCommand::get_cmd(); + let expected = OrganizationExitedEvent::get_event(&cmd); + let expected = IdentityEvent::OrganizationExited(expected); + + let mut services = MockIdentityServicesInterface::new(); + services + .expect_employee_exit_organization_service() + .times(IS_CALLED_ONLY_ONCE.unwrap()) + .return_const(EmployeeExitOrganizationService::mock_service( + IS_CALLED_ONLY_ONCE, + cmd.clone(), + )); + + EmployeeTestFramework::with(Arc::new(services)) + .given_no_previous_events() + .when(IdentityCommand::EmployeeExitOrganization(cmd)) + .then_expect_events(vec![expected]); + } +} diff --git a/src/identity/domain/employee_commands.rs b/src/identity/domain/employee_commands.rs new file mode 100644 index 0000000..98a1211 --- /dev/null +++ b/src/identity/domain/employee_commands.rs @@ -0,0 +1,202 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use mockall::predicate::*; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; +use commands::*; + +#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd)] +pub enum EmployeeCommand { + Register(RegisterCommand), + Login(LoginCommand), + ResendLoginOTP(ResendLoginOTPCommand), + VerifyPhoneNumber(VerifyPhoneNumberCommand), + ResendVerificationOTP(ResendVerificationOTPCommand), + ChangePhoneNumber(ChangePhoneNumberCommand), + AcceptInvite(AcceptInviteCommand), + ExitOrganization(ExitOrganizationCommand), +} + +pub mod events { + + use super::*; + use cqrs_es::DomainEvent; + + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct EmployeeRegisteredEvent { + // employee: Employee, + // } + // + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct EmployeeLoggedInEvent { + // emp_id: Uuid, + // } + // + + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct ResentLoginOTPEvent { + // emp_id: Uuid, + // } + // + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct LoginOTPSentEvent { + // emp_id: Uuid, + // } + // + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct PhoneNumberVerifiedEvent { + // emp_id: Uuid, + // } + // + // #[derive( + // Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + // )] + // pub struct VerificationOTPResentEvent { + // emp_id: Uuid, + // } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct VerificationOTPSentEvent { + emp_id: Uuid, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct PhoneNumberChangedEvent { + emp_id: Uuid, + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct InviteAcceptedEvent { + emp_id: Uuid, + store_id: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct OrganizationExitedEvent { + emp_id: Uuid, + store_id: PhoneNumber, + } + + #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd)] + pub enum EmployeeEvent { + EmployeeRegistered(EmployeeRegisteredEvent), + EmployeeLoggedIn(EmployeeLoggedInEvent), + ResentLoginOTP(ResentLoginOTPEvent), + PhoneNumberVerified(PhoneNumberVerifiedEvent), + VerificationOTPResent(VerificationOTPResentEvent), + PhoneNumberChanged(PhoneNumberChangedEvent), + InviteAccepted(InviteAcceptedEvent), + OrganizationExited(OrganizationExitedEvent), + } + + impl DomainEvent for EmployeeEvent { + fn event_version(&self) -> String { + "1.0".to_string() + } + + fn event_type(&self) -> String { + let e: &str = match self { + EmployeeEvent::EmployeeRegistered { .. } => "EmployeeRegistered", + EmployeeEvent::EmployeeLoggedIn { .. } => "EmployeeLoggedIn", + EmployeeEvent::ResentLoginOTP { .. } => "EmployeeResentLoginOTP", + EmployeeEvent::PhoneNumberVerified { .. } => "EmployeePhoneNumberVerified", + EmployeeEvent::VerificationOTPResent { .. } => "EmployeeVerificationOTPResent", + EmployeeEvent::PhoneNumberChanged { .. } => "EmployeePhoneNumberChanged", + EmployeeEvent::InviteAccepted { .. } => "EmployeeInviteAccepted", + EmployeeEvent::OrganizationExited { .. } => "EmployeeOrganizationExited", + }; + + e.to_string() + } + } +} + +pub mod commands { + use super::*; + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct RegisterCommand { + first_name: String, + last_name: String, + emp_id: Uuid, + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct AcceptInviteCommand { + emp_id: Uuid, + store_id: Uuid, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct ExitOrganizationCommand { + emp_id: Uuid, + store_id: Uuid, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct ChangePhoneNumberCommand { + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct LoginCommand { + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct ResendLoginOTPCommand { + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct VerifyPhoneNumberCommand { + phone_number: PhoneNumber, + } + + #[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, + )] + pub struct ResendVerificationOTPCommand { + phone_number: PhoneNumber, + } +} diff --git a/src/identity/domain/employee_logged_in_event.rs b/src/identity/domain/employee_logged_in_event.rs new file mode 100644 index 0000000..ee78fa8 --- /dev/null +++ b/src/identity/domain/employee_logged_in_event.rs @@ -0,0 +1,43 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeLoggedInEvent { + emp_id: Uuid, +} + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeInitLoggedInEvent { + emp_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl EmployeeLoggedInEvent { + pub fn get_event() -> Self { + Self { emp_id: UUID } + } + } + + impl EmployeeInitLoggedInEvent { + pub fn get_event() -> Self { + Self { emp_id: UUID } + } + } +} diff --git a/src/identity/domain/employee_login_command.rs b/src/identity/domain/employee_login_command.rs new file mode 100644 index 0000000..930783d --- /dev/null +++ b/src/identity/domain/employee_login_command.rs @@ -0,0 +1,47 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeInitLoginCommand { + phone_number: PhoneNumber, +} + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeFinishLoginCommand { + phone_number: PhoneNumber, + otp: usize, +} + +#[cfg(test)] +mod tests { + use super::*; + + impl EmployeeInitLoginCommand { + pub fn get_cmd() -> Self { + Self { + phone_number: PhoneNumber::default(), + } + } + } + + impl EmployeeFinishLoginCommand { + pub fn get_cmd() -> Self { + Self { + phone_number: PhoneNumber::default(), + otp: 999, + } + } + } +} diff --git a/src/identity/domain/employee_register_command.rs b/src/identity/domain/employee_register_command.rs new file mode 100644 index 0000000..0c69ebf --- /dev/null +++ b/src/identity/domain/employee_register_command.rs @@ -0,0 +1,38 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeRegisterCommand { + first_name: String, + last_name: String, + emp_id: Uuid, + phone_number: PhoneNumber, +} + +#[cfg(test)] +pub mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl EmployeeRegisterCommand { + pub fn get_cmd() -> Self { + Self { + first_name: "foo".into(), + last_name: "foo".into(), + emp_id: UUID, + phone_number: PhoneNumber::default(), + } + } + } +} diff --git a/src/identity/domain/employee_registered_event.rs b/src/identity/domain/employee_registered_event.rs new file mode 100644 index 0000000..22f9c9f --- /dev/null +++ b/src/identity/domain/employee_registered_event.rs @@ -0,0 +1,39 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct EmployeeRegisteredEvent { + employee: Employee, +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::identity::domain::employee_register_command::EmployeeRegisterCommand; + + impl EmployeeRegisteredEvent { + pub fn get_event() -> Self { + let cmd = EmployeeRegisterCommand::get_cmd(); + let employee = EmployeeBuilder::default() + .first_name(cmd.first_name().clone()) + .last_name(cmd.last_name().clone()) + .emp_id(*cmd.emp_id()) + .phone_number(cmd.phone_number().clone()) + .phone_verified(false) + .deleted(false) + .build() + .unwrap(); + Self { employee } + } + } +} diff --git a/src/identity/domain/exit_organization_command.rs b/src/identity/domain/exit_organization_command.rs new file mode 100644 index 0000000..015c065 --- /dev/null +++ b/src/identity/domain/exit_organization_command.rs @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct ExitOrganizationCommand { + emp_id: Uuid, + store_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl ExitOrganizationCommand { + pub fn get_cmd() -> Self { + Self { + emp_id: UUID, + store_id: UUID, + } + } + } +} diff --git a/src/identity/domain/invite_accepted_event.rs b/src/identity/domain/invite_accepted_event.rs new file mode 100644 index 0000000..e1e7d2e --- /dev/null +++ b/src/identity/domain/invite_accepted_event.rs @@ -0,0 +1,37 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct InviteAcceptedEvent { + emp_id: Uuid, + invite_id: Uuid, + store_id: Uuid, +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + identity::domain::accept_invite_command::AcceptInviteCommand, utils::uuid::tests::UUID, + }; + + impl InviteAcceptedEvent { + pub fn get_event(cmd: &AcceptInviteCommand) -> Self { + Self { + emp_id: *cmd.emp_id(), + invite_id: *cmd.invite_id(), + store_id: UUID, + } + } + } +} diff --git a/src/identity/domain/login_otp_sent_event.rs b/src/identity/domain/login_otp_sent_event.rs new file mode 100644 index 0000000..16fde29 --- /dev/null +++ b/src/identity/domain/login_otp_sent_event.rs @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct LoginOTPSentEvent { + emp_id: Uuid, +} diff --git a/src/identity/domain/mod.rs b/src/identity/domain/mod.rs index 0ca608e..47da0f3 100644 --- a/src/identity/domain/mod.rs +++ b/src/identity/domain/mod.rs @@ -3,3 +3,29 @@ // SPDX-License-Identifier: AGPL-3.0-or-later pub mod aggregate; +pub mod employee_aggregate; +//pub mod employee_commands; +// pub mod store_aggregate; +// pub mod invite; + +// events +pub mod employee_logged_in_event; +pub mod employee_registered_event; +pub mod invite_accepted_event; +pub mod login_otp_sent_event; +pub mod organization_exited_event; +pub mod phone_number_changed_event; +pub mod phone_number_verified_event; +pub mod resend_login_otp_event; +pub mod verification_otp_resent_event; +pub mod verification_otp_sent_event; + +// commands +pub mod accept_invite_command; +pub mod change_phone_number_command; +pub mod employee_login_command; +pub mod employee_register_command; +pub mod exit_organization_command; +pub mod resend_login_otp_command; +pub mod resend_verification_otp_command; +pub mod verify_phone_number_command; diff --git a/src/identity/domain/organization_exited_event.rs b/src/identity/domain/organization_exited_event.rs new file mode 100644 index 0000000..65dfaf4 --- /dev/null +++ b/src/identity/domain/organization_exited_event.rs @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct OrganizationExitedEvent { + emp_id: Uuid, + store_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::identity::domain::exit_organization_command::ExitOrganizationCommand; + + use super::*; + + impl OrganizationExitedEvent { + pub fn get_event(cmd: &ExitOrganizationCommand) -> Self { + Self { + emp_id: *cmd.emp_id(), + store_id: *cmd.store_id(), + } + } + } +} diff --git a/src/identity/domain/phone_number_changed_event.rs b/src/identity/domain/phone_number_changed_event.rs new file mode 100644 index 0000000..b4a30e0 --- /dev/null +++ b/src/identity/domain/phone_number_changed_event.rs @@ -0,0 +1,18 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct PhoneNumberChangedEvent { + emp_id: Uuid, + phone_number: PhoneNumber, +} diff --git a/src/identity/domain/phone_number_verified_event.rs b/src/identity/domain/phone_number_verified_event.rs new file mode 100644 index 0000000..489270e --- /dev/null +++ b/src/identity/domain/phone_number_verified_event.rs @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct PhoneNumberVerifiedEvent { + emp_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl PhoneNumberVerifiedEvent { + pub fn get_event() -> Self { + Self { emp_id: UUID } + } + } +} diff --git a/src/identity/domain/resend_login_otp_command.rs b/src/identity/domain/resend_login_otp_command.rs new file mode 100644 index 0000000..1fc72f7 --- /dev/null +++ b/src/identity/domain/resend_login_otp_command.rs @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct ResendLoginOTPCommand { + phone_number: PhoneNumber, +} + +#[cfg(test)] +mod tests { + use super::*; + + impl ResendLoginOTPCommand { + pub fn get_cmd() -> Self { + Self { + phone_number: Default::default(), + } + } + } +} diff --git a/src/identity/domain/resend_login_otp_event.rs b/src/identity/domain/resend_login_otp_event.rs new file mode 100644 index 0000000..2a267ae --- /dev/null +++ b/src/identity/domain/resend_login_otp_event.rs @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct ResentLoginOTPEvent { + emp_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl ResentLoginOTPEvent { + pub fn get_event() -> Self { + Self { emp_id: UUID } + } + } +} diff --git a/src/identity/domain/resend_verification_otp_command.rs b/src/identity/domain/resend_verification_otp_command.rs new file mode 100644 index 0000000..6dad626 --- /dev/null +++ b/src/identity/domain/resend_verification_otp_command.rs @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct ResendVerificationOTPCommand { + phone_number: PhoneNumber, +} + +#[cfg(test)] +mod tests { + use super::*; + + impl ResendVerificationOTPCommand { + pub fn get_cmd() -> Self { + Self { + phone_number: Default::default(), + } + } + } +} diff --git a/src/identity/domain/verification_otp_resent_event.rs b/src/identity/domain/verification_otp_resent_event.rs new file mode 100644 index 0000000..1379166 --- /dev/null +++ b/src/identity/domain/verification_otp_resent_event.rs @@ -0,0 +1,29 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct VerificationOTPResentEvent { + emp_id: Uuid, +} + +#[cfg(test)] +mod tests { + use crate::utils::uuid::tests::UUID; + + use super::*; + + impl VerificationOTPResentEvent { + pub fn get_event() -> Self { + Self { emp_id: UUID } + } + } +} diff --git a/src/identity/domain/verification_otp_sent_event.rs b/src/identity/domain/verification_otp_sent_event.rs new file mode 100644 index 0000000..859b469 --- /dev/null +++ b/src/identity/domain/verification_otp_sent_event.rs @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct VerificationOTPSentEvent { + emp_id: Uuid, +} diff --git a/src/identity/domain/verify_phone_number_command.rs b/src/identity/domain/verify_phone_number_command.rs new file mode 100644 index 0000000..438f00c --- /dev/null +++ b/src/identity/domain/verify_phone_number_command.rs @@ -0,0 +1,32 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use derive_builder::Builder; +use derive_getters::Getters; +use serde::{Deserialize, Serialize}; +use uuid::Uuid; + +use super::employee_aggregate::*; + +#[derive( + Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Ord, PartialOrd, Getters, Builder, +)] +pub struct VerifyPhoneNumberCommand { + phone_number: PhoneNumber, + otp: usize, +} + +#[cfg(test)] +mod tests { + use super::*; + + impl VerifyPhoneNumberCommand { + pub fn get_cmd() -> Self { + Self { + phone_number: Default::default(), + otp: 999, + } + } + } +} diff --git a/src/tests/bdd.rs b/src/tests/bdd.rs index f5aefd8..b69adb2 100644 --- a/src/tests/bdd.rs +++ b/src/tests/bdd.rs @@ -8,6 +8,7 @@ pub const IS_CALLED_ONLY_TWICE: Option = Some(2); pub const IS_CALLED_ONLY_THRICE: Option = Some(3); pub const IS_CALLED_ONLY_FOUR_TIMES: Option = Some(4); pub const RETURNS_RANDOM_STRING: &str = "test_random_string"; +pub const RETURNS_RANDOM_NUMBER: usize = 10; pub const IGNORE_CALL_COUNT: Option = None; pub const RETURNS_TRUE: bool = true; diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 9bcf0b0..2ca7fc9 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -3,6 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0-or-later pub mod parse_aggregate_id; +pub mod random_number; pub mod random_string; pub mod string; pub mod uuid; diff --git a/src/utils/random_number.rs b/src/utils/random_number.rs new file mode 100644 index 0000000..f78ef37 --- /dev/null +++ b/src/utils/random_number.rs @@ -0,0 +1,65 @@ +// SPDX-FileCopyrightText: 2024 Aravinth Manivannan +// +// SPDX-License-Identifier: AGPL-3.0-or-later + +use std::sync::Arc; + +use actix_web::web; +use mockall::predicate::*; +use mockall::*; +#[cfg(test)] +#[allow(unused_imports)] +use tests::*; + +pub type GenerateRandomNumberInterfaceObj = Arc; +pub type WebGenerateRandomNumberInterfaceObj = web::Data; + +#[automock] +pub trait GenerateRandomNumberInterface: Send + Sync { + fn get_random(&self, num_digits: u32) -> usize; +} + +pub struct GenerateRandomNumber; +impl GenerateRandomNumberInterface for GenerateRandomNumber { + fn get_random(&self, num_digits: u32) -> usize { + use rand::{rngs::ThreadRng, thread_rng, Rng}; + + let mut rng: ThreadRng = thread_rng(); + + let base: usize = 10; + rng.gen_range(0..base.pow(num_digits) - 1) + } +} + +impl GenerateRandomNumber { + pub fn inject() -> impl FnOnce(&mut web::ServiceConfig) { + let g = WebGenerateRandomNumberInterfaceObj::new(Arc::new(GenerateRandomNumber)); + let f = move |cfg: &mut web::ServiceConfig| { + cfg.app_data(g); + }; + + Box::new(f) + } +} + +#[cfg(test)] +pub mod tests { + use super::*; + + use std::sync::Arc; + + pub fn mock_generate_random_number( + times: Option, + returning: usize, + ) -> Arc { + let mut m = MockGenerateRandomNumberInterface::new(); + + if let Some(times) = times { + m.expect_get_random().times(times).return_const(returning); + } else { + m.expect_get_random().return_const(returning); + } + + Arc::new(m) + } +}