Skip to content

Commit

Permalink
fix: check empty
Browse files Browse the repository at this point in the history
  • Loading branch information
franklinkim committed Feb 12, 2025
1 parent 0857922 commit f4b1a3c
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions pkg/http/mpv2/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,6 @@ func MiddlewareDebugMode(next MiddlewareHandler) MiddlewareHandler {
return func(l *zap.Logger, w http.ResponseWriter, r *http.Request, payload *mpv2.Payload[any]) error {
if !payload.DebugMode && session.IsGTMDebug(r) {
payload.DebugMode = true
for i, event := range payload.Events {
if value, ok := event.Params.(map[string]any); ok {
value["debug_mode"] = true
event.Params = value
}
payload.Events[i] = event
}
}
return next(l, w, r, payload)
}
Expand Down Expand Up @@ -121,7 +114,9 @@ func MiddlewareUserAgent(next MiddlewareHandler) MiddlewareHandler {
if userAgent := r.Header.Get("User-Agent"); userAgent != "" {
for i, event := range payload.Events {
if value, ok := event.Params.(map[string]any); ok {
value["user_agent"] = userAgent
if value["user_agent"] == nil {
value["user_agent"] = userAgent
}
event.Params = value
}
payload.Events[i] = event
Expand All @@ -143,7 +138,9 @@ func MiddlewareIPOverride(next MiddlewareHandler) MiddlewareHandler {
if ipOverride != "" {
for i, event := range payload.Events {
if value, ok := event.Params.(map[string]any); ok {
value["ip_override"] = ipOverride
if value["ip_override"] == nil {
value["ip_override"] = ipOverride
}
event.Params = value
}
payload.Events[i] = event
Expand All @@ -157,7 +154,9 @@ func MiddlewareEngagementTime(next MiddlewareHandler) MiddlewareHandler {
return func(l *zap.Logger, w http.ResponseWriter, r *http.Request, payload *mpv2.Payload[any]) error {
for i, event := range payload.Events {
if value, ok := event.Params.(map[string]any); ok {
value["engagement_time_msec"] = 100
if value["engagement_time_msec"] == nil {
value["engagement_time_msec"] = 100
}
event.Params = value
}
payload.Events[i] = event
Expand All @@ -172,13 +171,13 @@ func MiddlewarePageLocation(next MiddlewareHandler) MiddlewareHandler {
pageReferrer := r.Header.Get("X-Page-Referrer")
for i, event := range payload.Events {
if value, ok := event.Params.(map[string]any); ok {
if value["page_title"] == "" && pageTitle != "" {
if value["page_title"] == nil && pageTitle != "" {
value["page_title"] = pageTitle
}
if value["page_referrer"] == "" && pageReferrer != "" {
if value["page_referrer"] == nil && pageReferrer != "" {
value["page_referrer"] = pageReferrer
}
if value["page_location"] == "" && pageLocation != "" {
if value["page_location"] == nil && pageLocation != "" {
value["page_location"] = pageLocation
}
event.Params = value
Expand Down

0 comments on commit f4b1a3c

Please sign in to comment.