chore(website): add new plan type

IgnisDa · Oct 27, 2024 · 8451bf3 · 8451bf3
1 parent eba7387
commit 8451bf3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/apps/website/app/drizzle/schema.server.ts b/apps/website/app/drizzle/schema.server.ts
@@ -15,7 +15,12 @@ export const ProductTypes = z.enum(productTypes.enumValues);
 
 export type TProductTypes = z.infer<typeof ProductTypes>;
 
-export const planTypes = pgEnum("plan_type", ["monthly", "yearly", "lifetime"]);
+export const planTypes = pgEnum("plan_type", [
+	"free",
+	"monthly",
+	"yearly",
+	"lifetime",
+]);
 
 export const PlanTypes = z.enum(planTypes.enumValues);
 

diff --git a/apps/website/app/lib/config.server.ts b/apps/website/app/lib/config.server.ts
@@ -47,14 +47,14 @@ export const OAUTH_CALLBACK_URL = `${serverVariables.FRONTEND_URL}/callback`;
 
 export const pricesSchema = z.array(
 	z.object({
-		type: z.string(),
+		type: z.nativeEnum(ProductTypes.Values),
 		prices: z.array(
 			z.object({
-				name: z.string(),
-				linkToGithub: z.boolean().optional(),
-				priceId: z.string().optional(),
-				amount: z.number().optional(),
 				trial: z.number().optional(),
+				amount: z.number().optional(),
+				priceId: z.string().optional(),
+				linkToGithub: z.boolean().optional(),
+				name: z.nativeEnum(PlanTypes.Values),
 			}),
 		),
 	}),
@@ -67,16 +67,10 @@ export const prices = pricesSchema.parse(
 );
 
 export const getProductAndPlanTypeByPriceId = (priceId: string) => {
-	for (const product of prices) {
-		for (const price of product.prices) {
-			if (price.priceId === priceId) {
-				return {
-					productType: ProductTypes.parse(product.type),
-					planType: PlanTypes.parse(price.name),
-				};
-			}
-		}
-	}
+	for (const product of prices)
+		for (const price of product.prices)
+			if (price.priceId === priceId)
+				return { productType: product.type, planType: price.name };
 	throw new Error("Price ID not found");
 };