From 116ba3f62952af3c547bf1dbd5f61ed7db071679 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 4 May 2022 14:48:50 -0400 Subject: [PATCH] Add venue component to report risk-terms/opt-equiv params --- .../Risk/Combo/ComboReportConfigurationVM.cs | 10 ++++------ .../Risk/Slide/SlideReportConfigurationVM.cs | 17 +++++++++++++---- src/lib/api/services/AnalyticsService.proto | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Risk/Combo/ComboReportConfigurationVM.cs b/src/client/spark/Risk/Combo/ComboReportConfigurationVM.cs index dc5eccb19..dec46bba3 100644 --- a/src/client/spark/Risk/Combo/ComboReportConfigurationVM.cs +++ b/src/client/spark/Risk/Combo/ComboReportConfigurationVM.cs @@ -109,20 +109,18 @@ namespace mbts.analytics { } report.ReportName = name ?? string.Empty; report.InternalAccount = internal_account?.name ?? string.Empty; + + // risk terms report.RiskTermsName = risk_terms?.security_name ?? string.Empty; report.RiskTermsType = risk_terms?.security_type ?? SecurityType.Unset; + report.RiskTermsVenue = risk_terms?.security_exchange ?? Venue.Unset; } public void load_from(ReportImmutable report) { id = report.Id; name = report.ReportName; internal_account_selector.try_select(report.InternalAccount, true); - - if (!report.RiskTermsName.is_null_or_empty() && report.RiskTermsType != SecurityType.Unset) { - var exch = UserSymbol.get_matches(report.RiskTermsType, report.RiskTermsName) - .TryGetFirst(out var us) ? us.exchange : Venue.Unset; - risk_terms = new mbts.SecurityTuple(report.RiskTermsType, report.RiskTermsName, exch); - } + risk_terms = new(report.RiskTermsType, report.RiskTermsName, report.RiskTermsVenue); ErrorsChanged += (s, e) => commit_cmd.RaiseCanExecuteChanged(); _validate(); } diff --git a/src/client/spark/Risk/Slide/SlideReportConfigurationVM.cs b/src/client/spark/Risk/Slide/SlideReportConfigurationVM.cs index 006ef975c..4ccc842da 100644 --- a/src/client/spark/Risk/Slide/SlideReportConfigurationVM.cs +++ b/src/client/spark/Risk/Slide/SlideReportConfigurationVM.cs @@ -184,14 +184,16 @@ namespace mbts.analytics { name = report.ReportName; id = report.Id; internal_account_selector.try_select(report.InternalAccount, true); - option_equivalence = _resolve_sec_tuple( - report.OptionEquivalenceType, report.OptionEquivalenceName, symbols); + option_equivalence = new( + report.OptionEquivalenceType, + report.OptionEquivalenceName, + report.OptionEquivalenceVenue); calculation_mode = report.CalcMode; handles = report.Handles.ToList(); handles_in_percentage = report.SlideHandlesInPercentage; - risk_terms = _resolve_sec_tuple( - report.RiskTermsType, report.RiskTermsName, symbols); + risk_terms = new( + report.RiskTermsType, report.RiskTermsName, report.RiskTermsVenue); load_securities(); load_volsurface(); load_greek_vms(); @@ -226,10 +228,17 @@ namespace mbts.analytics { report.Id = id; report.ReportName = name ?? string.Empty; report.InternalAccount = internal_account?.name ?? string.Empty; + + // risk terms report.RiskTermsName = risk_terms?.security_name ?? string.Empty; report.RiskTermsType = risk_terms?.security_type ?? SecurityType.Future; + report.RiskTermsVenue = risk_terms?.security_exchange ?? Venue.Unset; + + // option equivalence report.OptionEquivalenceName = option_equivalence?.security_name ?? string.Empty; report.OptionEquivalenceType = option_equivalence?.security_type ?? SecurityType.Option; + report.OptionEquivalenceVenue = option_equivalence?.security_exchange ?? Venue.Unset; + report.SecurityCriteria = security_criteria.to_criteria(); report.Greeks.SetItems(greek_vms.Where(g => g.is_selected).Select(g => g.value)); report.Handles.SetItems(handles); diff --git a/src/lib/api/services/AnalyticsService.proto b/src/lib/api/services/AnalyticsService.proto index 43aee5051..c101f3175 100644 --- a/src/lib/api/services/AnalyticsService.proto +++ b/src/lib/api/services/AnalyticsService.proto @@ -156,8 +156,10 @@ message Report { string internal_account = 50; string risk_terms_name = 60; bts.api.SecurityType risk_terms_type = 70; + bts.api.Venue risk_terms_venue = 71; string option_equivalence_name = 80; bts.api.SecurityType option_equivalence_type = 90; + bts.api.Venue option_equivalence_venue = 91; bts.api.domain.SecurityCriteria security_criteria = 95; repeated double handles = 100; repeated double strike_buckets = 110;