Skip to content

Handles channel and enterprise variables concurrently #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Josbleuet wants to merge 3 commits into from
Closed

Handles channel and enterprise variables concurrently #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32e8d52
SOFT-2203 EnterpriseVariables entre {} au lieu de <> comme les channe…
Josbleuet Jul 22, 2025
c941d1d
SOFT-2203 Cas où il y aurait channel et entreprise variable en meme t…
Josbleuet Jul 22, 2025
5637056
SOFT-2203 Updates originate options string formatting
Josbleuet Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEventSocket.Tests/Applications/Applications.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void can_build_originate_string()
var toString = options.ToString();

const string Expected =
"<fooE='barE',bazE='widgetsE'>{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));
}

Expand Down
4 changes: 2 additions & 2 deletions NEventSocket.Tests/Applications/OriginateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void can_set_enterprise_channel_variables()
{"e2" , "ev2"}
}
}.ToString();
Assert.That(options, Does.Contain("<e1='ev1',e2='ev2'>"));
Assert.That(options, Does.Contain("{e1='ev1',e2='ev2'}"));
}

[Test]
Expand All @@ -52,7 +52,7 @@ public void can_set_enterprise_channel_variables_and_channel_variables()
EnterpriseChannelVariables = new Dictionary<string, string> { { "e1", "ev1" }, { "e2", "ev2" } },
ChannelVariables = new Dictionary<string, string> { { "c1", "cv1" }, { "c2", "cv2" } }
}.ToString();
Assert.That(options, Does.Contain("<e1='ev1',e2='ev2'>{c1='cv1',c2='cv2'}"));
Assert.That(options, Does.Contain("{e1='ev1',e2='ev2',c1='cv1',c2='cv2'}"));
}

[Test]
Expand Down
26 changes: 2 additions & 24 deletions NEventSocket/FreeSwitch/OriginateOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,47 +271,25 @@ public OriginationPrivacy OriginationPrivacy
public override string ToString()
{
var sb = StringBuilderPool.Allocate();
AppendOriginateEnterpriseChannelVariablesString(sb);
AppendOriginateChannelVariablesString(sb);

return StringBuilderPool.ReturnAndFree(sb);
}

/// <summary>
/// Append enterprise channel variables to string builder
/// </summary>
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(">");
}

/// <summary>
/// Append channel variables to string builder
/// </summary>
private void AppendOriginateChannelVariablesString(StringBuilder sb)
{
if (!ChannelVariables.Any() && !parameters.Any())
if (!parameters.Any() && !EnterpriseChannelVariables.Any() && !ChannelVariables.Any())
{
return;
}

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)
Expand Down
Loading