Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions backend/pkg/httpserver/create_subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ import (
// The exhaustive linter is configured to check that this map is complete.
func getAllSubscriptionTriggersSet() map[backend.SubscriptionTriggerWritable]any {
return map[backend.SubscriptionTriggerWritable]any{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete: nil,
backend.SubscriptionTriggerFeatureBaselineLimitedToNewly: nil,
backend.SubscriptionTriggerFeatureBaselineRegressionNewlyToLimited: nil,
backend.SubscriptionTriggerFeatureBaselineToNewly: nil,
backend.SubscriptionTriggerFeatureBaselineToWidely: nil,
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete: nil,
backend.SubscriptionTriggerFeatureBaselineRegressionToLimited: nil,
}
}

Expand Down Expand Up @@ -76,7 +77,9 @@ func validateSubscriptionTrigger(trigger *[]backend.SubscriptionTriggerWritable,
// The exhaustive linter is configured to check that this map is complete.
func getAllSubscriptionFrequenciesSet() map[backend.SubscriptionFrequency]any {
return map[backend.SubscriptionFrequency]any{
backend.SubscriptionFrequencyDaily: nil,
backend.SubscriptionFrequencyImmediate: nil,
backend.SubscriptionFrequencyWeekly: nil,
backend.SubscriptionFrequencyMonthly: nil,
}
}

Expand Down
52 changes: 26 additions & 26 deletions backend/pkg/httpserver/create_subscription_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ func TestCreateSubscription(t *testing.T) {
ChannelId: "channel-id",
SavedSearchId: "search-id",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: "daily",
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: "immediate",
},
output: &backend.SubscriptionResponse{
Id: "sub-id",
Expand All @@ -61,11 +61,11 @@ func TestCreateSubscription(t *testing.T) {
Triggers: []backend.SubscriptionTriggerResponseItem{
{
Value: backendtypes.AttemptToStoreSubscriptionTrigger(
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete),
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete),
RawValue: nil,
},
},
Frequency: "daily",
Frequency: "immediate",
CreatedAt: now,
UpdatedAt: now,
},
Expand All @@ -79,16 +79,16 @@ func TestCreateSubscription(t *testing.T) {
strings.NewReader(`{
"channel_id": "channel-id",
"saved_search_id": "search-id",
"triggers": ["feature_any_browser_implementation_complete"],
"frequency": "daily"
"triggers": ["feature_browser_implementation_any_complete"],
"frequency": "immediate"
}`),
),
expectedResponse: testJSONResponse(http.StatusCreated, `{
"id":"sub-id",
"channel_id":"channel-id",
"saved_search_id":"search-id",
"triggers": [{"value":"feature_any_browser_implementation_complete"}],
"frequency":"daily",
"triggers": [{"value":"feature_browser_implementation_any_complete"}],
"frequency":"immediate",
"created_at":"`+now.Format(time.RFC3339Nano)+`",
"updated_at":"`+now.Format(time.RFC3339Nano)+`"
}`),
Expand All @@ -103,8 +103,8 @@ func TestCreateSubscription(t *testing.T) {
"/v1/users/me/subscriptions",
strings.NewReader(`{
"saved_search_id": "search-id",
"triggers": ["feature_any_browser_implementation_complete"],
"frequency": "daily"
"triggers": ["feature_browser_implementation_any_complete"],
"frequency": "immediate"
}`),
),
expectedResponse: testJSONResponse(http.StatusBadRequest, `
Expand All @@ -124,8 +124,8 @@ func TestCreateSubscription(t *testing.T) {
ChannelId: "channel-id",
SavedSearchId: "search-id",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: "daily",
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: "immediate",
},
output: nil,
err: backendtypes.ErrUserNotAuthorizedForAction,
Expand All @@ -138,8 +138,8 @@ func TestCreateSubscription(t *testing.T) {
strings.NewReader(`{
"channel_id": "channel-id",
"saved_search_id": "search-id",
"triggers": ["feature_any_browser_implementation_complete"],
"frequency": "daily"
"triggers": ["feature_browser_implementation_any_complete"],
"frequency": "immediate"
}`)),
expectedResponse: testJSONResponse(http.StatusForbidden, `{
"code":403,
Expand All @@ -154,8 +154,8 @@ func TestCreateSubscription(t *testing.T) {
ChannelId: "channel-id",
SavedSearchId: "search-id",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: "daily",
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: "immediate",
},
output: nil,
err: fmt.Errorf("database error"),
Expand All @@ -168,8 +168,8 @@ func TestCreateSubscription(t *testing.T) {
strings.NewReader(`{
"channel_id": "channel-id",
"saved_search_id": "search-id",
"triggers": ["feature_any_browser_implementation_complete"],
"frequency": "daily"
"triggers": ["feature_browser_implementation_any_complete"],
"frequency": "immediate"
}`)),
expectedResponse: testJSONResponse(http.StatusInternalServerError, `{
"code":500,
Expand Down Expand Up @@ -214,8 +214,8 @@ func TestValidateSubscriptionCreation(t *testing.T) {
ChannelId: "channel-id",
SavedSearchId: "search-id",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: backend.SubscriptionFrequencyDaily,
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: backend.SubscriptionFrequencyImmediate,
},
want: nil,
},
Expand All @@ -225,8 +225,8 @@ func TestValidateSubscriptionCreation(t *testing.T) {
ChannelId: "",
SavedSearchId: "searchid",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: backend.SubscriptionFrequencyDaily,
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: backend.SubscriptionFrequencyImmediate,
},
want: &fieldValidationErrors{
fieldErrorMap: map[string]string{
Expand All @@ -240,8 +240,8 @@ func TestValidateSubscriptionCreation(t *testing.T) {
ChannelId: "channelid",
SavedSearchId: "",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
Frequency: backend.SubscriptionFrequencyDaily,
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: backend.SubscriptionFrequencyImmediate,
},
want: &fieldValidationErrors{
fieldErrorMap: map[string]string{
Expand All @@ -256,7 +256,7 @@ func TestValidateSubscriptionCreation(t *testing.T) {
SavedSearchId: "searchid",
Triggers: []backend.SubscriptionTriggerWritable{
"invalid_trigger"},
Frequency: backend.SubscriptionFrequencyDaily,
Frequency: backend.SubscriptionFrequencyImmediate,
},
want: &fieldValidationErrors{
fieldErrorMap: map[string]string{
Expand All @@ -270,7 +270,7 @@ func TestValidateSubscriptionCreation(t *testing.T) {
ChannelId: "channelid",
SavedSearchId: "searchid",
Triggers: []backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
Frequency: "invalid_frequency",
},
want: &fieldValidationErrors{
Expand Down
28 changes: 14 additions & 14 deletions backend/pkg/httpserver/update_subscription_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestUpdateSubscription(t *testing.T) {
expectedSubscriptionID: "sub-id",
expectedUpdateRequest: backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
backend.UpdateSubscriptionRequestMaskTriggers},
Frequency: nil,
Expand All @@ -62,7 +62,7 @@ func TestUpdateSubscription(t *testing.T) {
Triggers: []backend.SubscriptionTriggerResponseItem{
{
Value: backendtypes.AttemptToStoreSubscriptionTrigger(
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete),
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete),
RawValue: nil,
},
},
Expand All @@ -79,15 +79,15 @@ func TestUpdateSubscription(t *testing.T) {
strings.NewReader(`
{
"triggers":
["feature_any_browser_implementation_complete"],
["feature_browser_implementation_any_complete"],
"update_mask": ["triggers"]
}`)),
expectedResponse: testJSONResponse(http.StatusOK,
`{
"id":"sub-id",
"channel_id":"channel-id",
"saved_search_id":"search-id",
"triggers": [{"value":"feature_any_browser_implementation_complete"}],
"triggers": [{"value":"feature_browser_implementation_any_complete"}],
"frequency":"daily",
"created_at":"`+now.Format(time.RFC3339Nano)+`",
"updated_at":"`+now.Format(time.RFC3339Nano)+`"
Expand All @@ -101,7 +101,7 @@ func TestUpdateSubscription(t *testing.T) {
expectedSubscriptionID: "sub-id",
expectedUpdateRequest: backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete,
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete,
},
Frequency: nil,
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
Expand All @@ -116,7 +116,7 @@ func TestUpdateSubscription(t *testing.T) {
"/v1/users/me/subscriptions/sub-id",
strings.NewReader(`
{
"triggers": ["feature_any_browser_implementation_complete"],
"triggers": ["feature_browser_implementation_any_complete"],
"update_mask": ["triggers"]
}`)),
expectedResponse: testJSONResponse(http.StatusNotFound, `
Expand All @@ -134,7 +134,7 @@ func TestUpdateSubscription(t *testing.T) {
"/v1/users/me/subscriptions/sub-id",
strings.NewReader(`
{
"triggers": ["feature_any_browser_implementation_complete"],
"triggers": ["feature_browser_implementation_any_complete"],
"update_mask": ["invalid_field"]
}`)),
expectedResponse: testJSONResponse(http.StatusBadRequest, `
Expand All @@ -155,7 +155,7 @@ func TestUpdateSubscription(t *testing.T) {
expectedSubscriptionID: "sub-id",
expectedUpdateRequest: backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
backend.UpdateSubscriptionRequestMaskTriggers},
Frequency: nil,
Expand All @@ -169,7 +169,7 @@ func TestUpdateSubscription(t *testing.T) {
"/v1/users/me/subscriptions/sub-id",
strings.NewReader(`
{
"triggers": ["feature_any_browser_implementation_complete"],
"triggers": ["feature_browser_implementation_any_complete"],
"update_mask": ["triggers"]
}`)),
expectedResponse: testJSONResponse(http.StatusForbidden, `
Expand All @@ -186,7 +186,7 @@ func TestUpdateSubscription(t *testing.T) {
expectedSubscriptionID: "sub-id",
expectedUpdateRequest: backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
backend.UpdateSubscriptionRequestMaskTriggers},
Frequency: nil,
Expand All @@ -200,7 +200,7 @@ func TestUpdateSubscription(t *testing.T) {
"/v1/users/me/subscriptions/sub-id",
strings.NewReader(`
{
"triggers": ["feature_any_browser_implementation_complete"],
"triggers": ["feature_browser_implementation_any_complete"],
"update_mask": ["triggers"]
}`)),
expectedResponse: testJSONResponse(http.StatusInternalServerError, `
Expand Down Expand Up @@ -250,7 +250,7 @@ func TestValidateSubscriptionUpdate(t *testing.T) {
name: "valid update",
input: &backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
backend.UpdateSubscriptionRequestMaskTriggers},
Frequency: nil,
Expand All @@ -261,7 +261,7 @@ func TestValidateSubscriptionUpdate(t *testing.T) {
name: "invalid update mask",
input: &backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: []backend.UpdateSubscriptionRequestUpdateMask{
"invalid_field"},
Frequency: nil,
Expand Down Expand Up @@ -290,7 +290,7 @@ func TestValidateSubscriptionUpdate(t *testing.T) {
name: "nil update mask",
input: &backend.UpdateSubscriptionRequest{
Triggers: &[]backend.SubscriptionTriggerWritable{
backend.SubscriptionTriggerFeatureAnyBrowserImplementationComplete},
backend.SubscriptionTriggerFeatureBrowserImplementationAnyComplete},
UpdateMask: nil,
Frequency: nil,
},
Expand Down
3 changes: 0 additions & 3 deletions lib/event/batchrefreshtrigger/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ type JobFrequency string
const (
FrequencyUnknown JobFrequency = "UNKNOWN"
FrequencyImmediate JobFrequency = "IMMEDIATE"
FrequencyDaily JobFrequency = "DAILY"
FrequencyWeekly JobFrequency = "WEEKLY"
FrequencyMonthly JobFrequency = "MONTHLY"
)
Expand All @@ -31,8 +30,6 @@ func (f JobFrequency) ToWorkerTypeJobFrequency() workertypes.JobFrequency {
switch f {
case FrequencyImmediate:
return workertypes.FrequencyImmediate
case FrequencyDaily:
return workertypes.FrequencyDaily
case FrequencyWeekly:
return workertypes.FrequencyWeekly
case FrequencyMonthly:
Expand Down
5 changes: 0 additions & 5 deletions lib/event/featurediff/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ type JobFrequency string
const (
FrequencyUnknown JobFrequency = "UNKNOWN"
FrequencyImmediate JobFrequency = "IMMEDIATE"
FrequencyDaily JobFrequency = "DAILY"
FrequencyWeekly JobFrequency = "WEEKLY"
FrequencyMonthly JobFrequency = "MONTHLY"
)
Expand Down Expand Up @@ -73,8 +72,6 @@ func (f JobFrequency) ToWorkertypes() workertypes.JobFrequency {
switch f {
case FrequencyImmediate:
return workertypes.FrequencyImmediate
case FrequencyDaily:
return workertypes.FrequencyDaily
case FrequencyWeekly:
return workertypes.FrequencyWeekly
case FrequencyMonthly:
Expand All @@ -90,8 +87,6 @@ func ToJobFrequency(freq workertypes.JobFrequency) JobFrequency {
switch freq {
case workertypes.FrequencyImmediate:
return FrequencyImmediate
case workertypes.FrequencyDaily:
return FrequencyDaily
case workertypes.FrequencyWeekly:
return FrequencyWeekly
case workertypes.FrequencyMonthly:
Expand Down
3 changes: 0 additions & 3 deletions lib/event/refreshsearchcommand/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ type JobFrequency string
const (
FrequencyUnknown JobFrequency = "UNKNOWN"
FrequencyImmediate JobFrequency = "IMMEDIATE"
FrequencyDaily JobFrequency = "DAILY"
FrequencyWeekly JobFrequency = "WEEKLY"
FrequencyMonthly JobFrequency = "MONTHLY"
)
Expand All @@ -35,8 +34,6 @@ func (f JobFrequency) ToWorkerTypeJobFrequency() workertypes.JobFrequency {
switch f {
case FrequencyImmediate:
return workertypes.FrequencyImmediate
case FrequencyDaily:
return workertypes.FrequencyDaily
case FrequencyWeekly:
return workertypes.FrequencyWeekly
case FrequencyMonthly:
Expand Down
3 changes: 0 additions & 3 deletions lib/event/searchconfigurationchanged/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ type JobFrequency string
const (
FrequencyUnknown JobFrequency = "UNKNOWN"
FrequencyImmediate JobFrequency = "IMMEDIATE"
FrequencyDaily JobFrequency = "DAILY"
FrequencyWeekly JobFrequency = "WEEKLY"
FrequencyMonthly JobFrequency = "MONTHLY"
)
Expand All @@ -35,8 +34,6 @@ func (f JobFrequency) ToWorkerTypeJobFrequency() workertypes.JobFrequency {
switch f {
case FrequencyImmediate:
return workertypes.FrequencyImmediate
case FrequencyDaily:
return workertypes.FrequencyDaily
case FrequencyWeekly:
return workertypes.FrequencyWeekly
case FrequencyMonthly:
Expand Down
Loading
Loading