From 5478a2ac2797524650b83f729109d5ad56e6a930 Mon Sep 17 00:00:00 2001 From: filipriec Date: Fri, 23 May 2025 13:34:39 +0200 Subject: [PATCH] server changes for the ID in the tree --- common/proto/table_definition.proto | 5 +++-- common/src/proto/descriptor.bin | Bin 21098 -> 21177 bytes .../src/proto/multieko2.table_definition.rs | 6 ++++-- .../handlers/get_profile_tree.rs | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index d9ffc0c..fb2b369 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -35,8 +35,9 @@ message TableDefinitionResponse { message ProfileTreeResponse { message Table { - string name = 1; - repeated string depends_on = 2; + int64 id = 1; + string name = 2; + repeated string depends_on = 3; } message Profile { diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index ba932184bef22843e536e366e172177c13deb8b8..2bc3df36e5da965897810efee6f1b5b3590a2c36 100644 GIT binary patch delta 843 zcmYL{yKWOf7=`EZ@3Q`VAsNTiKL-p zdg_22l#`e}ZnX2gq!LDt%Bny_kFu(XomK+#qp~X)*`u2YcS;Gk3Df-pF(cMC$?w3qaAAGDZyxn}=mT>9*B;(Djh;EVl7X$?HI znK;dAxR{#Zh1o;8w#J+?3jlF*^3nhh2IsY{j9#X9J;$@ke9#t@RdkiDvB+zHtX4O9 NibRdY=F_V`?f=_HLfQZT delta 748 zcmYL{J5Iwu6h%GbXJaM-lF7#*ArikhN`j1V00)p*1w9{;4gnGia7T+EECFhe(!fU8 z038h#EpW&7*yZti_skvJ@6YV(iM`$h{MVh{2OejSleg^)XJ1%Hr)L-Aht1kTTZr@V z_4xAq=J@Ke!KWuXw|w?xPS}!|u{Zq=f6Ue<6GE6oOqy#>OB4kWnTDiw>Q4R++EGKy ziy8HZ8qK5!iAn0w zh6S=8n%pR z*Vs#b5gTi}_(jwuZB-+rBm;miBquh2uo%vkG{F~Es%Z?P5hV?6u4;_Z8Xz?*$TY?f M8`bL5kHgQ(KV!8zhX4Qo diff --git a/common/src/proto/multieko2.table_definition.rs b/common/src/proto/multieko2.table_definition.rs index 629ab48..85be25e 100644 --- a/common/src/proto/multieko2.table_definition.rs +++ b/common/src/proto/multieko2.table_definition.rs @@ -42,9 +42,11 @@ pub struct ProfileTreeResponse { pub mod profile_tree_response { #[derive(Clone, PartialEq, ::prost::Message)] pub struct Table { - #[prost(string, tag = "1")] + #[prost(int64, tag = "1")] + pub id: i64, + #[prost(string, tag = "2")] pub name: ::prost::alloc::string::String, - #[prost(string, repeated, tag = "2")] + #[prost(string, repeated, tag = "3")] pub depends_on: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } #[derive(Clone, PartialEq, ::prost::Message)] diff --git a/server/src/table_definition/handlers/get_profile_tree.rs b/server/src/table_definition/handlers/get_profile_tree.rs index 3d879e7..3e68be3 100644 --- a/server/src/table_definition/handlers/get_profile_tree.rs +++ b/server/src/table_definition/handlers/get_profile_tree.rs @@ -26,6 +26,7 @@ pub async fn get_profile_tree( let tables = sqlx::query!( r#" SELECT + td.id as table_id, td.table_name, COALESCE( json_agg( @@ -40,7 +41,7 @@ pub async fn get_profile_tree( LEFT JOIN table_definition_links tdl ON td.id = tdl.source_table_id LEFT JOIN table_definitions ltd ON tdl.linked_table_id = ltd.id WHERE td.profile_id = $1 - GROUP BY td.table_name + GROUP BY td.id, td.table_name "#, profile.id ) @@ -59,6 +60,7 @@ pub async fn get_profile_tree( .unwrap_or_default(); Table { + id: record.table_id, name: record.table_name, depends_on: dependencies .into_iter()