refactor: change getAllCreditPackagesInServer to getAllCreditPackages

This commit is contained in:
javayhu 2025-07-10 15:06:58 +08:00
parent 5c213d014a
commit 1c7848f6b0
3 changed files with 11 additions and 15 deletions

View File

@ -1,7 +1,7 @@
'use server';
import { websiteConfig } from '@/config/website';
import { getCreditPackageByIdInServer } from '@/credits/server';
import { getCreditPackageById } from '@/credits/server';
import { getSession } from '@/lib/server';
import { getUrlWithLocale } from '@/lib/urls/urls';
import { createCreditCheckout } from '@/payment';
@ -60,7 +60,7 @@ export const createCreditCheckoutSession = actionClient
const locale = await getLocale();
// Find the credit package
const creditPackage = getCreditPackageByIdInServer(packageId);
const creditPackage = getCreditPackageById(packageId);
if (!creditPackage) {
return {
success: false,

View File

@ -2,22 +2,18 @@ import { websiteConfig } from '@/config/website';
import type { CreditPackage } from './types';
/**
* Get all credit packages, used in server components
* Get all credit packages, can be used in server or client components
* @returns Credit packages
*/
export function getAllCreditPackagesInServer(): CreditPackage[] {
export function getAllCreditPackages(): CreditPackage[] {
return Object.values(websiteConfig.credits.packages);
}
/**
* Get credit package by id, used in server components
* Get credit package by id, can be used in server or client components
* @param id - Credit package id
* @returns Credit package
*/
export function getCreditPackageByIdInServer(
id: string
): CreditPackage | undefined {
return websiteConfig.credits.packages[
id as keyof typeof websiteConfig.credits.packages
];
export function getCreditPackageById(id: string): CreditPackage | undefined {
return getAllCreditPackages().find((pkg) => pkg.id === id);
}

View File

@ -1,6 +1,6 @@
import { randomUUID } from 'crypto';
import { addCredits, addSubscriptionRenewalCredits } from '@/credits/credits';
import { getCreditPackageByIdInServer } from '@/credits/server';
import { getCreditPackageById } from '@/credits/server';
import { CREDIT_TRANSACTION_TYPE } from '@/credits/types';
import { getDb } from '@/db';
import { payment, user } from '@/db/schema';
@ -299,7 +299,7 @@ export class StripeProvider implements PaymentProvider {
try {
// Get credit package
const creditPackage = getCreditPackageByIdInServer(packageId);
const creditPackage = getCreditPackageById(packageId);
if (!creditPackage) {
throw new Error(`Credit package with ID ${packageId} not found`);
}
@ -821,7 +821,7 @@ export class StripeProvider implements PaymentProvider {
}
// get credit package
const creditPackage = getCreditPackageByIdInServer(packageId);
const creditPackage = getCreditPackageById(packageId);
if (!creditPackage) {
console.warn(`<< Credit package ${packageId} not found`);
return;
@ -872,7 +872,7 @@ export class StripeProvider implements PaymentProvider {
try {
// Get credit package to get expiration info
const creditPackage = getCreditPackageByIdInServer(packageId);
const creditPackage = getCreditPackageById(packageId);
if (!creditPackage) {
console.warn(`<< Credit package ${packageId} not found`);
return;