From 6ab03aae9492dcc074560d2e34d5508dda08ac9a Mon Sep 17 00:00:00 2001 From: Priec Date: Tue, 21 Jul 2026 08:37:36 +0200 Subject: [PATCH] journal id is now part of the db --- client | 2 +- common/proto/tables_data.proto | 8 ++++++++ common/src/proto/descriptor.bin | Bin 117249 -> 117785 bytes common/src/proto/komp_ac.tables_data.rs | 8 ++++++++ .../src/pages/import_export/import/logic.rs | 5 ++++- server | 2 +- tui-pages | 2 +- 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/client b/client index 88902a4..baa6055 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 88902a4b5d10e3f771e288a27afda3f5a7cab56f +Subproject commit baa60556d04c114ca23117d195ef5c5411761f13 diff --git a/common/proto/tables_data.proto b/common/proto/tables_data.proto index c406780..2cb57bf 100644 --- a/common/proto/tables_data.proto +++ b/common/proto/tables_data.proto @@ -121,6 +121,11 @@ message PostTableDataRequest { // - Some application-specific validations may apply (e.g., max length for // certain fields like "telefon") map data = 3; + + // Optional. Existing journal that receives the posting generated for this row. + // Required when the table has an active after-insert posting script and rejected + // when the table has no active posting script. + optional int64 journal_id = 4; } // Insert response. @@ -145,6 +150,9 @@ message PostTableDataResponse { message PostTableDataBulkRow { // Required. Same data payload as PostTableDataRequest.data. map data = 1; + + // Optional. Existing journal that receives the posting generated for this row. + optional int64 journal_id = 2; } // Bulk insert request. diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index fb258faa04f2a77e37978cdaf1b66cf9a3b1766f..08d5faaa4c7bc1bfb381959c04c225044962ce8f 100644 GIT binary patch delta 3280 zcmb_eYiv}<6~1To?%lhyc5GiiFy`S)V#34RRT8^u5<#RS3JHmd8%Tu8BgnNkbkoXq z*GsAL$3Ygz1VJ#tn%GH^Dfo@s0T z)z)-twe8c=$aB`Zcz$h7YY&lH*heo`JXI_cTMJw7pC(zUY7bGR+Sf}T+t*1}r~?P7 zLjCd}t?6y4``@g0Nmi?~15~X(Cwh83^){V|$KTo_V_uZ3W8)9}j-D?`_)^%G7u{gJ zLE}4e^zZ1lFG$+9B_dv=OZYW^BfqI5n{G$YN&lJOraQCgwrzesHb47|=B%GdwWQL& zNp%9H{Eqf;$F@{kD$|@zwfe8NXJAQp`kD3}N$Iak{d#*klWJAHWmM77+~zm8WWn~E zU(Kd6LAtFomC4@o(%F(pcVzwMwpN_-TB-&9BopVn{dHMoS5nF%8Rb}Q4)z|30wqd~ zjeyGL8N_KVtd*QLc}_Q32Z?Gte@%F9Ce_)|j!$?_$cRnk+1=zWkO4|U!t(50B+6@Q z{g*P^Q@%PjN_7EN99fJoV8`}d6uZyB2*WZ@F41fldlVg~WkC-KH@}BZ=%IM2fuQtI zd4;Uk6ye!>)rR8~1ba!u@_Pg*d&w;~5R|=CHAimH6rla;kH_g}EB6yB5(XA=uu6$) z1L0vm&0T6BbEtlWd{ld|J-b(}9;3&Ty@f+jEW4N7iaf;zrI+SZ%ZE`%;W>R|y{rB( zMh}(rkvm_mfg{1?QtF>$^g@>+QKy+$gd;_Zml+60idF=2v!=i}Kv3P<|EuVl!a4{+ z$PNDQ!6-v0g{uUsJ{?lYLxeU!&`KS0jCjsrvW`G2RsK`z{20xxj$r#?a(&r^&?B7f zAc>lqC)E#6P`$c%f))i>2pbJEb`Mg#QacBP^FgYfD}SQNFb=7zlhhOp6(}6f5XHkr zM+AW~#EsslDbU8SI(U*cuNpQPMT9`3hbd8;KZT_-Onz8#*+FQ76YBd3dL)=IpR^7m&{N^1xx9Y z845t&#Y3@Pb0FHw>Zj+asWHka+m{Qc@mO9acdjlDtRP;d`3v;*=6KF$WPPQ+_=svt zKI5@m4R;O~XG*ze>A7IaG#HC;G-VnL2uD+ssMtuGTeki8;Dj*Z2}Ef|O#O^9@=5Akr6q3_HIe zw-P4Xj&aGZlL)U*AoKt*oNPesy>3JTh(NBhNJ45Ctl#3%(AmcHcmRfXIiR+>;fnzX z?zdd_kc;x&AQ3h;$23!Sn)3>Zxtxq@LNXf*u$Gx>wKBTJ?A!A z|4~!tk?d`9YxN}==Vb3F=g+h`xMQ@AML4=+vMfW|qnyIO$H;u|u$YZM3w z1>Q9Z1mvwofq?LHmlgOU1SCCYr?B1>RI^0Q9HGT(?O*WF>=gMcN^)e~Lj5p7^^E}N zL$}B)3J{LFMgFY-gyU|Jzo{e#xLc^EQ`FD^0OsxjlSA4q@=pe=VD1*^#KTBUawqnv z-0x$bp7ieYaK7lLbQvpv2j=pdF%M0`( zCHsU3A2qDPRiCJ;(XIgDs!uFfC(T3GL^t)I|?rH2JxX%=G<2R;~4nyLfB-Jq#@5uY^_R=p7bfeaOxoWqc*I;>z0an)ZyAjO_@L|Dhvri=7^ z=@H>B)`1jrAV>3oe033l95wD>g1e(85J0#)Y62 delta 2836 zcmYjTZERFU6x}=f_U+rZEiJDt&;souMWFO8AFV+Ws!sTwo&7WsZ2madbe`6XzY7+HE~{hwP#kV-2$76cxz7KA~zk z+d&=FD?g0W>uSxw!A>f&LlgV$pc5e9*@4#2>G?dn%oc{vG4}c1AGrG!{TtZK1LOpb z_}Yj{oXC#)hPuOzk;8Qjhhq4Q+W7emBFBHkT5h|xVUPg7Nv=Fk>)j?2rk!gCc#tqk z!37%n87_3})rx}2WAff5T3JPc0sthe%u2)t4CQMG;xQ^HwAU%3aEuoD^LcXJ781eC z8UacRSp^z`(n5MF*C1GdQ_)Uybc!`FH&`QN?G-M8~tF)g~5e&yT zL87>%Lf*Yf%j6#ys5puNogR8&-YU$H4UkXJ;wAP*NGTk%oqV0LvY$5OwUf2X-hq&U zHH*uG{j@V0CsD4L7(}2rty-%g0>!D)waXF6@0cgacUm49pp|(i$%@#!5XjGg60&!I zcDo6!AqEjBL7^fQ2oQl1w4~U6K~XT7l+lZ{%S~n}EPIkdo`!xwpd?wtmlOrEcgdcM zR9n-fHS`Ms4ZA2@mdV1W&_xk%Gnhq$E?T|DUWMun$2>#6FXgsNRGxQ+tQGcF#5K73 zlzi_JJ>{mfbufrPDQz7<1WIY^7@Q@|)>-SOb@dqJQEeJPP||FgT9pOW_sGqc>D8JZ zT|JHf)%Q?1qN)c(gdSQ^p&=slkQ;?xg%NPfbL1PAKV7EB^UsmB)ZT!&0j|Cm*Kml| zRRh4ry}BYm#Ou{Z0El?Kd<5*M04M7s`TG!6RRMt6mu2!^`t(U)7R)|AiA{=$z4Xf; zzNYGEzjk0i72i*mXKp}H`YCsT-C-yW;NZaeZ>T`HgW7EY;YXf9?KVJO#ctc9IPmGdWAC8@Z#35ZziWiiHB7Lt^A*^R z3?{2LA|qGmId?>#JqEF6M4vq%GK}c6H(9ouUfaMoRJ*BF1LQgF06-9LvI8nqE~qvt z?_a_8M)ht?rP?T2j@k_%D5F%gNVN@<(HOUlJ?0Kz(Bx_JO1^_XrRfXw9P zv00@CbzJ^>m9`um&!%P}$92mvm5}4yGIAhf&@pe3?=F$eq6M+?7Fk7@GK?ULcAJFP zwt%1kpw~J9vG%rh4j>A-&Cc)v zWGz&?0|aH73X9Z5uoykyi?FL2-^leKOXP!ppsxdFc`089?sy@`d`P~3tcn`@c zQ=K%#o1T%S-%+hQqg{_d1e(#V2SlJ57M~xm5SKTroVX3&u+yw|A|RYNtDOkQOSKaL z5oea2_yh{F9rF?SK9Ds-RGt4wH!+(Fnp3B+F*>JZ#3&-o=>q^nq&a;6Hdi#S4q%Hr zpXG4&c`ZE_fiut2Z^SNamcChTAEv5kv&dKngP=6Sze;*QP?`lAR}BgdJLYkLr!zfF zTl0?#^o<_{B89o)wt>HgX*X533E@3*7)7Wyv8Y6a0z{}bvAop&j1&p89YU0qd_SOipfx5Tr8tV?ow(FFicT(UjXLsiC#uBn=h$^e_jU)-3 z1Q1CQBJ-jHB1uAIo|7D|ASr*t!OEv^;36fnJU)}8$UN&<2wqa)Om;%xT*o{ud}n3D z4g3>4Ev!|lj9f0G+baX#D5G1414OuPT?Qb+b?Y*6xr~%o#%m*Fx~VLW%Sh=mun@cy qm+><8oy+p3WqgEQsYq*UU=WnFu)P0)fS{yBLE)R`p~JDpSk-?{V3sNX diff --git a/common/src/proto/komp_ac.tables_data.rs b/common/src/proto/komp_ac.tables_data.rs index 0bf47fa..a77bc59 100644 --- a/common/src/proto/komp_ac.tables_data.rs +++ b/common/src/proto/komp_ac.tables_data.rs @@ -45,6 +45,11 @@ pub struct PostTableDataRequest { ::prost::alloc::string::String, ::prost_types::Value, >, + /// Optional. Existing journal that receives the posting generated for this row. + /// Required when the table has an active after-insert posting script and rejected + /// when the table has no active posting script. + #[prost(int64, optional, tag = "4")] + pub journal_id: ::core::option::Option, } /// Insert response. #[derive(Clone, PartialEq, ::prost::Message)] @@ -74,6 +79,9 @@ pub struct PostTableDataBulkRow { ::prost::alloc::string::String, ::prost_types::Value, >, + /// Optional. Existing journal that receives the posting generated for this row. + #[prost(int64, optional, tag = "2")] + pub journal_id: ::core::option::Option, } /// Bulk insert request. #[derive(Clone, PartialEq, ::prost::Message)] diff --git a/graphs/src/pages/import_export/import/logic.rs b/graphs/src/pages/import_export/import/logic.rs index 784b151..17dbdc6 100644 --- a/graphs/src/pages/import_export/import/logic.rs +++ b/graphs/src/pages/import_export/import/logic.rs @@ -182,7 +182,10 @@ fn row_for_table(table: &ImportTable, positions: &[(usize, String)], row: &[Stri let value = csv_value(row.get(*index).map(String::as_str).unwrap_or_default(), data_type)?; data.insert(column.clone(), value); } - Ok(PostTableDataBulkRow { data }) + Ok(PostTableDataBulkRow { + data, + journal_id: None, + }) } fn render_loaded(result: Result) -> Response { diff --git a/server b/server index 255f334..8a6be13 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 255f334bf48599ab53e1dad02f7334a8611ef2df +Subproject commit 8a6be133f168746f25840acf925d99cde2b768a2 diff --git a/tui-pages b/tui-pages index f8f70f1..30b2bf7 160000 --- a/tui-pages +++ b/tui-pages @@ -1 +1 @@ -Subproject commit f8f70f1fbb097d24082ad55f30b73c2e4175dc3f +Subproject commit 30b2bf78914c0a18a872e0680059e7fd4bd18867