revert user-fetching in GetSourceAndDestination()

in order to determine the user, we need CallInSession.GetDirection()
and not Call.GetDirection(), so the user cannot be set inside of
GetSourceAndDestination().

innovaphone/helpers.go

@@ -110,7 +110,7 @@ func (h Hold) String() string {
 }
 
 // GetSourceAndDestination returns the call's source and destination
-func (call *CallInfo) GetSourceAndDestination() (src, dst *No, user string, err error) {
+func (call *CallInfo) GetSourceAndDestination() (src, dst *No, err error) {
 	for _, no := range call.No {
 		switch no.Type {
 		case "this":
@@ -120,18 +120,15 @@ func (call *CallInfo) GetSourceAndDestination() (src, dst *No, user string, err
 		}
 	}
 
-	if call.GetDirection() == DirectionInbound {
-		src, dst = dst, src
-		user = src.Cn
-	} else {
-		user = dst.Cn
+	if src == nil || dst == nil {
+		return nil, nil, fmt.Errorf("call without src (%v) or dst (%v)", src, dst)
 	}
 
-	if src == nil || dst == nil {
-		return nil, nil, "", fmt.Errorf("call without src (%v) or dst (%v)", src, dst)
+	if call.GetDirection() == DirectionInbound {
+		src, dst = dst, src
 	}
 
-	return src, dst, user, nil
+	return src, dst, nil
 }
 
 // GetState returns the call's state

innovaphone/innovaphone.go

@@ -138,7 +138,7 @@ func (session *Session) PollForever() (<-chan *CallInSession, <-chan error) {
 					sessionInterface: session,
 					CallInfo:         call,
 				}
-				src, dst, user, err := cis.GetSourceAndDestination()
+				src, dst, err := cis.GetSourceAndDestination()
 				if err != nil {
 					logrus.WithField("call", call).Warn(err)
 					continue
@@ -149,7 +149,6 @@ func (session *Session) PollForever() (<-chan *CallInSession, <-chan error) {
 					"call":      call,
 					"source":    src.Normalize(),
 					"dest":      dst.Normalize(),
-					"user":      user,
 					"direction": dir,
 					"state":     cis.GetState(),
 					"hold":      cis.GetHold(),
@@ -196,7 +195,7 @@ type userCacheEntry struct {
 // ShouldHandle decides whether a call involves any of the groups being filtered on (see Config.FilterOnGroup)
 func (call *CallInSession) ShouldHandle() bool {
 	if config.Global.PBX.FilterOnGroup != "" {
-		src, dst, _, err := call.GetSourceAndDestination()
+		src, dst, err := call.GetSourceAndDestination()
 		if err != nil {
 			logrus.WithField("call", call).Warn(err)
 			return false

zammad/zammad.go

@@ -140,7 +140,7 @@ func (zs *Session) ShutdownIfEmpty() {
 func (zs *Session) Submit(ctx context.Context, call *innovaphone.CallInSession) error {
 	zs.stats.Add("events_total", 1)
 
-	src, dst, user, err := call.GetSourceAndDestination()
+	src, dst, err := call.GetSourceAndDestination()
 	if err != nil {
 		return err
 	}
@@ -169,6 +169,15 @@ func (zs *Session) Submit(ctx context.Context, call *innovaphone.CallInSession)
 		"direction": []string{dir.String()},
 	}
 
+	// "dir" here is session-based, not call-based
+	var user string
+	switch dir {
+	case innovaphone.DirectionInbound:
+		user = dst.Cn
+	case innovaphone.DirectionOutbound:
+		user = src.Cn
+	}
+
 	transition := stateTransition{curState: entry.State, newState: newState}
 	switch transition {
 	case