WTEL-4402

webitel · Apr 16, 2024 · 3a0d61c · 3a0d61c
1 parent 6705e11
commit 3a0d61c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	buf.build/gen/go/webitel/cc/grpc/go v1.3.0-20240404135440-3efb61ebef03.2
-	buf.build/gen/go/webitel/cc/protocolbuffers/go v1.33.0-20240404135440-3efb61ebef03.1
+	buf.build/gen/go/webitel/cc/protocolbuffers/go v1.33.0-20240416084443-1c27890044ed.1
 	buf.build/gen/go/webitel/fs/grpc/go v1.3.0-20240404140117-b025f673b11a.2
 	buf.build/gen/go/webitel/fs/protocolbuffers/go v1.33.0-20240404140117-b025f673b11a.1
 	buf.build/gen/go/webitel/workflow/protocolbuffers/go v1.33.0-20240411132047-cd3c8f61d791.1

diff --git a/queue/queue_manager.go b/queue/queue_manager.go
@@ -420,6 +420,9 @@ func (queueManager *QueueManager) DistributeCallToAgent(ctx context.Context, in
 		qParams.HasReporting = model.NewBool(true)
 		qParams.ProcessingSec = in.Processing.Sec
 		qParams.ProcessingRenewalSec = in.Processing.RenewalSec
+		if in.Processing.GetForm().GetId() > 0 {
+			qParams.HasForm = model.NewBool(true)
+		}
 	}
 
 	res, err := queueManager.store.Member().DistributeCallToAgent(
@@ -513,6 +516,9 @@ func (queueManager *QueueManager) DistributeCallToAgent(ctx context.Context, in
 		settings.Processing = true
 		settings.ProcessingSec = qParams.ProcessingSec
 		settings.ProcessingRenewalSec = qParams.ProcessingRenewalSec
+		if in.Processing.GetForm().GetId() > 0 {
+			settings.FormSchemaId = model.NewInt(int(in.Processing.GetForm().GetId()))
+		}
 	}
 
 	var queue = JoinAgentCallQueue{
@@ -554,7 +560,7 @@ func (queueManager *QueueManager) DistributeTaskToAgent(ctx context.Context, in
 		qParams.HasReporting = model.NewBool(true)
 		qParams.ProcessingSec = in.Processing.Sec
 		qParams.ProcessingRenewalSec = in.Processing.RenewalSec
-		if in.Processing.FormSchemaId > 0 {
+		if in.Processing.GetForm().GetId() > 0 {
 			qParams.HasForm = model.NewBool(true)
 		}
 	}
@@ -623,8 +629,8 @@ func (queueManager *QueueManager) DistributeTaskToAgent(ctx context.Context, in
 		settings.Processing = true
 		settings.ProcessingSec = qParams.ProcessingSec
 		settings.ProcessingRenewalSec = qParams.ProcessingRenewalSec
-		if in.Processing.FormSchemaId > 0 {
-			settings.FormSchemaId = model.NewInt(int(in.Processing.FormSchemaId))
+		if in.Processing.GetForm().GetId() > 0 {
+			settings.FormSchemaId = model.NewInt(int(in.Processing.GetForm().GetId()))
 		}
 	}