Merge pull request #61 from webitel/v24.04

WTEL-4587

queue/attempt.go

@@ -79,6 +79,7 @@ type Attempt struct {
 	stickyAgentId     *int32
 
 	processingForm        model.ProcessingForm
+	processingFields      sync.Map
 	processingFormStarted bool
 	bridgedAt             int64
 	manualDistribution    bool
@@ -158,6 +159,25 @@ func (a *Attempt) ProcessingFormStarted() bool {
 	return a.processingFormStarted
 }
 
+func (a *Attempt) UpdateProcessingFields(fields map[string]string) {
+	for k, v := range fields {
+		a.processingFields.Store(k, v)
+	}
+}
+
+func (a *Attempt) ProcessingFields() map[string]string {
+	if !a.processingFormStarted {
+		return nil
+	}
+	res := make(map[string]string)
+	a.processingFields.Range(func(key, value any) bool {
+		res[fmt.Sprintf("%s", key)] = fmt.Sprintf("%s", value)
+		return true
+	})
+
+	return res
+}
+
 func (a *Attempt) SetMemberStopCause(cause *string) {
 	a.Lock()
 	a.memberStopCause = cause
@@ -340,6 +360,10 @@ func (a *Attempt) ExportSchemaVariables() map[string]string {
 		res[k] = fmt.Sprintf("%v", v)
 	}
 
+	for k, v := range a.ProcessingFields() {
+		res[k] = v
+	}
+
 	if a.member.Seq != nil {
 		res[model.QUEUE_ATTEMPT_SEQ] = fmt.Sprintf("%d", *a.member.Seq)
 	}

queue/schema.go

@@ -66,6 +66,7 @@ func (qm *QueueManager) attemptProcessingActionForm(attemptId int64, action stri
 	}
 
 	if attempt.processingForm != nil && attempt.agent != nil {
+		attempt.UpdateProcessingFields(fields)
 		_, err := attempt.processingForm.ActionForm(attempt.Context, action, fields)
 		if err != nil {
 			attempt.Log(err.Error())