test(billing): use inactive instead of disabled for plan state

Author: rohilsurana

internal/api/v1beta1connect/billing_plan_test.go

@@ -631,7 +631,7 @@ func TestConnectHandler_UpdatePlan(t *testing.T) {
 					Description:    "updated",
 					OnStartCredits: 500,
 					TrialDays:      14,
-					State:          "disabled",
+					State:          "inactive",
 					Metadata:       testMetadata,
 				},
 			}),
@@ -642,7 +642,7 @@ func TestConnectHandler_UpdatePlan(t *testing.T) {
 					Description:    "updated",
 					OnStartCredits: 500,
 					TrialDays:      14,
-					State:          "disabled",
+					State:          "inactive",
 					Metadata:       metadata.Metadata{"key1": "value1"},
 				}).Return(plan.Plan{
 					ID:             "plan-1",
@@ -651,7 +651,7 @@ func TestConnectHandler_UpdatePlan(t *testing.T) {
 					Description:    "updated",
 					OnStartCredits: 500,
 					TrialDays:      14,
-					State:          "disabled",
+					State:          "inactive",
 					CreatedAt:      time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
 					UpdatedAt:      time.Date(2023, 1, 3, 0, 0, 0, 0, time.UTC),
 				}, nil)
@@ -664,7 +664,7 @@ func TestConnectHandler_UpdatePlan(t *testing.T) {
 					Description:    "updated",
 					OnStartCredits: 500,
 					TrialDays:      14,
-					State:          "disabled",
+					State:          "inactive",
 					CreatedAt:      timestamppb.New(time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)),
 					UpdatedAt:      timestamppb.New(time.Date(2023, 1, 3, 0, 0, 0, 0, time.UTC)),
 				},
@@ -727,7 +727,7 @@ func TestConnectHandler_ListAllPlans(t *testing.T) {
 						ID:        "plan-2",
 						Name:      "old-plan",
 						Title:     "Old Plan",
-						State:     "disabled",
+						State:     "inactive",
 						Products:  []product.Product{},
 						Metadata:  metadata.Metadata{},
 						CreatedAt: time.Date(2023, 2, 1, 0, 0, 0, 0, time.UTC),
@@ -749,7 +749,7 @@ func TestConnectHandler_ListAllPlans(t *testing.T) {
 						Id:        "plan-2",
 						Name:      "old-plan",
 						Title:     "Old Plan",
-						State:     "disabled",
+						State:     "inactive",
 						CreatedAt: timestamppb.New(time.Date(2023, 2, 1, 0, 0, 0, 0, time.UTC)),
 						UpdatedAt: timestamppb.New(time.Date(2023, 2, 2, 0, 0, 0, 0, time.UTC)),
 					},
@@ -758,9 +758,9 @@ func TestConnectHandler_ListAllPlans(t *testing.T) {
 		},
 		{
 			name:    "should pass a set state through as a filter",
-			request: connect.NewRequest(&frontierv1beta1.ListAllPlansRequest{State: "disabled"}),
+			request: connect.NewRequest(&frontierv1beta1.ListAllPlansRequest{State: "inactive"}),
 			setup: func(ps *mocks.PlanService) {
-				ps.On("List", mock.Anything, plan.Filter{State: "disabled"}).Return([]plan.Plan{}, nil)
+				ps.On("List", mock.Anything, plan.Filter{State: "inactive"}).Return([]plan.Plan{}, nil)
 			},
 			want: connect.NewResponse(&frontierv1beta1.ListAllPlansResponse{Plans: nil}),
 		},

test/e2e/regression/billing_test.go

@@ -353,13 +353,13 @@ func (s *BillingRegressionTestSuite) TestPlansAPI() {
 			Body: &frontierv1beta1.UpdatePlanRequestBody{
 				Title:       "Test Plan 2 Renamed",
 				Description: "Test Plan 2 Renamed",
-				State:       "disabled",
+				State:       "inactive",
 			},
 		}))
 		s.Assert().NoError(err)
 		s.Assert().NotNil(updatePlanResp)
 		s.Assert().Equal("Test Plan 2 Renamed", updatePlanResp.Msg.GetPlan().GetTitle())
-		s.Assert().Equal("disabled", updatePlanResp.Msg.GetPlan().GetState())
+		s.Assert().Equal("inactive", updatePlanResp.Msg.GetPlan().GetState())
 		// UpdatePlan does not touch a plan's products
 		s.Assert().NotEmpty(updatePlanResp.Msg.GetPlan().GetProducts())
 	})
@@ -371,21 +371,21 @@ func (s *BillingRegressionTestSuite) TestPlansAPI() {
 		s.Assert().Error(err)
 		s.Assert().Equal(connect.CodeNotFound, connect.CodeOf(err))
 	})
-	s.Run("5. list all plans surfaces the disabled plan, ListPlans hides it", func() {
+	s.Run("5. list all plans surfaces the inactive plan, ListPlans hides it", func() {
 		// ListPlans returns active plans only
 		listPlansResp, err := s.testBench.Client.ListPlans(ctxOrgAdminAuth, connect.NewRequest(&frontierv1beta1.ListPlansRequest{}))
 		s.Assert().NoError(err)
 		s.Assert().False(hasPlanNamed(listPlansResp.Msg.GetPlans(), "test-plan-2"))
 
-		// ListAllPlans with an empty state returns every plan, including disabled ones
+		// ListAllPlans with an empty state returns every plan, including inactive ones
 		listAllResp, err := s.testBench.AdminClient.ListAllPlans(ctxOrgAdminAuth, connect.NewRequest(&frontierv1beta1.ListAllPlansRequest{}))
 		s.Assert().NoError(err)
 		s.Assert().True(hasPlanNamed(listAllResp.Msg.GetPlans(), "test-plan-2"))
 
 		// the state filter narrows to a single state
-		listDisabledResp, err := s.testBench.AdminClient.ListAllPlans(ctxOrgAdminAuth, connect.NewRequest(&frontierv1beta1.ListAllPlansRequest{State: "disabled"}))
+		listInactiveResp, err := s.testBench.AdminClient.ListAllPlans(ctxOrgAdminAuth, connect.NewRequest(&frontierv1beta1.ListAllPlansRequest{State: "inactive"}))
 		s.Assert().NoError(err)
-		s.Assert().True(hasPlanNamed(listDisabledResp.Msg.GetPlans(), "test-plan-2"))
+		s.Assert().True(hasPlanNamed(listInactiveResp.Msg.GetPlans(), "test-plan-2"))
 	})
 }