From 0f90d2b72537100d2694a5a5ad3afc33fed21049 Mon Sep 17 00:00:00 2001 From: zizi Date: Thu, 16 Apr 2026 22:14:05 +0800 Subject: [PATCH] Unblock the merged Muse relay path by separating helper names The local merge brought Task 4 and Task 6 helpers into the same middleware package, and both introduced a generic firstNonBlank helper. Renaming the Muse-specific helper keeps the merged branch buildable without changing behavior. Constraint: This fix is on top of the local merge to home and must avoid altering the request-context logic itself Rejected: Rolling back the Muse relay context feature | merge target should stay functional after the requested local merge Confidence: high Scope-risk: narrow Reversibility: clean Directive: Keep package-local helper names specific enough to survive future feature merges Tested: go test ./service ./middleware ./relay/common ./controller -count=1 Not-tested: Live relay request after the local merge --- middleware/muse_request_context.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/middleware/muse_request_context.go b/middleware/muse_request_context.go index 3d1cdd17..1002bf15 100644 --- a/middleware/muse_request_context.go +++ b/middleware/muse_request_context.go @@ -26,24 +26,24 @@ func MuseRequestContext() gin.HandlerFunc { return func(c *gin.Context) { metadata := extractMuseMetadata(c) - museUserID := firstNonBlank( + museUserID := museFirstNonBlank( c.GetHeader(museHeaderUserID), stringifyMetadata(metadata["muse_user_id"]), ) - museWorkID := firstNonBlank( + museWorkID := museFirstNonBlank( c.GetHeader(museHeaderWorkID), stringifyMetadata(metadata["work_id"]), stringifyMetadata(metadata["muse_work_id"]), ) - museScene := firstNonBlank( + museScene := museFirstNonBlank( c.GetHeader(museHeaderScene), stringifyMetadata(metadata["scene"]), ) - requestID := firstNonBlank( + requestID := museFirstNonBlank( c.GetHeader(museHeaderRequest), stringifyMetadata(metadata["request_id"]), ) - traceID := firstNonBlank( + traceID := museFirstNonBlank( c.GetHeader(museHeaderTraceID), stringifyMetadata(metadata["trace_id"]), ) @@ -92,7 +92,7 @@ func needsMuseMetadataRead(c *gin.Context) bool { c.GetHeader(museHeaderScene) == "" } -func firstNonBlank(values ...string) string { +func museFirstNonBlank(values ...string) string { for _, value := range values { if strings.TrimSpace(value) != "" { return strings.TrimSpace(value)