Merge pull request #74 from GeneralMagicio/sync-prisma-with-DB

sync Prisma schema with DB

Author: RamRamez

package.json

@@ -13,8 +13,9 @@
     "start:dev": "nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
-    "migration:local": "npx prisma migrate dev --create-only",
+    "migration:generate": "npx prisma migrate dev --create-only",
     "migration:prod": "npx prisma migrate deploy",
+    "db:pull": "npx prisma db pull",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -87,4 +88,4 @@
     "testEnvironment": "node"
   },
   "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
-}
+}

prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (e.g., Git)
-provider = "postgresql"
+provider = "postgresql"

prisma/schema.prisma

@@ -1,9 +1,3 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
-// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
-// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
-
 generator client {
   provider = "prisma-client-js"
 }
@@ -21,37 +15,38 @@ model User {
   pollsCreatedCount      Int          @default(0)
   pollsParticipatedCount Int          @default(0)
   createdPolls           Poll[]       @relation("PollAuthor")
-  votes                  Vote[]
   actions                UserAction[]
+  votes                  Vote[]
 }
 
 model UserAction {
   id        Int        @id @default(autoincrement())
   userId    Int
   pollId    Int
   type      ActionType
-  user      User       @relation(fields: [userId], references: [id])
-  poll      Poll       @relation(fields: [pollId], references: [pollId], onDelete: Cascade)
   createdAt DateTime   @default(now())
   updatedAt DateTime   @default(now()) @updatedAt
+  poll      Poll       @relation(fields: [pollId], references: [pollId], onDelete: Cascade)
+  user      User       @relation(fields: [userId], references: [id])
 }
 
 model Poll {
-  pollId           Int          @id @default(autoincrement())
+  pollId           Int                      @id @default(autoincrement())
   authorUserId     Int
   title            String
   description      String?
   options          String[]
-  creationDate     DateTime     @default(now())
+  creationDate     DateTime                 @default(now())
   startDate        DateTime
   endDate          DateTime
   tags             String[]
-  isAnonymous      Boolean      @default(false)
-  participantCount Int          @default(0)
+  isAnonymous      Boolean                  @default(false)
+  participantCount Int                      @default(0)
   voteResults      Json
-  author           User         @relation("PollAuthor", fields: [authorUserId], references: [id])
-  votes            Vote[]
+  searchVector     Unsupported("tsvector")?
+  author           User                     @relation("PollAuthor", fields: [authorUserId], references: [id])
   userAction       UserAction[]
+  votes            Vote[]
 }
 
 model Vote {
@@ -60,10 +55,10 @@ model Vote {
   pollId             Int
   votingPower        Int
   weightDistribution Json
-  quadraticWeights   Json? // DO NOT INSERT INTO THIS, THIS IS A GENERATED COLUMN
   proof              String
-  user               User   @relation(fields: [userId], references: [id])
+  quadraticWeights   Json?  @default(dbgenerated("calculate_quadratic_weights(\"weightDistribution\")"))
   poll               Poll   @relation(fields: [pollId], references: [pollId], onDelete: Cascade)
+  user               User   @relation(fields: [userId], references: [id])
 }
 
 enum ActionType {