fix: do not deduct credits if cost_per_credit is zero (#5429)

* fix: do not deduct credits if `cost_per_credit` is zero

* fix: make `plan_id` not nullable

* chore: run `codegen` scripts

* chore: remove unnecessary `optional` chaining

Author: Jabolol

apps/frontend/lib/clients/oso-app/oso-app.ts

@@ -941,7 +941,7 @@ class OsoAppClient {
       : null;
     const cycleStartDate = lastRefill;
     const cycleEndDate =
-      lastRefill && plan?.refill_cycle_days
+      lastRefill && plan.refill_cycle_days
         ? new Date(
             lastRefill.getTime() + plan.refill_cycle_days * 24 * 60 * 60 * 1000,
           )
@@ -956,14 +956,14 @@ class OsoAppClient {
         )
       : 0;
 
-    const isEnterprise = plan?.plan_name === "ENTERPRISE";
-    const isFree = plan?.plan_name === "FREE";
+    const isEnterprise = plan.plan_name === "ENTERPRISE";
+    const isFree = plan.plan_name === "FREE";
     const isActive = true;
 
     const features = {
-      maxCreditsPerCycle: plan?.max_credits_per_cycle || 0,
-      refillCycleDays: plan?.refill_cycle_days || 0,
-      pricePerCredit: plan?.price_per_credit || 0,
+      maxCreditsPerCycle: plan.max_credits_per_cycle || 0,
+      refillCycleDays: plan.refill_cycle_days || 0,
+      pricePerCredit: plan.price_per_credit || 0,
       hasUnlimitedQueries: isEnterprise,
       hasPrioritySupport: isEnterprise,
       hasAdvancedAnalytics: isEnterprise,
@@ -975,14 +975,14 @@ class OsoAppClient {
     return {
       orgId: data.id,
       orgName: data.org_name,
-      planId: plan?.plan_id,
-      planName: plan?.plan_name,
+      planId: plan.plan_id,
+      planName: plan.plan_name,
       planDescription: undefined,
       tier: isEnterprise ? "enterprise" : isFree ? "free" : "unknown",
       creditsBalance: finalCreditsBalance,
-      maxCreditsPerCycle: plan?.max_credits_per_cycle || 0,
+      maxCreditsPerCycle: plan.max_credits_per_cycle || 0,
       billingCycle: {
-        cycleDays: plan?.refill_cycle_days || 0,
+        cycleDays: plan.refill_cycle_days || 0,
         cycleStartDate: cycleStartDate?.toISOString() || null,
         cycleEndDate: cycleEndDate?.toISOString() || null,
         daysUntilRefill,

apps/frontend/lib/services/credits.ts

@@ -14,6 +14,8 @@ type SupabaseClient = Awaited<ReturnType<typeof createAdminClient>>;
 export const PLAN_NAMES = ["FREE", "STARTER", "PRO", "ENTERPRISE"] as const;
 export type PlanName = (typeof PLAN_NAMES)[number];
 
+const DEFAULT_CREDIT_PRICE = 1;
+
 export enum TransactionType {
   SQL_QUERY = "sql_query",
   GRAPHQL_QUERY = "graphql_query",
@@ -239,7 +241,7 @@ export class CreditsService {
       const plan = orgData.pricing_plan;
 
       const nextRefillDate =
-        credits?.last_refill_at && plan?.refill_cycle_days
+        credits?.last_refill_at && plan.refill_cycle_days
           ? new Date(
               new Date(credits.last_refill_at).getTime() +
                 plan.refill_cycle_days * 24 * 60 * 60 * 1000,
@@ -248,7 +250,7 @@ export class CreditsService {
 
       const errorContext: CreditErrorContext = {
         orgName: orgData.org_name,
-        planName: plan?.plan_name || "UNKNOWN",
+        planName: plan.plan_name || "UNKNOWN",
         creditsBalance: credits?.credits_balance || 0,
         nextRefillDate,
         supportUrl: orgData.enterprise_support_url || undefined,
@@ -439,11 +441,6 @@ export class CreditsService {
       return null;
     }
 
-    if (!data?.pricing_plan) {
-      logger.error("Organization plan data is missing");
-      return null;
-    }
-
     return {
       org_id: data.id,
       org_name: data.org_name,
@@ -475,7 +472,7 @@ export class CreditsService {
     logger.log(`Post-refill credits balance for org ${orgId}: ${credits}`);
 
     const orgPlan = await CreditsService.getOrganizationPlan(orgId);
-    const costPerCall = orgPlan?.price_per_credit || 1;
+    const costPerCall = orgPlan?.price_per_credit ?? DEFAULT_CREDIT_PRICE;
 
     try {
       const deductionResult = await CreditsService.deductCreditsFromBalance(

apps/frontend/lib/types/schema.ts

@@ -636,7 +636,7 @@ export const organizationsRowSchema = z.object({
   enterprise_support_url: z.string().nullable(),
   id: z.string(),
   org_name: z.string(),
-  plan_id: z.string().nullable(),
+  plan_id: z.string(),
   updated_at: z.string(),
 });
 
@@ -648,7 +648,7 @@ export const organizationsInsertSchema = z.object({
   enterprise_support_url: z.string().optional().nullable(),
   id: z.string().optional(),
   org_name: z.string(),
-  plan_id: z.string().optional().nullable(),
+  plan_id: z.string().optional(),
   updated_at: z.string().optional(),
 });
 
@@ -660,7 +660,7 @@ export const organizationsUpdateSchema = z.object({
   enterprise_support_url: z.string().optional().nullable(),
   id: z.string().optional(),
   org_name: z.string().optional(),
-  plan_id: z.string().optional().nullable(),
+  plan_id: z.string().optional(),
   updated_at: z.string().optional(),
 });
 

apps/frontend/lib/types/supabase.ts

@@ -596,7 +596,7 @@ export type Database = {
           enterprise_support_url: string | null;
           id: string;
           org_name: string;
-          plan_id: string | null;
+          plan_id: string;
           updated_at: string;
         };
         Insert: {
@@ -607,7 +607,7 @@ export type Database = {
           enterprise_support_url?: string | null;
           id?: string;
           org_name: string;
-          plan_id?: string | null;
+          plan_id?: string;
           updated_at?: string;
         };
         Update: {
@@ -618,7 +618,7 @@ export type Database = {
           enterprise_support_url?: string | null;
           id?: string;
           org_name?: string;
-          plan_id?: string | null;
+          plan_id?: string;
           updated_at?: string;
         };
         Relationships: [

apps/frontend/supabase/migrations/20251020152321_make_plan_id_not_nullable.sql

@@ -0,0 +1,2 @@
+ALTER TABLE organizations
+ALTER COLUMN plan_id SET NOT NULL;