From 16592f38bdc1de4c877f0946dce893a44785dd63 Mon Sep 17 00:00:00 2001 From: Tiago Amorim Date: Tue, 2 Apr 2024 21:36:59 +0100 Subject: [PATCH] new metadata + missing route added to server --- ...01dbe7cc4dfb980be968022048974e50894e.json} | 5 +- ...4250a72beb399757f46e4cbf33e6d279bc33.json} | 5 +- ...759fbf8e0862de3546220725ffc3808f5b30b.json | 29 ++++++ ...c91b703e368e634a3645501fe9e89c8ba839c.json | 22 +++++ ...45e5e11e2b9363b8f9b0092a11adf1862a31a.json | 25 +++++ ...d7447fb0c1a156aa3111c0e3aafb259d0a2e9.json | 30 ++++++ ...2b6ede30398dc159e94db2c073e1e6df06cb4.json | 92 +++++++++++++++++++ ...ad8685b602f60ffbe6a2c59fc1233f4462e6.json} | 14 ++- ...93431def0bc4d7b2b5b4d3f93dec7641ff5d3.json | 23 ----- ...d754dbc424b2e8f7bf5874c092db261e58406.json | 46 ++++++++++ ...b0093f52fc6979a2809290eb077afc3fee077.json | 15 +++ src/startup.rs | 1 + 12 files changed, 276 insertions(+), 31 deletions(-) rename .sqlx/{query-1cd7318a26a45b9431c4e3d61815c24be34c376a0b15ed1cd59dd3031a0b4cce.json => query-070290a2c348195bf3a04582b93301dbe7cc4dfb980be968022048974e50894e.json} (61%) rename .sqlx/{query-325cf3ae5d728cb97e4bcf77f19213212ea58ba58c6103776cb6aaa0d6f06873.json => query-3772df638548e40b36e639c895304250a72beb399757f46e4cbf33e6d279bc33.json} (79%) create mode 100644 .sqlx/query-5bd61773f8d235712ce17cf1449759fbf8e0862de3546220725ffc3808f5b30b.json create mode 100644 .sqlx/query-6b45e37be7df715fbf077f260bcc91b703e368e634a3645501fe9e89c8ba839c.json create mode 100644 .sqlx/query-6c6615bfe3b860fdfcce006050045e5e11e2b9363b8f9b0092a11adf1862a31a.json create mode 100644 .sqlx/query-6d7804f56f02dfdb5b23452cd4fd7447fb0c1a156aa3111c0e3aafb259d0a2e9.json create mode 100644 .sqlx/query-77c51d4d8d6ee46df5832cb5e042b6ede30398dc159e94db2c073e1e6df06cb4.json rename .sqlx/{query-fce7e591c90cf11c2b59d52858ec9f4e9ed5934250f0370208a145737429cab2.json => query-b4b786efab4ecdb6c23db4cd1178ad8685b602f60ffbe6a2c59fc1233f4462e6.json} (76%) delete mode 100644 .sqlx/query-bbe892f0ae99ebf75bf3aca540b93431def0bc4d7b2b5b4d3f93dec7641ff5d3.json create mode 100644 .sqlx/query-c02a9d30f4244ca2a9f575f70d5d754dbc424b2e8f7bf5874c092db261e58406.json create mode 100644 .sqlx/query-eb0827f18105e24c0ad7e117708b0093f52fc6979a2809290eb077afc3fee077.json diff --git a/.sqlx/query-1cd7318a26a45b9431c4e3d61815c24be34c376a0b15ed1cd59dd3031a0b4cce.json b/.sqlx/query-070290a2c348195bf3a04582b93301dbe7cc4dfb980be968022048974e50894e.json similarity index 61% rename from .sqlx/query-1cd7318a26a45b9431c4e3d61815c24be34c376a0b15ed1cd59dd3031a0b4cce.json rename to .sqlx/query-070290a2c348195bf3a04582b93301dbe7cc4dfb980be968022048974e50894e.json index f0812db..37724e8 100644 --- a/.sqlx/query-1cd7318a26a45b9431c4e3d61815c24be34c376a0b15ed1cd59dd3031a0b4cce.json +++ b/.sqlx/query-070290a2c348195bf3a04582b93301dbe7cc4dfb980be968022048974e50894e.json @@ -1,12 +1,13 @@ { "db_name": "PostgreSQL", - "query": "UPDATE items\n SET\n order_id = $1,\n location = $2,\n status = $3,\n acc_cost = $4\n WHERE id = $5", + "query": "UPDATE items\n SET\n order_id = $1,\n warehouse = $2,\n production_line = $3,\n status = $4,\n acc_cost = $5\n WHERE id = $6", "describe": { "columns": [], "parameters": { "Left": [ "Uuid", "Bpchar", + "Bpchar", { "Custom": { "name": "item_status", @@ -21,5 +22,5 @@ }, "nullable": [] }, - "hash": "1cd7318a26a45b9431c4e3d61815c24be34c376a0b15ed1cd59dd3031a0b4cce" + "hash": "070290a2c348195bf3a04582b93301dbe7cc4dfb980be968022048974e50894e" } diff --git a/.sqlx/query-325cf3ae5d728cb97e4bcf77f19213212ea58ba58c6103776cb6aaa0d6f06873.json b/.sqlx/query-3772df638548e40b36e639c895304250a72beb399757f46e4cbf33e6d279bc33.json similarity index 79% rename from .sqlx/query-325cf3ae5d728cb97e4bcf77f19213212ea58ba58c6103776cb6aaa0d6f06873.json rename to .sqlx/query-3772df638548e40b36e639c895304250a72beb399757f46e4cbf33e6d279bc33.json index 875ebff..abfaa32 100644 --- a/.sqlx/query-325cf3ae5d728cb97e4bcf77f19213212ea58ba58c6103776cb6aaa0d6f06873.json +++ b/.sqlx/query-3772df638548e40b36e639c895304250a72beb399757f46e4cbf33e6d279bc33.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO\n items (id, piece_kind, order_id, location, status, acc_cost)\n VALUES ($1, $2, $3, $4, $5, $6)", + "query": "INSERT INTO\n items (id, piece_kind, order_id, warehouse, production_line, status, acc_cost)\n VALUES ($1, $2, $3, $4, $5, $6, $7)", "describe": { "columns": [], "parameters": { @@ -26,6 +26,7 @@ }, "Uuid", "Bpchar", + "Bpchar", { "Custom": { "name": "item_status", @@ -39,5 +40,5 @@ }, "nullable": [] }, - "hash": "325cf3ae5d728cb97e4bcf77f19213212ea58ba58c6103776cb6aaa0d6f06873" + "hash": "3772df638548e40b36e639c895304250a72beb399757f46e4cbf33e6d279bc33" } diff --git a/.sqlx/query-5bd61773f8d235712ce17cf1449759fbf8e0862de3546220725ffc3808f5b30b.json b/.sqlx/query-5bd61773f8d235712ce17cf1449759fbf8e0862de3546220725ffc3808f5b30b.json new file mode 100644 index 0000000..7de5a9f --- /dev/null +++ b/.sqlx/query-5bd61773f8d235712ce17cf1449759fbf8e0862de3546220725ffc3808f5b30b.json @@ -0,0 +1,29 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE orders\n SET status = $1\n WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + { + "Custom": { + "name": "order_status", + "kind": { + "Enum": [ + "pending", + "scheduled", + "producing", + "completed", + "delivered", + "canceled" + ] + } + } + }, + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "5bd61773f8d235712ce17cf1449759fbf8e0862de3546220725ffc3808f5b30b" +} diff --git a/.sqlx/query-6b45e37be7df715fbf077f260bcc91b703e368e634a3645501fe9e89c8ba839c.json b/.sqlx/query-6b45e37be7df715fbf077f260bcc91b703e368e634a3645501fe9e89c8ba839c.json new file mode 100644 index 0000000..fadc6d4 --- /dev/null +++ b/.sqlx/query-6b45e37be7df715fbf077f260bcc91b703e368e634a3645501fe9e89c8ba839c.json @@ -0,0 +1,22 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT id FROM orders WHERE due_date = $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Uuid" + } + ], + "parameters": { + "Left": [ + "Int4" + ] + }, + "nullable": [ + false + ] + }, + "hash": "6b45e37be7df715fbf077f260bcc91b703e368e634a3645501fe9e89c8ba839c" +} diff --git a/.sqlx/query-6c6615bfe3b860fdfcce006050045e5e11e2b9363b8f9b0092a11adf1862a31a.json b/.sqlx/query-6c6615bfe3b860fdfcce006050045e5e11e2b9363b8f9b0092a11adf1862a31a.json new file mode 100644 index 0000000..968a12c --- /dev/null +++ b/.sqlx/query-6c6615bfe3b860fdfcce006050045e5e11e2b9363b8f9b0092a11adf1862a31a.json @@ -0,0 +1,25 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO transformations\n (material_id, product_id, recipe_id, date)\n VALUES ($1, $2, $3, $4)\n RETURNING id", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [ + "Uuid", + "Uuid", + "Int8", + "Int4" + ] + }, + "nullable": [ + false + ] + }, + "hash": "6c6615bfe3b860fdfcce006050045e5e11e2b9363b8f9b0092a11adf1862a31a" +} diff --git a/.sqlx/query-6d7804f56f02dfdb5b23452cd4fd7447fb0c1a156aa3111c0e3aafb259d0a2e9.json b/.sqlx/query-6d7804f56f02dfdb5b23452cd4fd7447fb0c1a156aa3111c0e3aafb259d0a2e9.json new file mode 100644 index 0000000..3014022 --- /dev/null +++ b/.sqlx/query-6d7804f56f02dfdb5b23452cd4fd7447fb0c1a156aa3111c0e3aafb259d0a2e9.json @@ -0,0 +1,30 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE orders\n SET delivery_day = $1,\n status = $2\n WHERE id = $3", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + { + "Custom": { + "name": "order_status", + "kind": { + "Enum": [ + "pending", + "scheduled", + "producing", + "completed", + "delivered", + "canceled" + ] + } + } + }, + "Uuid" + ] + }, + "nullable": [] + }, + "hash": "6d7804f56f02dfdb5b23452cd4fd7447fb0c1a156aa3111c0e3aafb259d0a2e9" +} diff --git a/.sqlx/query-77c51d4d8d6ee46df5832cb5e042b6ede30398dc159e94db2c073e1e6df06cb4.json b/.sqlx/query-77c51d4d8d6ee46df5832cb5e042b6ede30398dc159e94db2c073e1e6df06cb4.json new file mode 100644 index 0000000..e4b11ac --- /dev/null +++ b/.sqlx/query-77c51d4d8d6ee46df5832cb5e042b6ede30398dc159e94db2c073e1e6df06cb4.json @@ -0,0 +1,92 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n\n transformations.id as transformation_id,\n transformations.material_id,\n transformations.product_id,\n\n recipes.material_kind as \"material_kind: PieceKind\",\n recipes.product_kind as \"product_kind: PieceKind\",\n recipes.tool as \"tool: ToolType\",\n recipes.operation_time\n\n FROM transformations\n\n JOIN recipes ON transformations.recipe_id = recipes.id\n\n WHERE transformations.date = $1 AND transformations.status = 'pending'\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "transformation_id", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "material_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "product_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "material_kind: PieceKind", + "type_info": { + "Custom": { + "name": "piece_kind", + "kind": { + "Enum": [ + "P1", + "P2", + "P3", + "P4", + "P5", + "P6", + "P7", + "P8", + "P9" + ] + } + } + } + }, + { + "ordinal": 4, + "name": "product_kind: PieceKind", + "type_info": { + "Custom": { + "name": "piece_kind", + "kind": { + "Enum": [ + "P1", + "P2", + "P3", + "P4", + "P5", + "P6", + "P7", + "P8", + "P9" + ] + } + } + } + }, + { + "ordinal": 5, + "name": "tool: ToolType", + "type_info": "Bpchar" + }, + { + "ordinal": 6, + "name": "operation_time", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Int4" + ] + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + false + ] + }, + "hash": "77c51d4d8d6ee46df5832cb5e042b6ede30398dc159e94db2c073e1e6df06cb4" +} diff --git a/.sqlx/query-fce7e591c90cf11c2b59d52858ec9f4e9ed5934250f0370208a145737429cab2.json b/.sqlx/query-b4b786efab4ecdb6c23db4cd1178ad8685b602f60ffbe6a2c59fc1233f4462e6.json similarity index 76% rename from .sqlx/query-fce7e591c90cf11c2b59d52858ec9f4e9ed5934250f0370208a145737429cab2.json rename to .sqlx/query-b4b786efab4ecdb6c23db4cd1178ad8685b602f60ffbe6a2c59fc1233f4462e6.json index caf4ddc..4448561 100644 --- a/.sqlx/query-fce7e591c90cf11c2b59d52858ec9f4e9ed5934250f0370208a145737429cab2.json +++ b/.sqlx/query-b4b786efab4ecdb6c23db4cd1178ad8685b602f60ffbe6a2c59fc1233f4462e6.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT\n id,\n piece_kind as \"piece_kind: PieceKind\",\n order_id,\n location,\n status as \"status: ItemStatus\",\n acc_cost\n FROM items WHERE id = $1", + "query": "SELECT\n id,\n piece_kind as \"piece_kind: PieceKind\",\n order_id,\n warehouse,\n production_line,\n status as \"status: ItemStatus\",\n acc_cost\n FROM items WHERE id = $1", "describe": { "columns": [ { @@ -37,16 +37,21 @@ }, { "ordinal": 3, - "name": "location", + "name": "warehouse", "type_info": "Bpchar" }, { "ordinal": 4, + "name": "production_line", + "type_info": "Bpchar" + }, + { + "ordinal": 5, "name": "status: ItemStatus", "type_info": "Varchar" }, { - "ordinal": 5, + "ordinal": 6, "name": "acc_cost", "type_info": "Money" } @@ -61,9 +66,10 @@ false, true, true, + true, false, false ] }, - "hash": "fce7e591c90cf11c2b59d52858ec9f4e9ed5934250f0370208a145737429cab2" + "hash": "b4b786efab4ecdb6c23db4cd1178ad8685b602f60ffbe6a2c59fc1233f4462e6" } diff --git a/.sqlx/query-bbe892f0ae99ebf75bf3aca540b93431def0bc4d7b2b5b4d3f93dec7641ff5d3.json b/.sqlx/query-bbe892f0ae99ebf75bf3aca540b93431def0bc4d7b2b5b4d3f93dec7641ff5d3.json deleted file mode 100644 index 37a7e25..0000000 --- a/.sqlx/query-bbe892f0ae99ebf75bf3aca540b93431def0bc4d7b2b5b4d3f93dec7641ff5d3.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "INSERT INTO transformations (material_id, product_id)\n VALUES ($1, $2)\n RETURNING id", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8" - } - ], - "parameters": { - "Left": [ - "Uuid", - "Uuid" - ] - }, - "nullable": [ - false - ] - }, - "hash": "bbe892f0ae99ebf75bf3aca540b93431def0bc4d7b2b5b4d3f93dec7641ff5d3" -} diff --git a/.sqlx/query-c02a9d30f4244ca2a9f575f70d5d754dbc424b2e8f7bf5874c092db261e58406.json b/.sqlx/query-c02a9d30f4244ca2a9f575f70d5d754dbc424b2e8f7bf5874c092db261e58406.json new file mode 100644 index 0000000..9c3acb7 --- /dev/null +++ b/.sqlx/query-c02a9d30f4244ca2a9f575f70d5d754dbc424b2e8f7bf5874c092db261e58406.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n id,\n material_id,\n product_id,\n recipe_id,\n date\n FROM transformations\n WHERE id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "material_id", + "type_info": "Uuid" + }, + { + "ordinal": 2, + "name": "product_id", + "type_info": "Uuid" + }, + { + "ordinal": 3, + "name": "recipe_id", + "type_info": "Int8" + }, + { + "ordinal": 4, + "name": "date", + "type_info": "Int4" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true + ] + }, + "hash": "c02a9d30f4244ca2a9f575f70d5d754dbc424b2e8f7bf5874c092db261e58406" +} diff --git a/.sqlx/query-eb0827f18105e24c0ad7e117708b0093f52fc6979a2809290eb077afc3fee077.json b/.sqlx/query-eb0827f18105e24c0ad7e117708b0093f52fc6979a2809290eb077afc3fee077.json new file mode 100644 index 0000000..1f8a0e5 --- /dev/null +++ b/.sqlx/query-eb0827f18105e24c0ad7e117708b0093f52fc6979a2809290eb077afc3fee077.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE transformations\n SET status = 'completed', date = $1\n WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int4", + "Int8" + ] + }, + "nullable": [] + }, + "hash": "eb0827f18105e24c0ad7e117708b0093f52fc6979a2809290eb077afc3fee077" +} diff --git a/src/startup.rs b/src/startup.rs index 5694b51..84bb3b9 100644 --- a/src/startup.rs +++ b/src/startup.rs @@ -108,6 +108,7 @@ impl App { .service(routes::get_daily_transformations) .service(routes::post_transformation_completion) .service(routes::post_warehouse_action) + .service(routes::post_material_arrival) .app_data(Data::new(self.pool.clone())) }) .bind(addr.clone())