From 32e8d520fb55244339953f0d4826a74d768e06ac Mon Sep 17 00:00:00 2001 From: Eric Fortin Date: Tue, 22 Jul 2025 13:43:44 -0400 Subject: [PATCH 1/3] SOFT-2203 EnterpriseVariables entre {} au lieu de <> comme les channelsVariables --- NEventSocket/FreeSwitch/OriginateOptions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEventSocket/FreeSwitch/OriginateOptions.cs b/NEventSocket/FreeSwitch/OriginateOptions.cs index 18eb1ca..37c0f72 100644 --- a/NEventSocket/FreeSwitch/OriginateOptions.cs +++ b/NEventSocket/FreeSwitch/OriginateOptions.cs @@ -287,7 +287,7 @@ private void AppendOriginateEnterpriseChannelVariablesString(StringBuilder sb) return; } - sb.Append("<"); + sb.Append("{"); sb.Append(EnterpriseChannelVariables.ToOriginateString()); @@ -296,7 +296,7 @@ private void AppendOriginateEnterpriseChannelVariablesString(StringBuilder sb) sb.Remove(sb.Length - 1, 1); } - sb.Append(">"); + sb.Append("}"); } /// From c941d1d2899730c6b65a9abc9a97e6bf5cfcfef2 Mon Sep 17 00:00:00 2001 From: Eric Fortin Date: Tue, 22 Jul 2025 14:02:41 -0400 Subject: [PATCH 2/3] =?UTF-8?q?SOFT-2203=20Cas=20o=C3=B9=20il=20y=20aurait?= =?UTF-8?q?=20channel=20et=20entreprise=20variable=20en=20meme=20temps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NEventSocket/FreeSwitch/OriginateOptions.cs | 26 ++------------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/NEventSocket/FreeSwitch/OriginateOptions.cs b/NEventSocket/FreeSwitch/OriginateOptions.cs index 37c0f72..7a2f3e6 100644 --- a/NEventSocket/FreeSwitch/OriginateOptions.cs +++ b/NEventSocket/FreeSwitch/OriginateOptions.cs @@ -271,40 +271,17 @@ public OriginationPrivacy OriginationPrivacy public override string ToString() { var sb = StringBuilderPool.Allocate(); - AppendOriginateEnterpriseChannelVariablesString(sb); AppendOriginateChannelVariablesString(sb); return StringBuilderPool.ReturnAndFree(sb); } - /// - /// Append enterprise channel variables to string builder - /// - private void AppendOriginateEnterpriseChannelVariablesString(StringBuilder sb) - { - if (!EnterpriseChannelVariables.Any()) - { - return; - } - - sb.Append("{"); - - sb.Append(EnterpriseChannelVariables.ToOriginateString()); - - if (sb.Length > 1) - { - sb.Remove(sb.Length - 1, 1); - } - - sb.Append("}"); - } - /// /// Append channel variables to string builder /// private void AppendOriginateChannelVariablesString(StringBuilder sb) { - if (!ChannelVariables.Any() && !parameters.Any()) + if (!parameters.Any() && !EnterpriseChannelVariables.Any() && !ChannelVariables.Any()) { return; } @@ -312,6 +289,7 @@ private void AppendOriginateChannelVariablesString(StringBuilder sb) sb.Append("{"); sb.Append(parameters.ToOriginateString()); + sb.Append(EnterpriseChannelVariables.ToOriginateString()); //ici, je crois que pour une entreprise variable il faurait ajouter le caractere $ dans la valeur pour dire que c'est un entreprise variable sb.Append(ChannelVariables.ToOriginateString()); if (sb.Length > 1) From 5637056ce7b4c49d2954ea7f9b14e6b146fc878f Mon Sep 17 00:00:00 2001 From: Eric Fortin Date: Wed, 23 Jul 2025 12:52:18 -0400 Subject: [PATCH 3/3] SOFT-2203 Updates originate options string formatting Corrects the formatting of originate options string representation. The change ensures consistent and correct formatting of options, particularly concerning the placement of channel variables and enterprise channel variables within the generated string. --- NEventSocket.Tests/Applications/Applications.cs | 2 +- NEventSocket.Tests/Applications/OriginateTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEventSocket.Tests/Applications/Applications.cs b/NEventSocket.Tests/Applications/Applications.cs index 39f8fa1..19dac44 100644 --- a/NEventSocket.Tests/Applications/Applications.cs +++ b/NEventSocket.Tests/Applications/Applications.cs @@ -50,7 +50,7 @@ public void can_build_originate_string() var toString = options.ToString(); const string Expected = - "{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',bypass_media='true',origination_caller_id_name='Test',origination_caller_id_number='12341234',execute_on_originate='start_dtmf',ignore_early_media='true',originate_retries='3',originate_retry_sleep_ms='4000',return_ring_ready='true',originate_timeout='20',hangup_after_bridge='false',foo='bar',baz='widgets'}"; + "{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',bypass_media='true',origination_caller_id_name='Test',origination_caller_id_number='12341234',execute_on_originate='start_dtmf',ignore_early_media='true',originate_retries='3',originate_retry_sleep_ms='4000',return_ring_ready='true',originate_timeout='20',fooE='barE',bazE='widgetsE',hangup_after_bridge='false',foo='bar',baz='widgets'}"; Assert.That(toString, Is.EqualTo(Expected)); } diff --git a/NEventSocket.Tests/Applications/OriginateTests.cs b/NEventSocket.Tests/Applications/OriginateTests.cs index f7336ad..27e74b8 100644 --- a/NEventSocket.Tests/Applications/OriginateTests.cs +++ b/NEventSocket.Tests/Applications/OriginateTests.cs @@ -41,7 +41,7 @@ public void can_set_enterprise_channel_variables() {"e2" , "ev2"} } }.ToString(); - Assert.That(options, Does.Contain("")); + Assert.That(options, Does.Contain("{e1='ev1',e2='ev2'}")); } [Test] @@ -52,7 +52,7 @@ public void can_set_enterprise_channel_variables_and_channel_variables() EnterpriseChannelVariables = new Dictionary { { "e1", "ev1" }, { "e2", "ev2" } }, ChannelVariables = new Dictionary { { "c1", "cv1" }, { "c2", "cv2" } } }.ToString(); - Assert.That(options, Does.Contain("{c1='cv1',c2='cv2'}")); + Assert.That(options, Does.Contain("{e1='ev1',e2='ev2',c1='cv1',c2='cv2'}")); } [Test]