Merge pull request #134 from HackRU/dev

Dev

Author: avsomers25

.eslintrc

@@ -113,37 +113,23 @@
       },
       {
         "selector": [
-          "classProperty",
-          "objectLiteralProperty",
           "typeProperty",
-          "classMethod",
-          "objectLiteralMethod",
-          "typeMethod",
-          "accessor",
-          "enumMember"
+          "objectLiteralProperty"
         ],
         "format": [
           "camelCase",
           "snake_case",
           "UPPER_CASE",
           "PascalCase"
-        ]
+        ],
+        "leadingUnderscore": "allow"
       },
       {
-        "selector": [
-          "classProperty",
-          "objectLiteralProperty",
-          "typeProperty",
-          "classMethod",
-          "objectLiteralMethod",
-          "typeMethod",
-          "accessor",
-          "enumMember"
-        ],
-        "format": null,
+        "selector": "objectLiteralProperty",
         "modifiers": [
           "requiresQuotes"
-        ]
+        ],
+        "format": null
       },
       {
         "selector": "objectLiteralProperty",

package-lock.json

@@ -4,7 +4,10 @@
   "description": "Backend system for HackRU.",
   "main": "serverless.ts",
   "scripts": {
-    "test": "jest --watch"
+    "test": "jest --watch",
+    "tests": "npx jest tests/ --config=tests/jest.config.ts",
+    "eslint": "npx eslint --fix .",
+    "prettier": "npx prettier --write ."
   },
   "engines": {
     "node": ">=14.15.0"
@@ -47,7 +50,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "json-schema-to-ts": "^1.5.0",
-    "prettier": "3.3.2",
+    "prettier": "^3.6.2",
     "serverless": "^3.39.0",
     "serverless-esbuild": "^1.23.3",
     "serverless-offline": "^13.6.0",
@@ -59,4 +62,4 @@
   },
   "author": "HackRU",
   "license": "MIT"
-}
+}

package.json

@@ -9,6 +9,7 @@ import discord from '@functions/discord';
 import read from '@functions/read';
 import waiver from '@functions/waiver';
 import resume from '@functions/resume';
+import teamsInvite from '@functions/teams/invite';
 import resetPassword from '@functions/reset-password';
 import forgotPassword from '@functions/forgot-password';
 import leaderboard from '@functions/leaderboard';
@@ -20,6 +21,12 @@ import verifyEmail from '@functions/verify-email';
 import deleteUser from '@functions/delete';
 import userExists from '@functions/user-exists';
 import interestForm from '@functions/interest-form';
+import teamsCreate from '@functions/teams/create';
+import memberRemoval from '@functions/teams/member-removal';
+import declineInvitation from '@functions/teams/decline-invite';
+import teamsJoin from '@functions/teams/join';
+import teamsRead from '@functions/teams/read';
+import disband from '@functions/teams/disband';
 
 import * as path from 'path';
 import * as dotenv from 'dotenv';
@@ -53,6 +60,7 @@ const serverlessConfiguration: AWS = {
     attendEvent,
     waiver,
     resume,
+    teamsInvite,
     read,
     discord,
     forgotPassword,
@@ -66,6 +74,12 @@ const serverlessConfiguration: AWS = {
     deleteUser,
     userExists,
     interestForm,
+    teamsCreate,
+    memberRemoval,
+    declineInvitation,
+    teamsJoin,
+    teamsRead,
+    disband,
   },
   package: { individually: true, patterns: ['!.env*', '.env.vault'] },
   custom: {

serverless.ts

@@ -4,7 +4,8 @@ import { middyfy } from '@libs/lambda';
 
 import schema from './schema';
 
-import { MongoDB, validateToken, ensureRoles, UserDoc } from '../../util';
+import { MongoDB, validateToken, ensureRoles } from '../../util';
+import type { UserDocument } from 'src/types';
 import * as path from 'path';
 import * as dotenv from 'dotenv';
 dotenv.config({ path: path.resolve(process.cwd(), '.env') });
@@ -26,7 +27,7 @@ const attendEvent: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (ev
     // Connect to MongoDB
     const db = MongoDB.getInstance(process.env.MONGO_URI);
     await db.connect();
-    const users = db.getCollection<UserDoc>('users');
+    const users = db.getCollection<UserDocument>('users');
 
     const attendEvent = await users.findOne({ email: event.body.qr });
 

src/functions/attend-event/handler.ts

@@ -1,7 +1,10 @@
 import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/api-gateway';
 import { middyfy } from '@libs/lambda';
 import schema from './schema';
-import { MongoDB, validateToken, ensureRoles, UserDoc } from '../../util';
+
+import { MongoDB, validateToken, ensureRoles } from '../../util';
+import type { UserDocument } from 'src/types';
+
 import * as path from 'path';
 import * as dotenv from 'dotenv';
 
@@ -24,7 +27,7 @@ const deleteUser: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (eve
     // 2. Connect to MongoDB
     const db = MongoDB.getInstance(process.env.MONGO_URI);
     await db.connect();
-    const users = db.getCollection<UserDoc>('users');
+    const users = db.getCollection<UserDocument>('users');
 
     // 3. Check target user exists
     const target = await users.findOne({ email: user_email });

src/functions/delete/handler.ts

@@ -7,6 +7,7 @@ export { default as discord } from './discord';
 export { default as read } from './read';
 export { default as waiver } from './waiver';
 export { default as resume } from './resume';
+export { default as teamsInvite } from './teams/invite';
 export { default as resetPassword } from './reset-password';
 export { default as forgotPassword } from './forgot-password';
 export { default as leaderboard } from './leaderboard';
@@ -18,3 +19,9 @@ export { default as verifyEmail } from './verify-email';
 export { default as delete } from './delete';
 export { default as userExists } from './user-exists';
 export { default as interestForm } from './interest-form';
+export { default as teamsCreate } from './teams/create';
+export { default as teamsMemberRemoval } from './teams/member-removal';
+export { default as declineInvitation } from './teams/decline-invite';
+export { default as teamsJoin } from './teams/join';
+export { default as teamsRead } from './teams/read';
+export { default as teamsDisband } from './teams/disband';