add npm script for scripts, fix script, fix deleted user redirect

Author: timmyichen

package.json

@@ -18,7 +18,8 @@
     "precommit": "lint-staged",
     "jest:setup": "node ./server/tests/setup.js",
     "jest": "NODE_ENV=test npm run jest:setup && ./node_modules/.bin/jest --detectOpenHandles",
-    "jest:watch": "NODE_ENV=test npm run jest:setup && ./node_modules/.bin/jest --watch"
+    "jest:watch": "NODE_ENV=test npm run jest:setup && ./node_modules/.bin/jest --watch",
+    "script": "NODE_ENV=production ts-node --files --transpile-only"
   },
   "author": "",
   "license": "ISC",

server/index.ts

@@ -55,11 +55,12 @@ nextjs.nextApp.prepare().then(async () => {
   app.use(
     (
       err: Error,
-      _: express.Request,
+      req: express.Request,
       res: express.Response,
       next: express.NextFunction,
     ) => {
       if (err) {
+        req.logout();
         return res.redirect('/');
       }
 

server/scripts/deleteExpiredEventsAndUsers.ts

@@ -1,3 +1,7 @@
+import 'module-alias/register';
+import * as dotenv from 'dotenv';
+dotenv.config();
+
 import initDB from 'server/lib/db';
 import { Event, User } from 'server/models';
 
@@ -14,17 +18,17 @@ async function deleteExpiredEventsAndUsers() {
 
   const eventIds = expiredEvents.map(e => e._id);
 
-  await User.updateMany(
+  const updatedUsers = await User.updateMany(
     {},
     {
-      events: {
-        $pullAll: { _id: eventIds },
+      $pull: {
+        events: { eventId: { $in: eventIds } },
       },
     },
     { session },
   );
 
-  await User.deleteMany(
+  const deletedUsers = await User.deleteMany(
     {
       events: {
         $size: 0,
@@ -36,9 +40,9 @@ async function deleteExpiredEventsAndUsers() {
     { session },
   );
 
-  await Event.deleteMany(
+  const deletedEvents = await Event.deleteMany(
     {
-      endsAt: { $gte: oneWeekAgo },
+      endsAt: { $lte: oneWeekAgo },
     },
     // same as above
     // @ts-ignore
@@ -48,6 +52,13 @@ async function deleteExpiredEventsAndUsers() {
   await session.commitTransaction();
 
   console.log(`success deleteExpiredEventsAndUsers since ${oneWeekAgo}`);
+  console.log(
+    [
+      `updated users: ${updatedUsers.nModified - deletedUsers.deletedCount}`,
+      `deleted users: ${deletedUsers.deletedCount}`,
+      `deleted events: ${deletedEvents.deletedCount}`,
+    ].join('\n'),
+  );
 }
 
 deleteExpiredEventsAndUsers().then(() => process.exit(0));