New goals page. Upgraded prisma.

src/app/api/reports/goals/route.ts

@@ -2,34 +2,28 @@ import { z } from 'zod';
 import { canViewWebsite } from '@/lib/auth';
 import { unauthorized, json } from '@/lib/response';
 import { parseRequest } from '@/lib/request';
-import { getGoals } from '@/queries/sql/reports/getGoals';
-import { reportParms } from '@/lib/schema';
+import { getGoal } from '@/queries/sql/reports/getGoal';
+import { filterParams, reportParms } from '@/lib/schema';
 
 export async function POST(request: Request) {
-  const schema = z.object({
-    ...reportParms,
-    goals: z
-      .array(
-        z
-          .object({
-            type: z.string().regex(/url|event|event-data/),
-            value: z.string(),
-            goal: z.coerce.number(),
-            operator: z
-              .string()
-              .regex(/count|sum|average/)
-              .optional(),
-            property: z.string().optional(),
-          })
-          .refine(data => {
-            if (data['type'] === 'event-data') {
-              return data['operator'] && data['property'];
-            }
-            return true;
-          }),
-      )
-      .min(1),
-  });
+  const schema = z
+    .object({
+      ...reportParms,
+      ...filterParams,
+      type: z.enum(['page', 'event']),
+      value: z.string(),
+      operator: z
+        .string()
+        .regex(/count|sum|average/)
+        .optional(),
+      property: z.string().optional(),
+    })
+    .refine(data => {
+      if (data['type'] === 'event' && data['property']) {
+        return data['operator'] && data['property'];
+      }
+      return true;
+    });
 
   const { auth, body, error } = await parseRequest(request, schema);
 
@@ -39,18 +33,24 @@ export async function POST(request: Request) {
 
   const {
     websiteId,
+    type,
+    value,
+    property,
+    operator,
     dateRange: { startDate, endDate },
-    goals,
   } = body;
 
   if (!(await canViewWebsite(auth, websiteId))) {
     return unauthorized();
   }
 
-  const data = await getGoals(websiteId, {
+  const data = await getGoal(websiteId, {
+    type,
+    value,
+    property,
+    operator,
     startDate: new Date(startDate),
     endDate: new Date(endDate),
-    goals,
   });
 
   return json(data);

src/app/api/websites/[websiteId]/goals/route.ts

@@ -0,0 +1,94 @@
+import { z } from 'zod';
+import { canViewWebsite } from '@/lib/auth';
+import { unauthorized, json, ok } from '@/lib/response';
+import { parseRequest } from '@/lib/request';
+import { getReports, createReport, updateReport } from '@/queries';
+import { uuid } from '@/lib/crypto';
+
+export async function GET(
+  request: Request,
+  { params }: { params: Promise<{ websiteId: string }> },
+) {
+  const { auth, query, error } = await parseRequest(request);
+
+  if (error) {
+    return error();
+  }
+
+  const { websiteId } = await params;
+  const { page, search, pageSize } = query;
+  const filters = {
+    page,
+    pageSize,
+    search,
+  };
+
+  if (!(await canViewWebsite(auth, websiteId))) {
+    return unauthorized();
+  }
+
+  const data = await getReports(
+    {
+      where: {
+        websiteId,
+        type: 'goals',
+      },
+    },
+    filters,
+  ).then(result => {
+    result.data = result.data.map(report => {
+      report.parameters = JSON.parse(report.parameters);
+
+      return report;
+    });
+
+    return result;
+  });
+
+  return json(data);
+}
+
+export async function POST(
+  request: Request,
+  { params }: { params: Promise<{ websiteId: string }> },
+) {
+  const schema = z.object({
+    id: z.string().uuid().optional(),
+    name: z.string(),
+    type: z.enum(['page', 'event']),
+    value: z.string(),
+  });
+
+  const { auth, body, error } = await parseRequest(request, schema);
+
+  if (error) {
+    return error();
+  }
+
+  const { websiteId } = await params;
+
+  if (!(await canViewWebsite(auth, websiteId))) {
+    return unauthorized();
+  }
+
+  const { id, name, type, value } = body;
+
+  if (id) {
+    await updateReport(id, {
+      name,
+      parameters: JSON.stringify({ name, type, value }),
+    });
+  } else {
+    await createReport({
+      id: uuid(),
+      userId: auth.user.id,
+      websiteId,
+      type: 'goals',
+      name,
+      description: '',
+      parameters: JSON.stringify({ name, type, value }),
+    });
+  }
+
+  return ok();
+}