WTEL-4057

webitel · Dec 1, 2023 · 11e3a7b · 11e3a7b
1 parent 531b35b
commit 11e3a7b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/external_commands/grpc/call_connection.go b/external_commands/grpc/call_connection.go
@@ -259,6 +259,7 @@ func (c *CallConnection) NewCallContext(ctx context.Context, settings *model.Cal
 		Context:      settings.Context,
 		Dialplan:     settings.Dialplan,
 		Variables:    settings.Variables,
+		CheckId:      settings.CheckParentId,
 	}
 
 	if len(settings.Applications) > 0 {

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/webitel/engine v0.0.0-20230929132314-e8f08f52c140
 	github.com/webitel/flow_manager v0.0.0-20230928094914-a9c915fbadcb
 	github.com/webitel/protos/cc v0.0.0-20231016113342-4e297ed227c4
-	github.com/webitel/protos/fs v0.0.0-20230919101002-a30f21070914
+	github.com/webitel/protos/fs v0.0.0-20231201134013-7935e1a08885
 	github.com/webitel/protos/workflow v0.0.0-20230919101002-a30f21070914
 	github.com/webitel/wlog v0.0.0-20220608103744-93b33e61bd28
 	golang.org/x/sync v0.3.0

diff --git a/model/call.go b/model/call.go
@@ -318,17 +318,18 @@ type CallRequestApplication struct {
 }
 
 type CallRequest struct {
-	Id           *string
-	Endpoints    []string
-	Strategy     uint8
-	Destination  string
-	Variables    map[string]string
-	Timeout      uint16
-	CallerName   string
-	CallerNumber string
-	Dialplan     string
-	Context      string
-	Applications []*CallRequestApplication
+	Id            *string
+	Endpoints     []string
+	Strategy      uint8
+	Destination   string
+	Variables     map[string]string
+	Timeout       uint16
+	CallerName    string
+	CallerNumber  string
+	Dialplan      string
+	Context       string
+	Applications  []*CallRequestApplication
+	CheckParentId string
 }
 
 func (cr *CallRequest) SetPush() {

diff --git a/queue/queue_call_progressive.go b/queue/queue_call_progressive.go
@@ -202,6 +202,8 @@ func (queue *ProgressiveCallQueue) run(attempt *Attempt, team *agentTeam, agent
 						},
 					})
 					cr.Variables["wbt_parent_id"] = mCall.Id()
+					cr.CheckParentId = mCall.Id()
+
 					agentCall = mCall.NewCall(cr)
 					attempt.agentChannel = agentCall
 
@@ -229,7 +231,9 @@ func (queue *ProgressiveCallQueue) run(attempt *Attempt, team *agentTeam, agent
 									if agentCall.HangupAt() == 0 {
 										agentCall.Hangup(model.CALL_HANGUP_LOSE_RACE, false, nil)
 									}
+									calling = false
 									printfIfErr(err)
+									continue
 								}
 
 								//fixme refactor