bug: retry feature pull with backoff + add missing fields from org su…

…bscriptions (#372) * bug: retry feature pull with backoff Signed-off-by: Sarah Funkhouser <[email protected]> * linter Signed-off-by: Sarah Funkhouser <[email protected]> * bug: fix missing operation context when not a graph request Signed-off-by: Sarah Funkhouser <[email protected]> * feat: add missing fields, fix subscriptionURL bug Signed-off-by: Sarah Funkhouser <[email protected]> * linter Signed-off-by: Sarah Funkhouser <[email protected]> * move check to function Signed-off-by: Sarah Funkhouser <[email protected]> --------- Signed-off-by: Sarah Funkhouser <[email protected]>
theopenlane · Jan 10, 2025 · de8b7ce · de8b7ce
1 parent fe5f729
commit de8b7ce
Show file tree

Hide file tree

Showing 45 changed files with 901 additions and 92 deletions.
diff --git a/cmd/cli/cmd/orgsubscription/root.go b/cmd/cli/cmd/orgsubscription/root.go
@@ -81,8 +81,7 @@ func jsonOutput(out any) error {
 // tableOutput prints the output in a table format
 func tableOutput(out []openlaneclient.OrgSubscription) {
 	// create a table writer
-	// TODO: add additional columns to the table writer
-	writer := tables.NewTableWriter(command.OutOrStdout(), "ID", "StripeCustomerID", "StripeSubscriptionStatus", "ProductTier", "Features", "ExpiresAt")
+	writer := tables.NewTableWriter(command.OutOrStdout(), "ID", "Active", "StripeCustomerID", "StripeSubscriptionStatus", "ProductTier", "Features", "Price", "ExpiresAt")
 	for _, i := range out {
 		features := []string{}
 		if i.Features != nil {
@@ -94,11 +93,18 @@ func tableOutput(out []openlaneclient.OrgSubscription) {
 			exp = i.ExpiresAt.String()
 		}
 
+		price := ""
+		if i.ProductPrice != nil {
+			price = i.ProductPrice.String()
+		}
+
 		writer.AddRow(i.ID,
+			i.Active,
 			*i.StripeCustomerID,
 			*i.StripeSubscriptionStatus,
 			*i.ProductTier,
 			strings.Join(features, ", "),
+			price,
 			exp,
 		)
 	}

diff --git a/db/migrations-goose-postgres/20250110162830_subscription_price.sql b/db/migrations-goose-postgres/20250110162830_subscription_price.sql
@@ -0,0 +1,11 @@
+-- +goose Up
+-- modify "org_subscription_history" table
+ALTER TABLE "org_subscription_history" ADD COLUMN "product_price" jsonb NULL;
+-- modify "org_subscriptions" table
+ALTER TABLE "org_subscriptions" ADD COLUMN "product_price" jsonb NULL;
+
+-- +goose Down
+-- reverse: modify "org_subscriptions" table
+ALTER TABLE "org_subscriptions" DROP COLUMN "product_price";
+-- reverse: modify "org_subscription_history" table
+ALTER TABLE "org_subscription_history" DROP COLUMN "product_price";
diff --git a/db/migrations-goose-postgres/atlas.sum b/db/migrations-goose-postgres/atlas.sum
@@ -1,5 +1,6 @@
-h1:QXCrkYR4vxggy2Kk14xhgOkCom8B/+rl+I7Rgzroh0k=
+h1:TRyOA0hBgJWu/ryMtc4bGT7xQ4ZM7obgNDeGGFkC+No=
 20241211231032_init.sql h1:Cj6GduEDECy6Y+8DfI6767WosqG2AKWybIyJJ6AgKqA=
 20241212223714_consistent_naming.sql h1:RvnNmsStlHkmAdSCnX1fFh/KYgfj1RMYYEc4iCN9JcQ=
 20250109002850_billing_address.sql h1:m0ek3WXqRgS3+ZbSa/DcIMB16vb8Tjm2MgNqyRll3rU=
 20250109054654_remove_stripe_id.sql h1:OfeshKT2+ydfx+36e4uBrdQ31tuurcJsKXyYDp1ZiZg=
+20250110162830_subscription_price.sql h1:ju8ocKPbqtOalaBZ1aGk8qCDLbgxFCDoA0Dmkr9bLzA=
diff --git a/db/migrations/20250110162828_subscription_price.sql b/db/migrations/20250110162828_subscription_price.sql
@@ -0,0 +1,4 @@
+-- Modify "org_subscription_history" table
+ALTER TABLE "org_subscription_history" ADD COLUMN "product_price" jsonb NULL;
+-- Modify "org_subscriptions" table
+ALTER TABLE "org_subscriptions" ADD COLUMN "product_price" jsonb NULL;
diff --git a/db/migrations/atlas.sum b/db/migrations/atlas.sum
@@ -1,5 +1,6 @@
-h1:8AGIgzcKy+aGOwhLSJk/xgL6kfmXBArWQGmrkTdVur4=
+h1:erRnNniAqlfYXxANR5MxeFGdCDzegYYF35eOGuZi0Fg=
 20241211231032_init.sql h1:TxjpHzKPB/5L2i7V2JfO1y+Cep/AyQN5wGjhY7saCeE=
 20241212223712_consistent_naming.sql h1:tbdYOtixhW66Jmvy3aCm+X6neI/SRVvItKM0Bdn26TA=
 20250109002849_billing_address.sql h1:mspCGbJ6HVmx3r4j+d/WvruzirJdJ8u5x18WF9R9ESE=
 20250109054653_remove_stripe_id.sql h1:dB086/w/Ws7ZK8OvbRWX7ejN4HfizCKxcE3q/+Jv4U8=
+20250110162828_subscription_price.sql h1:RlvrTtH6+PIFuJ+Fp5S06w0ho3B2O/Nn6QcWqSHLWEA=
diff --git a/internal/ent/generated/auditing.go b/internal/ent/generated/auditing.go
diff --git a/internal/ent/generated/entql.go b/internal/ent/generated/entql.go
diff --git a/internal/ent/generated/gql_collection.go b/internal/ent/generated/gql_collection.go
diff --git a/internal/ent/generated/history_from_mutation.go b/internal/ent/generated/history_from_mutation.go
diff --git a/internal/ent/generated/migrate/schema.go b/internal/ent/generated/migrate/schema.go