feat(analytics): updated experiment analytics

Author: Davidthecode

.cursorrules

@@ -37,4 +37,4 @@
     "source.fixAll.biome": "explicit",
     "source.organizeImports.biome": "explicit"
   }
-}
+}

.vscode/settings.json

@@ -2,6 +2,7 @@ import "dotenv/config";
 
 export const env = {
   PORT: process.env.PORT,
+  APP_URL: process.env.APP_URL,
   FRONTEND_URL: process.env.FRONTEND_URL,
   API_URL: process.env.API_URL,
   RESEND_API_KEY: process.env.RESEND_API_KEY,

apps/api/src/config/env.ts

@@ -1,7 +1,8 @@
 import { Resend } from "resend";
+import { env } from "@/config/env";
 import { WelcomeEmail } from "@/lib/emails/WelcomeEmail";
 
-const resendApiKey = process.env.RESEND_API_KEY;
+const resendApiKey = env.RESEND_API_KEY;
 const resend = resendApiKey ? new Resend(resendApiKey) : null;
 
 export async function sendWelcomeEmail({ userEmail }: { userEmail: string }) {

apps/api/src/lib/actions/email.ts

@@ -12,12 +12,13 @@ import {
   Tailwind,
   Text,
 } from "@react-email/components";
+import { env } from "@/config/env";
 
 type WelcomeEmailProps = {
   userEmail: string;
 };
 
-const appBaseUrl = process.env.APP_URL;
+const appBaseUrl = env.APP_URL;
 
 export const WelcomeEmail = ({ userEmail }: WelcomeEmailProps) => {
   const previewText = "Flagix is ready. Start shipping features with control!";

apps/api/src/lib/emails/WelcomeEmail.tsx

@@ -301,12 +301,8 @@ router.get(
         targetVariation: rule.variation?.name, // Target variation for 'targeting' rules
         rolloutPercentage: rule.rolloutPercentage,
         variationSplits: // Distribution for 'experiment' rules
-          rule.type === "experiment"
-            ? JSON.parse(rule.distribution as string)
-            : undefined,
-        conditions: rule.conditions
-          ? JSON.parse(rule.conditions as string)
-          : [],
+          rule.type === "experiment" ? rule.distribution : undefined,
+        conditions: rule.conditions ? rule.conditions : [],
       }));
 
       // Format the final output structure
@@ -316,8 +312,9 @@ router.get(
         description: flagData.description,
         createdAt: flagData.createdAt.toISOString().split("T")[0],
         variations: flagData.variations.map((variation) => ({
+          id: variation.id,
           name: variation.name,
-          value: JSON.parse(variation.value as string),
+          value: variation.value,
           type: variation.type,
         })),
 
@@ -708,7 +705,7 @@ router.post(
           rolloutPercentage = rule.rolloutPercentage;
         } else {
           // experiment
-          distributionJson = JSON.stringify(rule.variationSplits);
+          distributionJson = rule.variationSplits;
         }
 
         const newRule = await tx.environmentRule.create({
@@ -719,9 +716,7 @@ router.post(
             type: rule.ruleType,
             description: rule.description,
             conditions:
-              rule.conditions.length > 0
-                ? JSON.stringify(rule.conditions)
-                : Prisma.JsonNull,
+              rule.conditions.length > 0 ? rule.conditions : Prisma.JsonNull,
             rolloutPercentage,
             variationId,
             distribution: distributionJson,
@@ -922,17 +917,15 @@ router.put(
         rolloutPercentage = rule.rolloutPercentage;
       } else {
         // experiment
-        distributionData = JSON.stringify(rule.variationSplits);
+        distributionData = rule.variationSplits;
       }
 
       await db.environmentRule.update({
         where: { id: ruleId },
         data: {
           description: rule.description,
           conditions:
-            rule.conditions.length > 0
-              ? JSON.stringify(rule.conditions)
-              : Prisma.JsonNull,
+            rule.conditions.length > 0 ? rule.conditions : Prisma.JsonNull,
           rolloutPercentage: rolloutPercentage ?? null,
           variationId: variationId ?? null,
           distribution: distributionData,