Merge remote-tracking branch 'origin/dev' into dev

src/queries/prisma/website.ts

@@ -137,6 +137,9 @@ export async function resetWebsite(websiteId: string) {
 
   return transaction(
     [
+      client.revenue.deleteMany({
+        where: { websiteId },
+      }),
       client.eventData.deleteMany({
         where: { websiteId },
       }),
@@ -175,7 +178,11 @@ export async function deleteWebsite(websiteId: string) {
   const { client, transaction } = prisma;
   const cloudMode = !!process.env.CLOUD_MODE;
 
-  return transaction([
+  return transaction(
+    [
+      client.revenue.deleteMany({
+        where: { websiteId },
+      }),
       client.eventData.deleteMany({
         where: { websiteId },
       }),
@@ -189,9 +196,10 @@ export async function deleteWebsite(websiteId: string) {
         where: { websiteId },
       }),
       client.report.deleteMany({
-      where: {
-        websiteId,
-      },
+        where: { websiteId },
+      }),
+      client.segment.deleteMany({
+        where: { websiteId },
       }),
       cloudMode
         ? client.website.update({
@@ -203,7 +211,11 @@ export async function deleteWebsite(websiteId: string) {
         : client.website.delete({
             where: { id: websiteId },
           }),
-  ]).then(async data => {
+    ],
+    {
+      timeout: 30000,
+    },
+  ).then(async data => {
     if (cloudMode) {
       await redis.client.del(`website:${websiteId}`);
     }