Changes suggested by @jcscottiii

Author: DanielRyanSmith

backend/pkg/httpserver/list_missing_one_implementation_counts_test.go

@@ -325,29 +325,15 @@ func TestListMissingOneImplementationCounts(t *testing.T) {
 					"startAt=2000-01-01&endAt=2000-01-10&page_token"+*badPageToken, nil),
 		},
 		{
-			name: "400 case - no matching mobile browser",
-			mockConfig: &MockListMissingOneImplCountsConfig{
-				expectedTargetBrowsers: []string{"chrome"},
-				expectedOtherBrowsers: [][]string{
-					{"edge"},
-					{"firefox"},
-					{"safari"},
-				},
-				expectedStartAt:   time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC),
-				expectedEndAt:     time.Date(2000, time.January, 10, 0, 0, 0, 0, time.UTC),
-				expectedPageSize:  100,
-				expectedPageToken: badPageToken,
-				page:              nil,
-				pageToken:         nil,
-				err:               backendtypes.ErrInvalidPageToken,
-			},
+			name:       "400 case - no matching mobile browser",
+			mockConfig: nil,
 			expectedGetCalls: []*ExpectedGetCall{
 				{
 					Key: `ListMissingOneImplementationCounts-{"browser":"edge","Params":{"startAt":"2000-01-01",` +
 						`"endAt":"2000-01-10","include_baseline_mobile_browsers":true,` +
 						`"browser":["chrome","firefox","safari"]}}`,
 					Value: nil,
-					Err:   ErrNoMatchingMobileBrowser,
+					Err:   cachetypes.ErrCachedDataNotFound,
 				},
 			},
 			expectedCacheCalls: nil,

lib/gcpspanner/missing_one_implementation.go

@@ -104,9 +104,9 @@ SELECT releases.EventReleaseDate,
 			AND obsf.EventReleaseDate = tbuf.EventReleaseDate
 		WHERE
 			tbuf.EventReleaseDate = releases.EventReleaseDate
-			{{ range $releaseDateFilter := .ReleaseDateFilters }}
+			{{ range $browserParamName := .OtherBrowsersParamNames }}
 				AND
-				({{ $releaseDateFilter }})
+				@{{ $browserParamName }} IN UNNEST(obsf.SupportedBrowsers)
 			{{ end }}
 	) AS Count
 FROM (
@@ -163,7 +163,7 @@ LIMIT @limit;
 
 type missingOneImplTemplateData struct {
 	ReleaseDateParam           string
-	ReleaseDateFilters         []string
+	OtherBrowsersParamNames    []string
 	TargetBrowserFilter        string
 	OtherBrowsersFilters       []string
 	ExcludedFeatureFilter      string
@@ -219,7 +219,7 @@ func buildMissingOneImplTemplate(
 
 	targetBrowserConditions := make([]string, 0, len(targetBrowsers))
 	for i, browserName := range targetBrowsers {
-		paramName := fmt.Sprintf("targetBrowserParam%d", i) // Create a unique param name, e.g., targetBrowserParam0
+		paramName := fmt.Sprintf("targetBrowserParam%d", i)
 		targetBrowserConditions[i] = fmt.Sprintf("bfse.TargetBrowserName = @%s", paramName)
 		params[paramName] = browserName
 	}
@@ -233,22 +233,18 @@ func buildMissingOneImplTemplate(
 		params[releaseDateParamName] = cursor.ReleaseDate
 	}
 
+	var allOtherBrowsersParams []string
 	otherBrowsersFilters := make([]string, 0, len(otherBrowsers))
-	releaseDateFilters := make([]string, 0, len(otherBrowsers))
 	for i, otherBrowserGroup := range otherBrowsers {
+		allOtherBrowsersParams = append(
+			allOtherBrowsersParams, otherBrowserGroup...)
 		otherBrowsersConditions := make([]string, 0, len(otherBrowserGroup))
-		releaseDateConditions := make([]string, 0, len(otherBrowserGroup))
 		for j, browserName := range otherBrowserGroup {
 			paramName := fmt.Sprintf("otherBrowsersParam%d-%d", i, j)
 			otherBrowsersConditions[j] = fmt.Sprintf("bfse_other.TargetBrowserName = @%s", paramName)
 			params[paramName] = browserName
-
-			paramName = fmt.Sprintf("releaseDateParam%d-%d", i, j)
-			releaseDateConditions[j] = fmt.Sprintf("%s IN UNNEST(obsf.SupportedBrowsers)", paramName)
-			params[paramName] = browserName
 		}
 		otherBrowsersFilters[i] = fmt.Sprintf("(%s)", strings.Join(otherBrowsersConditions, " AND "))
-		releaseDateFilters[i] = fmt.Sprintf("(%s)", strings.Join(releaseDateConditions, " AND "))
 	}
 
 	var excludedFeatureFilter, otherExcludedFeatureFilter string
@@ -263,7 +259,7 @@ func buildMissingOneImplTemplate(
 
 	tmplData := missingOneImplTemplateData{
 		ReleaseDateParam:           releaseDateParamName,
-		ReleaseDateFilters:         releaseDateFilters,
+		OtherBrowsersParamNames:    allOtherBrowsersParams,
 		TargetBrowserFilter:        targetBrowserFilter,
 		OtherBrowsersFilters:       otherBrowsersFilters,
 		ExcludedFeatureFilter:      excludedFeatureFilter,

lib/gcpspanner/missing_one_implementation_feature_list.go

@@ -113,7 +113,7 @@ func buildMissingOneImplFeatureListTemplate(
 	params := map[string]interface{}{}
 	targetBrowserConditions := make([]string, 0, len(targetBrowsers))
 	for i, browserName := range targetBrowsers {
-		paramName := fmt.Sprintf("targetBrowserParam%d", i) // Create a unique param name, e.g., targetBrowserParam0
+		paramName := fmt.Sprintf("targetBrowserParam%d", i)
 		targetBrowserConditions[i] = fmt.Sprintf("bfse.TargetBrowserName = @%s", paramName)
 		params[paramName] = browserName
 	}