From 381c229bd437d523bcf06dd8ee32273f93555039 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Fri, 9 Oct 2026 10:16:23 +0200 Subject: [PATCH] Propagate user app ownership conflict. --- ...cadba51847776866997f0e978cff9c869c635.json | 16 +++- ...615644f66ad541bbad08d38f4a67c86c57a37.json | 16 +++- ...986014a6f0615c17e9e8a6ecd776924562b99.json | 16 +++- ...ec8dde2291c3c49a937a8fa4612646e191420.json | 8 +- ...6756917d705c694b36988b1514067d78fa154.json | 8 +- ...47581bbc02bdac145f58d3c97d1d11671f949.json | 8 +- ...5210f18f845cb70fc3e5882dd38db4f23ec14.json | 8 +- ...9904cf9c5e71ca6a8dee4ed3ebe7afec9383e.json | 8 +- ...11b22b3177ea71f812c9f53e4164f22cd1f8a.json | 8 +- ...b76594dfcdb06bd5d82ba61330fb8e51e88dc.json | 48 ++++++++-- ...f2e0803753901e73a2a8e04c87eb061bb724e.json | 88 ++++++++++++++++--- ...001ec762ed8877a4a0bc66e195bdb1c113135.json | 8 +- ...b40dadf634e98977ae59d2398579f9be82d6f.json | 56 ++++++++++-- ...fc8f4625ecc6abde27ae037a6e461e0fe0b6e.json | 40 +++++++-- ...3fb03aeda84d0d460c9db1b5b1e7025493879.json | 53 +++++++++++ ...3084195d09c0a30f7e963a2497892398c6adc.json | 16 +++- ...949e895611df56fb0c07a54b2536b6a3a6329.json | 3 +- ...d93da2527f7e5a0c4332527f1e533f3ecd4f0.json | 48 ++++++++-- ...066269b95eab3d60ad9d97219e93686a85a55.json | 24 ++++- ...0d66d01c6083166bd6a6f53784ddcdc92f12c.json | 48 ++++++++-- ...8dd31e1f82bef6b4fd0046a4c5cbffb3e877a.json | 8 +- ...ceead2cf1ff00bd837c0fc42ec81347faa383.json | 40 +++++++-- ...e92f053d6a36609af5f6a244a2c236e3ffb21.json | 35 -------- ...0479e51b54e348e1651f4a4e9b8328741cec7.json | 80 ++++++++++++++--- ...4c7f58e16790af1303adcfe9686bb35fc741a.json | 16 +++- ...aa91981fe861b661169ac5310e9df0e7b99d9.json | 80 ++++++++++++++--- ...134719dc4aa4eb4c96d7c4d64388cfb658fa8.json | 16 +++- ...313aaeaa275cf6e41272347821735d4b401d6.json | 8 +- server/src/database/dtos/results.rs | 16 ++++ server/src/database/user_apps.rs | 15 ++-- server/src/error.rs | 9 ++ server/src/repository.rs | 3 + server/src/repository/user_apps.rs | 63 +++++++++++-- 33 files changed, 779 insertions(+), 138 deletions(-) create mode 100644 server/.sqlx/query-977a6afaf7511915973fd20ab3a3fb03aeda84d0d460c9db1b5b1e7025493879.json delete mode 100644 server/.sqlx/query-e4cc5672787e94ee849cb175416e92f053d6a36609af5f6a244a2c236e3ffb21.json diff --git a/server/.sqlx/query-016dcd0136e2284546f7ad4db96cadba51847776866997f0e978cff9c869c635.json b/server/.sqlx/query-016dcd0136e2284546f7ad4db96cadba51847776866997f0e978cff9c869c635.json index ff06d82..c1e23ca 100644 --- a/server/.sqlx/query-016dcd0136e2284546f7ad4db96cadba51847776866997f0e978cff9c869c635.json +++ b/server/.sqlx/query-016dcd0136e2284546f7ad4db96cadba51847776866997f0e978cff9c869c635.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } }, { "ordinal": 1, "name": "name", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "accounts", + "name": "name" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json b/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json index ad2aa04..a7a296e 100644 --- a/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json +++ b/server/.sqlx/query-1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "id" + } + } }, { "ordinal": 1, "name": "user_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "user_id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-1eec346cce152ba824c9f49b406986014a6f0615c17e9e8a6ecd776924562b99.json b/server/.sqlx/query-1eec346cce152ba824c9f49b406986014a6f0615c17e9e8a6ecd776924562b99.json index 01ed61d..e3021c4 100644 --- a/server/.sqlx/query-1eec346cce152ba824c9f49b406986014a6f0615c17e9e8a6ecd776924562b99.json +++ b/server/.sqlx/query-1eec346cce152ba824c9f49b406986014a6f0615c17e9e8a6ecd776924562b99.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "id" + } + } }, { "ordinal": 1, "name": "user_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "user_id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-20f1027f06ea416d4f0d0a5b231ec8dde2291c3c49a937a8fa4612646e191420.json b/server/.sqlx/query-20f1027f06ea416d4f0d0a5b231ec8dde2291c3c49a937a8fa4612646e191420.json index beeb495..823cdf8 100644 --- a/server/.sqlx/query-20f1027f06ea416d4f0d0a5b231ec8dde2291c3c49a937a8fa4612646e191420.json +++ b/server/.sqlx/query-20f1027f06ea416d4f0d0a5b231ec8dde2291c3c49a937a8fa4612646e191420.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-22d5813be73a45003abd94152c36756917d705c694b36988b1514067d78fa154.json b/server/.sqlx/query-22d5813be73a45003abd94152c36756917d705c694b36988b1514067d78fa154.json index a41d6b2..a4fa635 100644 --- a/server/.sqlx/query-22d5813be73a45003abd94152c36756917d705c694b36988b1514067d78fa154.json +++ b/server/.sqlx/query-22d5813be73a45003abd94152c36756917d705c694b36988b1514067d78fa154.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "users", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-28650c14def0b3089a1c6f10d9947581bbc02bdac145f58d3c97d1d11671f949.json b/server/.sqlx/query-28650c14def0b3089a1c6f10d9947581bbc02bdac145f58d3c97d1d11671f949.json index dabe500..f5b3528 100644 --- a/server/.sqlx/query-28650c14def0b3089a1c6f10d9947581bbc02bdac145f58d3c97d1d11671f949.json +++ b/server/.sqlx/query-28650c14def0b3089a1c6f10d9947581bbc02bdac145f58d3c97d1d11671f949.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-3093183e1ab856c510b7a6a32c05210f18f845cb70fc3e5882dd38db4f23ec14.json b/server/.sqlx/query-3093183e1ab856c510b7a6a32c05210f18f845cb70fc3e5882dd38db4f23ec14.json index 15d1886..7d690de 100644 --- a/server/.sqlx/query-3093183e1ab856c510b7a6a32c05210f18f845cb70fc3e5882dd38db4f23ec14.json +++ b/server/.sqlx/query-3093183e1ab856c510b7a6a32c05210f18f845cb70fc3e5882dd38db4f23ec14.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-38166013a2b30661d0666a7b6629904cf9c5e71ca6a8dee4ed3ebe7afec9383e.json b/server/.sqlx/query-38166013a2b30661d0666a7b6629904cf9c5e71ca6a8dee4ed3ebe7afec9383e.json index f2226d9..d0b574c 100644 --- a/server/.sqlx/query-38166013a2b30661d0666a7b6629904cf9c5e71ca6a8dee4ed3ebe7afec9383e.json +++ b/server/.sqlx/query-38166013a2b30661d0666a7b6629904cf9c5e71ca6a8dee4ed3ebe7afec9383e.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json b/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json index 2f00e9a..46cfe31 100644 --- a/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json +++ b/server/.sqlx/query-58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "users", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-6fbffb56421dfc314468e6f7ea5b76594dfcdb06bd5d82ba61330fb8e51e88dc.json b/server/.sqlx/query-6fbffb56421dfc314468e6f7ea5b76594dfcdb06bd5d82ba61330fb8e51e88dc.json index 0519897..b1ee547 100644 --- a/server/.sqlx/query-6fbffb56421dfc314468e6f7ea5b76594dfcdb06bd5d82ba61330fb8e51e88dc.json +++ b/server/.sqlx/query-6fbffb56421dfc314468e6f7ea5b76594dfcdb06bd5d82ba61330fb8e51e88dc.json @@ -6,32 +6,68 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "account_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "account_id" + } + } }, { "ordinal": 2, "name": "amount_cents", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "transactions", + "name": "amount_cents" + } + } }, { "ordinal": 3, "name": "direction", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "direction" + } + } }, { "ordinal": 4, "name": "date", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "transactions", + "name": "date" + } + } }, { "ordinal": 5, "name": "description", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "description" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-7d7363a1746170ceec82763cadcf2e0803753901e73a2a8e04c87eb061bb724e.json b/server/.sqlx/query-7d7363a1746170ceec82763cadcf2e0803753901e73a2a8e04c87eb061bb724e.json index eebbcb1..3c9cfee 100644 --- a/server/.sqlx/query-7d7363a1746170ceec82763cadcf2e0803753901e73a2a8e04c87eb061bb724e.json +++ b/server/.sqlx/query-7d7363a1746170ceec82763cadcf2e0803753901e73a2a8e04c87eb061bb724e.json @@ -6,57 +6,123 @@ { "ordinal": 0, "name": "old_id?", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "id" + } + } }, { "ordinal": 2, "name": "name!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "name" + } + } }, { "ordinal": 3, "name": "account_id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "account_id" + } + } }, { "ordinal": 4, "name": "amount_cents!", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "amount_cents" + } + } }, { "ordinal": 5, "name": "direction!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "direction" + } + } }, { "ordinal": 6, "name": "starts_at!", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "starts_at" + } + } }, { "ordinal": 7, "name": "ends_at?", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "ends_at" + } + } }, { "ordinal": 8, "name": "recurrence_every!", - "type_info": "Int4" + "type_info": "Int4", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_every" + } + } }, { "ordinal": 9, "name": "recurrence_unit!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_unit" + } + } }, { "ordinal": 10, "name": "weekend_adjustment?", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "weekend_adjustment" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-87aa6dcbad3e6911c33c93ae02e001ec762ed8877a4a0bc66e195bdb1c113135.json b/server/.sqlx/query-87aa6dcbad3e6911c33c93ae02e001ec762ed8877a4a0bc66e195bdb1c113135.json index e915fb4..f6997a9 100644 --- a/server/.sqlx/query-87aa6dcbad3e6911c33c93ae02e001ec762ed8877a4a0bc66e195bdb1c113135.json +++ b/server/.sqlx/query-87aa6dcbad3e6911c33c93ae02e001ec762ed8877a4a0bc66e195bdb1c113135.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "users", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-8999f47eebb460120538c7d2bdbb40dadf634e98977ae59d2398579f9be82d6f.json b/server/.sqlx/query-8999f47eebb460120538c7d2bdbb40dadf634e98977ae59d2398579f9be82d6f.json index fbe0b94..5f28fc1 100644 --- a/server/.sqlx/query-8999f47eebb460120538c7d2bdbb40dadf634e98977ae59d2398579f9be82d6f.json +++ b/server/.sqlx/query-8999f47eebb460120538c7d2bdbb40dadf634e98977ae59d2398579f9be82d6f.json @@ -6,37 +6,79 @@ { "ordinal": 0, "name": "old_id?", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "id" + } + } }, { "ordinal": 2, "name": "account_id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "account_id" + } + } }, { "ordinal": 3, "name": "amount_cents!", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "transactions", + "name": "amount_cents" + } + } }, { "ordinal": 4, "name": "direction!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "direction" + } + } }, { "ordinal": 5, "name": "date!", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "transactions", + "name": "date" + } + } }, { "ordinal": 6, "name": "description!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "description" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-8d016626a5df98a049b4d32abe1fc8f4625ecc6abde27ae037a6e461e0fe0b6e.json b/server/.sqlx/query-8d016626a5df98a049b4d32abe1fc8f4625ecc6abde27ae037a6e461e0fe0b6e.json index 0316e23..d690bbe 100644 --- a/server/.sqlx/query-8d016626a5df98a049b4d32abe1fc8f4625ecc6abde27ae037a6e461e0fe0b6e.json +++ b/server/.sqlx/query-8d016626a5df98a049b4d32abe1fc8f4625ecc6abde27ae037a6e461e0fe0b6e.json @@ -6,27 +6,57 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "id" + } + } }, { "ordinal": 1, "name": "app_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "app_id" + } + } }, { "ordinal": 2, "name": "secret_hash", - "type_info": "Bytea" + "type_info": "Bytea", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "secret_hash" + } + } }, { "ordinal": 3, "name": "expires_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "expires_at" + } + } }, { "ordinal": 4, "name": "created_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "created_at" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-977a6afaf7511915973fd20ab3a3fb03aeda84d0d460c9db1b5b1e7025493879.json b/server/.sqlx/query-977a6afaf7511915973fd20ab3a3fb03aeda84d0d460c9db1b5b1e7025493879.json new file mode 100644 index 0000000..6bc3d55 --- /dev/null +++ b/server/.sqlx/query-977a6afaf7511915973fd20ab3a3fb03aeda84d0d460c9db1b5b1e7025493879.json @@ -0,0 +1,53 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO user_apps (id, user_id)\n VALUES ($1, $2)\n ON CONFLICT (id) DO UPDATE SET\n id = EXCLUDED.id\n WHERE user_apps.user_id = $2\n RETURNING WITH (OLD AS old_row, NEW AS new_row)\n old_row.id AS \"old_id?\",\n new_row.id AS \"id!\",\n new_row.user_id AS \"user_id!\"\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "old_id?", + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "id" + } + } + }, + { + "ordinal": 1, + "name": "id!", + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "id" + } + } + }, + { + "ordinal": 2, + "name": "user_id!", + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_apps", + "name": "user_id" + } + } + } + ], + "parameters": { + "Left": [ + "Uuid", + "Uuid" + ] + }, + "nullable": [ + false, + false, + false + ] + }, + "hash": "977a6afaf7511915973fd20ab3a3fb03aeda84d0d460c9db1b5b1e7025493879" +} diff --git a/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json b/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json index 811aa40..f71d520 100644 --- a/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json +++ b/server/.sqlx/query-9b5267c3bd09fb64717565c5c7e3084195d09c0a30f7e963a2497892398c6adc.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } }, { "ordinal": 1, "name": "name", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "accounts", + "name": "name" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-a49a3149600f1ad83c82aee5910949e895611df56fb0c07a54b2536b6a3a6329.json b/server/.sqlx/query-a49a3149600f1ad83c82aee5910949e895611df56fb0c07a54b2536b6a3a6329.json index fe8479e..00d5681 100644 --- a/server/.sqlx/query-a49a3149600f1ad83c82aee5910949e895611df56fb0c07a54b2536b6a3a6329.json +++ b/server/.sqlx/query-a49a3149600f1ad83c82aee5910949e895611df56fb0c07a54b2536b6a3a6329.json @@ -6,7 +6,8 @@ { "ordinal": 0, "name": "is_valid!", - "type_info": "Bool" + "type_info": "Bool", + "origin": "Expression" } ], "parameters": { diff --git a/server/.sqlx/query-a962ef0282ca37bb5eba2ee1b0bd93da2527f7e5a0c4332527f1e533f3ecd4f0.json b/server/.sqlx/query-a962ef0282ca37bb5eba2ee1b0bd93da2527f7e5a0c4332527f1e533f3ecd4f0.json index 4c3d7db..a4d5e3e 100644 --- a/server/.sqlx/query-a962ef0282ca37bb5eba2ee1b0bd93da2527f7e5a0c4332527f1e533f3ecd4f0.json +++ b/server/.sqlx/query-a962ef0282ca37bb5eba2ee1b0bd93da2527f7e5a0c4332527f1e533f3ecd4f0.json @@ -6,32 +6,68 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "account_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "transactions", + "name": "account_id" + } + } }, { "ordinal": 2, "name": "amount_cents", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "transactions", + "name": "amount_cents" + } + } }, { "ordinal": 3, "name": "direction", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "direction" + } + } }, { "ordinal": 4, "name": "date", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "transactions", + "name": "date" + } + } }, { "ordinal": 5, "name": "description", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "transactions", + "name": "description" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-ab6330c86c647fc7b8085152087066269b95eab3d60ad9d97219e93686a85a55.json b/server/.sqlx/query-ab6330c86c647fc7b8085152087066269b95eab3d60ad9d97219e93686a85a55.json index 9292e86..a22a049 100644 --- a/server/.sqlx/query-ab6330c86c647fc7b8085152087066269b95eab3d60ad9d97219e93686a85a55.json +++ b/server/.sqlx/query-ab6330c86c647fc7b8085152087066269b95eab3d60ad9d97219e93686a85a55.json @@ -6,17 +6,35 @@ { "ordinal": 0, "name": "old_id?", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } }, { "ordinal": 1, "name": "id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } }, { "ordinal": 2, "name": "name!", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "accounts", + "name": "name" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json b/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json index 04ec1cf..4578eae 100644 --- a/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json +++ b/server/.sqlx/query-b01b27f9cdf2ec1c9aa28be0e760d66d01c6083166bd6a6f53784ddcdc92f12c.json @@ -6,32 +6,68 @@ { "ordinal": 0, "name": "old_id?", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "id" + } + } }, { "ordinal": 1, "name": "id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "id" + } + } }, { "ordinal": 2, "name": "app_id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "app_id" + } + } }, { "ordinal": 3, "name": "secret_hash!", - "type_info": "Bytea" + "type_info": "Bytea", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "secret_hash" + } + } }, { "ordinal": 4, "name": "expires_at!", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "expires_at" + } + } }, { "ordinal": 5, "name": "created_at!", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "created_at" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-b755bf49d60419830ddaf5855268dd31e1f82bef6b4fd0046a4c5cbffb3e877a.json b/server/.sqlx/query-b755bf49d60419830ddaf5855268dd31e1f82bef6b4fd0046a4c5cbffb3e877a.json index d38284e..7597a53 100644 --- a/server/.sqlx/query-b755bf49d60419830ddaf5855268dd31e1f82bef6b4fd0046a4c5cbffb3e877a.json +++ b/server/.sqlx/query-b755bf49d60419830ddaf5855268dd31e1f82bef6b4fd0046a4c5cbffb3e877a.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-b7d48fe3fd0300c94344d7d8e93ceead2cf1ff00bd837c0fc42ec81347faa383.json b/server/.sqlx/query-b7d48fe3fd0300c94344d7d8e93ceead2cf1ff00bd837c0fc42ec81347faa383.json index 5ae4be4..552a796 100644 --- a/server/.sqlx/query-b7d48fe3fd0300c94344d7d8e93ceead2cf1ff00bd837c0fc42ec81347faa383.json +++ b/server/.sqlx/query-b7d48fe3fd0300c94344d7d8e93ceead2cf1ff00bd837c0fc42ec81347faa383.json @@ -6,27 +6,57 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "id" + } + } }, { "ordinal": 1, "name": "app_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "app_id" + } + } }, { "ordinal": 2, "name": "secret_hash", - "type_info": "Bytea" + "type_info": "Bytea", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "secret_hash" + } + } }, { "ordinal": 3, "name": "expires_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "expires_at" + } + } }, { "ordinal": 4, "name": "created_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "user_app_secrets", + "name": "created_at" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-e4cc5672787e94ee849cb175416e92f053d6a36609af5f6a244a2c236e3ffb21.json b/server/.sqlx/query-e4cc5672787e94ee849cb175416e92f053d6a36609af5f6a244a2c236e3ffb21.json deleted file mode 100644 index dc30807..0000000 --- a/server/.sqlx/query-e4cc5672787e94ee849cb175416e92f053d6a36609af5f6a244a2c236e3ffb21.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO user_apps (id, user_id)\n VALUES ($1, $2)\n ON CONFLICT (id) DO UPDATE SET\n id = EXCLUDED.id\n RETURNING WITH (OLD AS old_row, NEW AS new_row)\n old_row.id AS \"old_id?\",\n new_row.id AS \"id!\",\n new_row.user_id AS \"user_id!\"\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "old_id?", - "type_info": "Uuid" - }, - { - "ordinal": 1, - "name": "id!", - "type_info": "Uuid" - }, - { - "ordinal": 2, - "name": "user_id!", - "type_info": "Uuid" - } - ], - "parameters": { - "Left": [ - "Uuid", - "Uuid" - ] - }, - "nullable": [ - false, - false, - false - ] - }, - "hash": "e4cc5672787e94ee849cb175416e92f053d6a36609af5f6a244a2c236e3ffb21" -} diff --git a/server/.sqlx/query-ed9ae08575930c5b161d3f0c0f50479e51b54e348e1651f4a4e9b8328741cec7.json b/server/.sqlx/query-ed9ae08575930c5b161d3f0c0f50479e51b54e348e1651f4a4e9b8328741cec7.json index 0bb429b..85ec990 100644 --- a/server/.sqlx/query-ed9ae08575930c5b161d3f0c0f50479e51b54e348e1651f4a4e9b8328741cec7.json +++ b/server/.sqlx/query-ed9ae08575930c5b161d3f0c0f50479e51b54e348e1651f4a4e9b8328741cec7.json @@ -6,52 +6,112 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "name", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "name" + } + } }, { "ordinal": 2, "name": "account_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "account_id" + } + } }, { "ordinal": 3, "name": "amount_cents", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "amount_cents" + } + } }, { "ordinal": 4, "name": "direction", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "direction" + } + } }, { "ordinal": 5, "name": "starts_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "starts_at" + } + } }, { "ordinal": 6, "name": "ends_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "ends_at" + } + } }, { "ordinal": 7, "name": "recurrence_every", - "type_info": "Int4" + "type_info": "Int4", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_every" + } + } }, { "ordinal": 8, "name": "recurrence_unit", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_unit" + } + } }, { "ordinal": 9, "name": "weekend_adjustment", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "weekend_adjustment" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-ee3602e86d747b71e9d7c41965c4c7f58e16790af1303adcfe9686bb35fc741a.json b/server/.sqlx/query-ee3602e86d747b71e9d7c41965c4c7f58e16790af1303adcfe9686bb35fc741a.json index 1ce739f..b897d1b 100644 --- a/server/.sqlx/query-ee3602e86d747b71e9d7c41965c4c7f58e16790af1303adcfe9686bb35fc741a.json +++ b/server/.sqlx/query-ee3602e86d747b71e9d7c41965c4c7f58e16790af1303adcfe9686bb35fc741a.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "old_id?", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "users", + "name": "id" + } + } }, { "ordinal": 1, "name": "id!", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "users", + "name": "id" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-f4b604ad13d3424a7f3fc32bb40aa91981fe861b661169ac5310e9df0e7b99d9.json b/server/.sqlx/query-f4b604ad13d3424a7f3fc32bb40aa91981fe861b661169ac5310e9df0e7b99d9.json index 84e9c34..337ef6a 100644 --- a/server/.sqlx/query-f4b604ad13d3424a7f3fc32bb40aa91981fe861b661169ac5310e9df0e7b99d9.json +++ b/server/.sqlx/query-f4b604ad13d3424a7f3fc32bb40aa91981fe861b661169ac5310e9df0e7b99d9.json @@ -6,52 +6,112 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "id" + } + } }, { "ordinal": 1, "name": "name", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "name" + } + } }, { "ordinal": 2, "name": "account_id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "account_id" + } + } }, { "ordinal": 3, "name": "amount_cents", - "type_info": "Int8" + "type_info": "Int8", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "amount_cents" + } + } }, { "ordinal": 4, "name": "direction", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "direction" + } + } }, { "ordinal": 5, "name": "starts_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "starts_at" + } + } }, { "ordinal": 6, "name": "ends_at", - "type_info": "Timestamptz" + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "ends_at" + } + } }, { "ordinal": 7, "name": "recurrence_every", - "type_info": "Int4" + "type_info": "Int4", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_every" + } + } }, { "ordinal": 8, "name": "recurrence_unit", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "recurrence_unit" + } + } }, { "ordinal": 9, "name": "weekend_adjustment", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "recurring_transactions", + "name": "weekend_adjustment" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-f671ec25a4bc22127ea7d3a63be134719dc4aa4eb4c96d7c4d64388cfb658fa8.json b/server/.sqlx/query-f671ec25a4bc22127ea7d3a63be134719dc4aa4eb4c96d7c4d64388cfb658fa8.json index 44a8fdb..fee4176 100644 --- a/server/.sqlx/query-f671ec25a4bc22127ea7d3a63be134719dc4aa4eb4c96d7c4d64388cfb658fa8.json +++ b/server/.sqlx/query-f671ec25a4bc22127ea7d3a63be134719dc4aa4eb4c96d7c4d64388cfb658fa8.json @@ -6,12 +6,24 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "accounts", + "name": "id" + } + } }, { "ordinal": 1, "name": "name", - "type_info": "Text" + "type_info": "Text", + "origin": { + "Table": { + "table": "accounts", + "name": "name" + } + } } ], "parameters": { diff --git a/server/.sqlx/query-f90d488ec2fff2e09bfbc83c287313aaeaa275cf6e41272347821735d4b401d6.json b/server/.sqlx/query-f90d488ec2fff2e09bfbc83c287313aaeaa275cf6e41272347821735d4b401d6.json index 69c40ff..3a1b8e2 100644 --- a/server/.sqlx/query-f90d488ec2fff2e09bfbc83c287313aaeaa275cf6e41272347821735d4b401d6.json +++ b/server/.sqlx/query-f90d488ec2fff2e09bfbc83c287313aaeaa275cf6e41272347821735d4b401d6.json @@ -6,7 +6,13 @@ { "ordinal": 0, "name": "id", - "type_info": "Uuid" + "type_info": "Uuid", + "origin": { + "Table": { + "table": "tokens", + "name": "id" + } + } } ], "parameters": { diff --git a/server/src/database/dtos/results.rs b/server/src/database/dtos/results.rs index 3bc9e0c..244c318 100644 --- a/server/src/database/dtos/results.rs +++ b/server/src/database/dtos/results.rs @@ -12,6 +12,22 @@ impl Upsert { } } +pub enum GuardedUpsert { + Created(T), + Updated(T), + Rejected, +} + +impl GuardedUpsert { + pub fn try_map(self, f: impl FnOnce(T) -> Result) -> Result, E> { + Ok(match self { + Self::Created(value) => GuardedUpsert::Created(f(value)?), + Self::Updated(value) => GuardedUpsert::Updated(f(value)?), + Self::Rejected => GuardedUpsert::Rejected, + }) + } +} + pub enum Delete { Deleted, NotFound, diff --git a/server/src/database/user_apps.rs b/server/src/database/user_apps.rs index a8eb125..a6a08eb 100644 --- a/server/src/database/user_apps.rs +++ b/server/src/database/user_apps.rs @@ -2,7 +2,7 @@ use uuid::Uuid; use super::{ DatabaseError, - dtos::{Delete, Upsert, UserAppRow}, + dtos::{Delete, GuardedUpsert, UserAppRow}, }; pub struct Query { @@ -60,7 +60,7 @@ where pub async fn upsert<'e, E>( executor: E, app: UserAppRow, -) -> Result, DatabaseError> +) -> Result, DatabaseError> where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { @@ -70,6 +70,7 @@ where VALUES ($1, $2) ON CONFLICT (id) DO UPDATE SET id = EXCLUDED.id + WHERE user_apps.user_id = $2 RETURNING WITH (OLD AS old_row, NEW AS new_row) old_row.id AS "old_id?", new_row.id AS "id!", @@ -78,19 +79,23 @@ where app.id, app.user_id, ) - .fetch_one(executor) + .fetch_optional(executor) .await .map_err(DatabaseError::from)?; + let Some(row) = row else { + return Ok(GuardedUpsert::Rejected); + }; + let app = UserAppRow { id: row.id, user_id: row.user_id, }; Ok(if row.old_id.is_some() { - Upsert::Updated(app) + GuardedUpsert::Updated(app) } else { - Upsert::Created(app) + GuardedUpsert::Created(app) }) } diff --git a/server/src/error.rs b/server/src/error.rs index 4340f82..6f26a59 100644 --- a/server/src/error.rs +++ b/server/src/error.rs @@ -50,6 +50,15 @@ impl IntoResponse for AppError { Self::Repository(RepositoryError::Decode(error)) => { tracing::error!(%error, "invalid stored data"); } + Self::Repository(RepositoryError::OwnershipConflict { + relation: ReferenceRelation::UserApp, + }) => { + tracing::warn!("user app ownership conflict"); + return error_response(StatusCode::CONFLICT, "User app belongs to another user"); + } + Self::Repository(RepositoryError::OwnershipConflict { relation }) => { + tracing::error!(%relation, "unhandled ownership conflict"); + } Self::Repository(RepositoryError::ReferenceViolation { relation: ReferenceRelation::User, kind: ReferenceViolationKind::Missing, diff --git a/server/src/repository.rs b/server/src/repository.rs index 7631fc1..bac7c22 100644 --- a/server/src/repository.rs +++ b/server/src/repository.rs @@ -21,6 +21,9 @@ pub enum RepositoryError { #[error(transparent)] Decode(#[from] DecodeError), + #[error("{relation} is owned by another user")] + OwnershipConflict { relation: ReferenceRelation }, + #[error("reference violation ({kind}: {relation})")] ReferenceViolation { relation: ReferenceRelation, diff --git a/server/src/repository/user_apps.rs b/server/src/repository/user_apps.rs index 5d12997..1dab819 100644 --- a/server/src/repository/user_apps.rs +++ b/server/src/repository/user_apps.rs @@ -1,8 +1,12 @@ use uuid::Uuid; -use super::{QueryConversionError, RepositoryError, dtos::Upsert}; +use super::{QueryConversionError, ReferenceRelation, RepositoryError, dtos::Upsert}; use crate::{ - database::{Constraint, DatabaseError, dtos::UserAppRow, user_apps as db}, + database::{ + Constraint, DatabaseError, + dtos::{GuardedUpsert, UserAppRow}, + user_apps as db, + }, domain::UserApp, repository::DecodeError, }; @@ -58,13 +62,23 @@ pub async fn upsert<'e, E>(executor: E, app: UserApp) -> Result, where E: sqlx::Executor<'e, Database = sqlx::Postgres>, { - let app = db::upsert(executor, encode(app)) + let outcome = db::upsert(executor, encode(app)) .await - .map_err(classify_upsert_error)? - .try_map(decode)? - .into(); + .map_err(classify_upsert_error)?; - Ok(app) + map_upsert(outcome) +} + +fn map_upsert(outcome: GuardedUpsert) -> Result, RepositoryError> { + Ok(match outcome.try_map(decode)? { + GuardedUpsert::Created(app) => Upsert::Created(app), + GuardedUpsert::Updated(app) => Upsert::Updated(app), + GuardedUpsert::Rejected => { + return Err(RepositoryError::OwnershipConflict { + relation: ReferenceRelation::UserApp, + }); + } + }) } fn classify_upsert_error(error: DatabaseError) -> RepositoryError { @@ -138,6 +152,41 @@ mod tests { assert!(matches!(error, RepositoryError::Database(_))); } + #[test] + fn maps_created_upsert() { + let row = row(); + let id = row.id; + + let Ok(Upsert::Created(app)) = map_upsert(GuardedUpsert::Created(row)) else { + panic!("expected created upsert"); + }; + assert_eq!(app.id, id); + } + + #[test] + fn maps_updated_upsert() { + let row = row(); + let id = row.id; + + let Ok(Upsert::Updated(app)) = map_upsert(GuardedUpsert::Updated(row)) else { + panic!("expected updated upsert"); + }; + assert_eq!(app.id, id); + } + + #[test] + fn maps_rejected_upsert_to_ownership_conflict() { + let Err(error) = map_upsert(GuardedUpsert::Rejected) else { + panic!("expected ownership conflict"); + }; + assert!(matches!( + error, + RepositoryError::OwnershipConflict { + relation: ReferenceRelation::UserApp, + } + )); + } + fn row() -> UserAppRow { UserAppRow { id: Uuid::new_v4(),