Merge pull request #10 from VB-Inc/fix_mongodbconnector-prisma-schema

VB-Inc · Jun 5, 2022 · cbed2f1 · cbed2f1
2 parents addd212 + dac6516
commit cbed2f1
Show file tree

Hide file tree

Showing 8 changed files with 834 additions and 1,086 deletions.
diff --git a/package.json b/package.json
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@prisma/client": "^3.8.0",
+    "@prisma/client": "^3.14.0",
     "@slack/bolt": "^3.8.1",
     "dotenv": "^10.0.0",
     "serverless": "^2.69.1"
   },
   "devDependencies": {
     "nodemon": "^2.0.15",
-    "prisma": "^3.8.0",
+    "prisma": "^3.14.0",
     "serverless-offline": "^8.3.1",
     "typescript": "^4.5.4"
   }
-}
+}
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -16,17 +16,17 @@ model List {
 }
 
 model User {
-  id String @id @map("_id") @db.ObjectId
+  id String @id @map("_id")
   List        List?         @relation(fields: [listId], references: [id])
-  listId      Int?
+  listId      String?
   RotationLog RotationLog[]
 }
 
 model Rotation {
   id String @id @default(auto()) @map("_id") @db.ObjectId
   name        String
   list        List          @relation(fields: [listId], references: [id])
-  listId      Int
+  listId      String
   RotationLog RotationLog[]
 }
 
@@ -36,5 +36,5 @@ model RotationLog {
   user       User     @relation(fields: [userId], references: [id])
   rotation   Rotation @relation(fields: [rotationId], references: [id])
   userId     String
-  rotationId Int
+  rotationId String
 }
diff --git a/src/app.ts b/src/app.ts
@@ -19,13 +19,13 @@ app.command('/pickup', addRotationLog, createList, createRotation, async ({ comm
     if (isCommandUsingList(command.text)) {
         // add list usage logic
         const { value, text } = getOptionFromText(command.text, 'list');
-        const members = await getListMembers(Number(value));
+        const members = await getListMembers(value);
         usersIds = members;
         command.text = text;
     } else if (isCommandWithRotation) {
         // add rotation usage logic
         const { value, text } = getOptionFromText(command.text, 'rotation');
-        const members = await getRotationMembers(Number(value));
+        const members = await getRotationMembers(value);
         usersIds = members;
         command.text = text;
     }

diff --git a/src/list/list.ts b/src/list/list.ts
@@ -80,7 +80,7 @@ const createList: Middleware<SlackCommandMiddlewareArgs> = async ({ command, say
     await say(`List - '${list.id}' created. Use this list anytime for picking up a random member`);
 }
 
-const getListMembers = async (listId: number) => {
+const getListMembers = async (listId: string) => {
     await database.$connect();
 
     const members = await database.list.findFirst({

diff --git a/src/rotation/index.ts b/src/rotation/index.ts
@@ -11,7 +11,7 @@ const createRotation: Middleware<SlackCommandMiddlewareArgs> = async ({ command,
 
     const text = command.text.replace(createRotationRegex, '').trim();
     const { value, text: updatedText } = getOptionFromText(text, 'list');
-    const list = await database.list.findFirst({ where: { id: Number(value) } });
+    const list = await database.list.findFirst({ where: { id: value } });
 
     if (!list) {
         return ack('Please enter valid list id for this rotation command');

diff --git a/src/rotation/utilities.ts b/src/rotation/utilities.ts
@@ -9,7 +9,7 @@ const isCommandUsingRotation = (command: string) => {
     }
 }
 
-const getRotationMembers = async (rotationId: number) => {
+const getRotationMembers = async (rotationId: string) => {
     await database.$connect();
 
     const members = await database.rotation.findFirst({
@@ -22,7 +22,7 @@ const getRotationMembers = async (rotationId: number) => {
     return members.map(member => member.id);
 }
 
-const getUserFromRotation = async (users: any[], usersCount: number = 0): Promise<Array<any>> => {
+const getUserFromRotation = async (users: any[], usersCount: number = 1): Promise<Array<any>> => {
     await database.$connect();
 
     const usersInRotationLogs = await database.rotationLog.findMany({
@@ -38,7 +38,7 @@ const getUserFromRotation = async (users: any[], usersCount: number = 0): Promis
 
     const usersWithCount = users.map(user => ({ user, count: usersInRotationLogs.filter(userInRotiationLog => userInRotiationLog.user.id === user.id).length }))
     usersWithCount.sort((a, b) => a.count - b.count);
-    return usersWithCount.slice(0, usersCount + 1).map(userWithCount => userWithCount.user);
+    return usersWithCount.slice(0, usersCount).map(userWithCount => userWithCount.user);
 }
 
 

diff --git a/src/rotationLog/index.ts b/src/rotationLog/index.ts
@@ -11,7 +11,7 @@ const addRotationLog = async ({ command, ack, next, client }: any) => {
 
     const text = command.text.replace(addRotationLogRegex, '').trim();
     let { value: rotationId, text: updatedText } = getOptionFromText(text, 'rotation');
-    const rotation = await database.rotation.findFirst({ where: { id: Number(rotationId) } });
+    const rotation = await database.rotation.findFirst({ where: { id: rotationId } });
 
     if (!rotation) {
         return ack('Please enter valid rotation id for this rotation command');
@@ -32,7 +32,7 @@ const addRotationLog = async ({ command, ack, next, client }: any) => {
     await database.rotationLog.create({
         data: {
             date: new Date(),
-            rotationId: Number(rotationId),
+            rotationId: rotationId,
             userId
         }
     })