From 9048b8867716a24fc42301997f438e7fa8e7bcc4 Mon Sep 17 00:00:00 2001 From: Priec Date: Sat, 18 Jul 2026 12:52:19 +0200 Subject: [PATCH] removing exchange currencies system, cos new one going in place now --- client | 2 +- common/build.rs | 2 - common/proto/currency_conversion.proto | 53 -- common/proto/table_script.proto | 22 - common/src/lib.rs | 3 - common/src/proto/descriptor.bin | Bin 110707 -> 105778 bytes .../src/proto/komp_ac.currency_conversion.rs | 535 ------------------ common/src/proto/komp_ac.table_script.rs | 36 -- server | 2 +- 9 files changed, 2 insertions(+), 653 deletions(-) delete mode 100644 common/proto/currency_conversion.proto delete mode 100644 common/src/proto/komp_ac.currency_conversion.rs diff --git a/client b/client index 213500f..0fd324c 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 213500f425a6a464fd1281d51c436311ef982c94 +Subproject commit 0fd324cf74df78be99d25a91dea038cad3803614 diff --git a/common/build.rs b/common/build.rs index 5c2f890..a58bd0d 100644 --- a/common/build.rs +++ b/common/build.rs @@ -216,7 +216,6 @@ fn main() -> Result<(), Box> { .compile_protos( &[ "proto/common.proto", - "proto/currency_conversion.proto", "proto/document_data.proto", "proto/adresar.proto", "proto/analytics.proto", @@ -243,7 +242,6 @@ fn main() -> Result<(), Box> { println!("cargo:rerun-if-changed=build.rs"); for proto in [ "proto/common.proto", - "proto/currency_conversion.proto", "proto/document_data.proto", "proto/adresar.proto", "proto/analytics.proto", diff --git a/common/proto/currency_conversion.proto b/common/proto/currency_conversion.proto deleted file mode 100644 index 59222ff..0000000 --- a/common/proto/currency_conversion.proto +++ /dev/null @@ -1,53 +0,0 @@ -syntax = "proto3"; -package komp_ac.currency_conversion; - -service CurrencyConversion { - rpc ConvertCurrency(ConvertCurrencyRequest) returns (ConvertCurrencyResponse); - rpc ResolveRate(ResolveRateRequest) returns (ResolvedFxRate); - rpc ListRequiredCurrencies(ListRequiredCurrenciesRequest) - returns (ListRequiredCurrenciesResponse); -} - -message ConvertCurrencyRequest { - string amount = 1; - string source_currency = 2; - string target_currency = 3; - string source = 4; - string as_of_date = 5; -} - -message ResolveRateRequest { - string source_currency = 1; - string target_currency = 2; - string source = 3; - string as_of_date = 4; -} - -message FxRateComponent { - string currency = 1; - string units_per_base = 2; -} - -message ResolvedFxRate { - string source_currency = 1; - string target_currency = 2; - string rate = 3; - string effective_date = 4; - string source = 5; - int64 rate_set_id = 6; - int32 revision = 7; - string base_currency = 8; - repeated FxRateComponent components = 9; -} - -message ConvertCurrencyResponse { - string amount = 1; - string currency = 2; - ResolvedFxRate resolved_rate = 3; -} - -message ListRequiredCurrenciesRequest {} - -message ListRequiredCurrenciesResponse { - repeated string currencies = 1; -} diff --git a/common/proto/table_script.proto b/common/proto/table_script.proto index fd795f0..bab64a0 100644 --- a/common/proto/table_script.proto +++ b/common/proto/table_script.proto @@ -185,14 +185,6 @@ message ScriptDependency { string operation = 5; // Relationship table used to match the owner row to the related collection. string via_table = 6; - // Source currency for an fx_conversion dependency. - string from_currency = 7; - // Target currency for an fx_conversion dependency. - string to_currency = 8; - // Persisted exchange-rate provider/source identifier. - string source = 9; - // Requested YYYY-MM-DD date, or empty for the latest stored snapshot. - string as_of_date = 10; } // Identifies the active form row whose external Steel inputs must be hydrated. @@ -251,18 +243,4 @@ message HydrateScriptDependenciesResponse { repeated HydratedColumnValue columns = 1; // Exact related aggregate inputs declared by stored scripts. repeated HydratedAggregateValue aggregates = 2; - // Exact resolved rates declared by the table's stored scripts. - repeated HydratedFxRate fx_rates = 3; -} - -message HydratedFxRate { - string from_currency = 1; - string to_currency = 2; - string source = 3; - string requested_as_of_date = 4; - string rate = 5; - string effective_date = 6; - int64 rate_set_id = 7; - int32 revision = 8; - string base_currency = 9; } diff --git a/common/src/lib.rs b/common/src/lib.rs index b975297..edba9b1 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -20,9 +20,6 @@ pub mod proto { pub mod common { include!("proto/komp_ac.common.rs"); } - pub mod currency_conversion { - include!("proto/komp_ac.currency_conversion.rs"); - } pub mod document_data { include!("proto/komp_ac.document_data.rs"); } diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index a78b801f8dbcb1b2bd3b1c2b65d69128155a6642..0f530738c92376971b4475250c99b3605c1e1f51 100644 GIT binary patch delta 1182 zcmYL|O>0v@6o&IoZtlkf8@#pATBvOoV#S+Q-Bv{`^{Z-4Z9&`O!lerl7gBWLA8-}Q z;IfP0wivXaP-@AhVhu5k`G7(QF@zAI#JJIoXQmnM@|>CHopYYc{arENeKgmeAvM;s z_?e}jre0^FK~_W}`Mnq#5sVKdR(FR|gS$y)d;lM&Y9R5XY$h5%5~;t%m*8I?a?1@N z@CT_^<>nARr5^t~9}F*YW|*$IfxwrQ7g&gFz&^$AaKkWJz%@2ke&VjT31;&{JS2Od zCY(N924#7ypHC@*4!6W3;F`DPBamG-B!w5;k?$IS7 zX&iR>Tc)0&a(n$Y!zg0gV0xAyLEDH9cA=oWh2arCOB-6Qxr0DiB!h@Yc3=Vc^wBr6BLpb*+ICu#;R zc{%?TxnmAaM2%}PMo12BFJDjyRe3QJ!jhNw5xHR=&Vd$-$qn=Jl^KN?u2B%>5aM3J zM+`y=TE4{$LJCs;0TObJlDKao9xM4sh>#MTXm_v>Atm%5=S$?#cFjEmeurajuqV@-OTRS3OV7rQp*yt9H;c8&?Q0UW=e&lG zNRJJz-c}wPQvD5ukjJKY?_k<%`iS({)aq>}JvOEKxI#?VXo(ody;#dfOhQ^(z0FKQ zT2lQysdrp+pZ;F4#xWP!hds)#QjjCnx5be#u1~bVxN=QRif!(Bvvm<~qH=#mmT7#m;z)`R5ge}G`TNdN!< delta 6011 zcmbVQYitzP72bPiJUesO_QGJ6^)A@s1!DtVgX~n5(mV@E^B{#RNu?@@+>JdBZeW-0 zE)+{?r+J4Y{ZY-2{;5>uN7TPnU8#>mRZ5!|p;D=uQW`~Rsz#y+Q3psu97Ow_`67XD24>wS8fuIa9BV?rGFp zb-(yvefOS;>g4EUmXvvQ=$75Vp+9*}SC|s^MfIwo=r*t+rCgUnxYjIZ>aUn5wqI ze21KKtIciGTYyVHV#2S4&3d$JUs%C_ar_boXLSVsgMT`ZEBdGW*WPOXBIBTPzU|-+ zk-d38dA1oDsMo?;%P$C5t7e=^u)juh@2$D;AW~gQDl%w0j#+NZx`X?9N z6g7gLQr4qOQ(}z&-x2%5Zjk0GUisS}6y4$UbU4|X*%zvesDPucWSH_og`=~nGG^53 z6B)8O(L_PaOywP<)2ethv?FZYIz`$v!hJJTy7@FFJ1PnGSBoxEq+Lj^EQU@RjFLLq zD#WCbx|#O^YdAADGP+3pkA5aUm5cbLA2YGyl5eAlL^frN$;T00{B>NMU{y@*1aB8z z4V}4(MBU8ThDAO6bgnC%#zF%cLlY%=gVHeL%v+i~A^czUCr;~+ZDN`t_2R$Xln zc+vKBgafk@pmhNYG4^iw0sKd81+?7y8lku_!!CuB+rg<>Z$yezq z23luAqi8z4yqN>7v$#^z;9*xn0CEI3{>}7ma{M`47JCs!n zfw@fk$tWK^Iz9kw*rPWDqB$KN5NJIK4YDlfJ#qHoVx;6|oZ?@u17QSmIuHQZ%_Vjz z{+td3bF@;&fm-QJtyFQ4XT9zUnFdaA6nIX?4ghlnZH`B>h6|poMH`c_SLj);c`#Ds zvfMC5;S~)}hFA1fXqyyXu~3w9TE5+v8dh$Qvwdz(nzP7_eytV&%=Pm~r4`?Xv^ zu-C8UvM81y;gK7Gb^}v1m(a+KAfZ9!0q#o=El$NZkkH8FfY&8DBYX&$1aDx;Qtc){ zNk?r-@k4zYs`T* zqRSek>|15NT6!1(!TmB3DxI_e~c5mcRbp zxg!U27XLGk|Ml`;BkJg;8};4oj*ePBuhL0_rrq%SMW$76FHudOXw{Pi?OxN9bkl2o z`sEQEC=bFggQcF~bFaT~ zB4EFp`}xUnE4l&SPX|iaev$EFVJz4o-?}{>h!yTJ%6zrn(C7Xx}$86*e}iH&lS% zwbsn^OxQ?5bg?DOm@Qpw`4Yp)qC#}B=D-+nE=cmB@uYsQQ`KJ3?+w_KW$ z=LcZESKKTa*yB+AxA|MjhuRFBj`kt5u|vlrAg&h0KqGND-uC`2qlX#p6!OjCI2Y~1 z%|7eFMK##K5ool3}%iq&zE@sgqh=Pc~0CY z8JIi~S3lZZKG9~7fG3RPt`zVDNq)OzK){pnk&o^upKLQoz>`KmR|-T^YI_fjg{xy3=(kONbX7j=SlM0Bm)ATjz>P;T0Y%o zkbtL+G(dFT~F*+Q~VfUvs2`q!FSSY2T2)=SSllJ0!G%wt?1_(GQGV-d$kuDG!DIOi%< zL47|#!=++2*t&1{B%3FbgKdykLgx@TIH5fOSkIN NNbTJBKY9MS{{mQ{R^k8v diff --git a/common/src/proto/komp_ac.currency_conversion.rs b/common/src/proto/komp_ac.currency_conversion.rs deleted file mode 100644 index 08896f2..0000000 --- a/common/src/proto/komp_ac.currency_conversion.rs +++ /dev/null @@ -1,535 +0,0 @@ -// This file is @generated by prost-build. -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ConvertCurrencyRequest { - #[prost(string, tag = "1")] - pub amount: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub source_currency: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub target_currency: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub source: ::prost::alloc::string::String, - #[prost(string, tag = "5")] - pub as_of_date: ::prost::alloc::string::String, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ResolveRateRequest { - #[prost(string, tag = "1")] - pub source_currency: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub target_currency: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub source: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub as_of_date: ::prost::alloc::string::String, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct FxRateComponent { - #[prost(string, tag = "1")] - pub currency: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub units_per_base: ::prost::alloc::string::String, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ResolvedFxRate { - #[prost(string, tag = "1")] - pub source_currency: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub target_currency: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub rate: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub effective_date: ::prost::alloc::string::String, - #[prost(string, tag = "5")] - pub source: ::prost::alloc::string::String, - #[prost(int64, tag = "6")] - pub rate_set_id: i64, - #[prost(int32, tag = "7")] - pub revision: i32, - #[prost(string, tag = "8")] - pub base_currency: ::prost::alloc::string::String, - #[prost(message, repeated, tag = "9")] - pub components: ::prost::alloc::vec::Vec, -} -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ConvertCurrencyResponse { - #[prost(string, tag = "1")] - pub amount: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub currency: ::prost::alloc::string::String, - #[prost(message, optional, tag = "3")] - pub resolved_rate: ::core::option::Option, -} -#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ListRequiredCurrenciesRequest {} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct ListRequiredCurrenciesResponse { - #[prost(string, repeated, tag = "1")] - pub currencies: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, -} -/// Generated client implementations. -pub mod currency_conversion_client { - #![allow( - unused_variables, - dead_code, - missing_docs, - clippy::wildcard_imports, - clippy::let_unit_value, - )] - use tonic::codegen::*; - use tonic::codegen::http::Uri; - #[derive(Debug, Clone)] - pub struct CurrencyConversionClient { - inner: tonic::client::Grpc, - } - impl CurrencyConversionClient { - /// Attempt to create a new client by connecting to a given endpoint. - pub async fn connect(dst: D) -> Result - where - D: TryInto, - D::Error: Into, - { - let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; - Ok(Self::new(conn)) - } - } - impl CurrencyConversionClient - where - T: tonic::client::GrpcService, - T::Error: Into, - T::ResponseBody: Body + std::marker::Send + 'static, - ::Error: Into + std::marker::Send, - { - pub fn new(inner: T) -> Self { - let inner = tonic::client::Grpc::new(inner); - Self { inner } - } - pub fn with_origin(inner: T, origin: Uri) -> Self { - let inner = tonic::client::Grpc::with_origin(inner, origin); - Self { inner } - } - pub fn with_interceptor( - inner: T, - interceptor: F, - ) -> CurrencyConversionClient> - where - F: tonic::service::Interceptor, - T::ResponseBody: Default, - T: tonic::codegen::Service< - http::Request, - Response = http::Response< - >::ResponseBody, - >, - >, - , - >>::Error: Into + std::marker::Send + std::marker::Sync, - { - CurrencyConversionClient::new(InterceptedService::new(inner, interceptor)) - } - /// Compress requests with the given encoding. - /// - /// This requires the server to support it otherwise it might respond with an - /// error. - #[must_use] - pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.inner = self.inner.send_compressed(encoding); - self - } - /// Enable decompressing responses. - #[must_use] - pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.inner = self.inner.accept_compressed(encoding); - self - } - /// Limits the maximum size of a decoded message. - /// - /// Default: `4MB` - #[must_use] - pub fn max_decoding_message_size(mut self, limit: usize) -> Self { - self.inner = self.inner.max_decoding_message_size(limit); - self - } - /// Limits the maximum size of an encoded message. - /// - /// Default: `usize::MAX` - #[must_use] - pub fn max_encoding_message_size(mut self, limit: usize) -> Self { - self.inner = self.inner.max_encoding_message_size(limit); - self - } - pub async fn convert_currency( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/komp_ac.currency_conversion.CurrencyConversion/ConvertCurrency", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new( - "komp_ac.currency_conversion.CurrencyConversion", - "ConvertCurrency", - ), - ); - self.inner.unary(req, path, codec).await - } - pub async fn resolve_rate( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result, tonic::Status> { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/komp_ac.currency_conversion.CurrencyConversion/ResolveRate", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new( - "komp_ac.currency_conversion.CurrencyConversion", - "ResolveRate", - ), - ); - self.inner.unary(req, path, codec).await - } - pub async fn list_required_currencies( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::unknown( - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic_prost::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/komp_ac.currency_conversion.CurrencyConversion/ListRequiredCurrencies", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new( - "komp_ac.currency_conversion.CurrencyConversion", - "ListRequiredCurrencies", - ), - ); - self.inner.unary(req, path, codec).await - } - } -} -/// Generated server implementations. -pub mod currency_conversion_server { - #![allow( - unused_variables, - dead_code, - missing_docs, - clippy::wildcard_imports, - clippy::let_unit_value, - )] - use tonic::codegen::*; - /// Generated trait containing gRPC methods that should be implemented for use with CurrencyConversionServer. - #[async_trait] - pub trait CurrencyConversion: std::marker::Send + std::marker::Sync + 'static { - async fn convert_currency( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; - async fn resolve_rate( - &self, - request: tonic::Request, - ) -> std::result::Result, tonic::Status>; - async fn list_required_currencies( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; - } - #[derive(Debug)] - pub struct CurrencyConversionServer { - inner: Arc, - accept_compression_encodings: EnabledCompressionEncodings, - send_compression_encodings: EnabledCompressionEncodings, - max_decoding_message_size: Option, - max_encoding_message_size: Option, - } - impl CurrencyConversionServer { - pub fn new(inner: T) -> Self { - Self::from_arc(Arc::new(inner)) - } - pub fn from_arc(inner: Arc) -> Self { - Self { - inner, - accept_compression_encodings: Default::default(), - send_compression_encodings: Default::default(), - max_decoding_message_size: None, - max_encoding_message_size: None, - } - } - pub fn with_interceptor( - inner: T, - interceptor: F, - ) -> InterceptedService - where - F: tonic::service::Interceptor, - { - InterceptedService::new(Self::new(inner), interceptor) - } - /// Enable decompressing requests with the given encoding. - #[must_use] - pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.accept_compression_encodings.enable(encoding); - self - } - /// Compress responses with the given encoding, if the client supports it. - #[must_use] - pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.send_compression_encodings.enable(encoding); - self - } - /// Limits the maximum size of a decoded message. - /// - /// Default: `4MB` - #[must_use] - pub fn max_decoding_message_size(mut self, limit: usize) -> Self { - self.max_decoding_message_size = Some(limit); - self - } - /// Limits the maximum size of an encoded message. - /// - /// Default: `usize::MAX` - #[must_use] - pub fn max_encoding_message_size(mut self, limit: usize) -> Self { - self.max_encoding_message_size = Some(limit); - self - } - } - impl tonic::codegen::Service> for CurrencyConversionServer - where - T: CurrencyConversion, - B: Body + std::marker::Send + 'static, - B::Error: Into + std::marker::Send + 'static, - { - type Response = http::Response; - type Error = std::convert::Infallible; - type Future = BoxFuture; - fn poll_ready( - &mut self, - _cx: &mut Context<'_>, - ) -> Poll> { - Poll::Ready(Ok(())) - } - fn call(&mut self, req: http::Request) -> Self::Future { - match req.uri().path() { - "/komp_ac.currency_conversion.CurrencyConversion/ConvertCurrency" => { - #[allow(non_camel_case_types)] - struct ConvertCurrencySvc(pub Arc); - impl< - T: CurrencyConversion, - > tonic::server::UnaryService - for ConvertCurrencySvc { - type Response = super::ConvertCurrencyResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::convert_currency(&inner, request) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = ConvertCurrencySvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - "/komp_ac.currency_conversion.CurrencyConversion/ResolveRate" => { - #[allow(non_camel_case_types)] - struct ResolveRateSvc(pub Arc); - impl< - T: CurrencyConversion, - > tonic::server::UnaryService - for ResolveRateSvc { - type Response = super::ResolvedFxRate; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::resolve_rate(&inner, request) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = ResolveRateSvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - "/komp_ac.currency_conversion.CurrencyConversion/ListRequiredCurrencies" => { - #[allow(non_camel_case_types)] - struct ListRequiredCurrenciesSvc(pub Arc); - impl< - T: CurrencyConversion, - > tonic::server::UnaryService - for ListRequiredCurrenciesSvc { - type Response = super::ListRequiredCurrenciesResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::list_required_currencies( - &inner, - request, - ) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let method = ListRequiredCurrenciesSvc(inner); - let codec = tonic_prost::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - _ => { - Box::pin(async move { - let mut response = http::Response::new( - tonic::body::Body::default(), - ); - let headers = response.headers_mut(); - headers - .insert( - tonic::Status::GRPC_STATUS, - (tonic::Code::Unimplemented as i32).into(), - ); - headers - .insert( - http::header::CONTENT_TYPE, - tonic::metadata::GRPC_CONTENT_TYPE, - ); - Ok(response) - }) - } - } - } - } - impl Clone for CurrencyConversionServer { - fn clone(&self) -> Self { - let inner = self.inner.clone(); - Self { - inner, - accept_compression_encodings: self.accept_compression_encodings, - send_compression_encodings: self.send_compression_encodings, - max_decoding_message_size: self.max_decoding_message_size, - max_encoding_message_size: self.max_encoding_message_size, - } - } - } - /// Generated gRPC service name - pub const SERVICE_NAME: &str = "komp_ac.currency_conversion.CurrencyConversion"; - impl tonic::server::NamedService for CurrencyConversionServer { - const NAME: &'static str = SERVICE_NAME; - } -} diff --git a/common/src/proto/komp_ac.table_script.rs b/common/src/proto/komp_ac.table_script.rs index 6e30b98..1a4bb75 100644 --- a/common/src/proto/komp_ac.table_script.rs +++ b/common/src/proto/komp_ac.table_script.rs @@ -133,18 +133,6 @@ pub struct ScriptDependency { /// Relationship table used to match the owner row to the related collection. #[prost(string, tag = "6")] pub via_table: ::prost::alloc::string::String, - /// Source currency for an fx_conversion dependency. - #[prost(string, tag = "7")] - pub from_currency: ::prost::alloc::string::String, - /// Target currency for an fx_conversion dependency. - #[prost(string, tag = "8")] - pub to_currency: ::prost::alloc::string::String, - /// Persisted exchange-rate provider/source identifier. - #[prost(string, tag = "9")] - pub source: ::prost::alloc::string::String, - /// Requested YYYY-MM-DD date, or empty for the latest stored snapshot. - #[prost(string, tag = "10")] - pub as_of_date: ::prost::alloc::string::String, } /// Identifies the active form row whose external Steel inputs must be hydrated. #[derive(Clone, PartialEq, ::prost::Message)] @@ -225,30 +213,6 @@ pub struct HydrateScriptDependenciesResponse { /// Exact related aggregate inputs declared by stored scripts. #[prost(message, repeated, tag = "2")] pub aggregates: ::prost::alloc::vec::Vec, - /// Exact resolved rates declared by the table's stored scripts. - #[prost(message, repeated, tag = "3")] - pub fx_rates: ::prost::alloc::vec::Vec, -} -#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)] -pub struct HydratedFxRate { - #[prost(string, tag = "1")] - pub from_currency: ::prost::alloc::string::String, - #[prost(string, tag = "2")] - pub to_currency: ::prost::alloc::string::String, - #[prost(string, tag = "3")] - pub source: ::prost::alloc::string::String, - #[prost(string, tag = "4")] - pub requested_as_of_date: ::prost::alloc::string::String, - #[prost(string, tag = "5")] - pub rate: ::prost::alloc::string::String, - #[prost(string, tag = "6")] - pub effective_date: ::prost::alloc::string::String, - #[prost(int64, tag = "7")] - pub rate_set_id: i64, - #[prost(int32, tag = "8")] - pub revision: i32, - #[prost(string, tag = "9")] - pub base_currency: ::prost::alloc::string::String, } /// Generated client implementations. pub mod table_script_client { diff --git a/server b/server index 86e8b04..0635958 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 86e8b04ca94fe8563931179e0801ef0233c0bdaa +Subproject commit 0635958988452125f9a4fc462a9f418981753365