feat: used new pubsub method and resolve conflicts

2023-01-23 15:11:52 +06:00
parent 08ac9680d7 469d408b09
commit bf09786423
17 changed files with 1379 additions and 24 deletions
--- a/packages/hoppscotch-backend/prisma/schema.prisma
+++ b/packages/hoppscotch-backend/prisma/schema.prisma
@@ -79,11 +79,12 @@ model TeamEnvironment {
 }

 model User {
-  uid         String        @id @default(cuid())
-  displayName String?
-  email       String?
-  photoURL    String?
-  settings    UserSettings?
+  uid              String            @id @default(cuid())
+  displayName      String?
+  email            String?
+  photoURL         String?
+  settings         UserSettings?
+  UserEnvironments UserEnvironment[]
 }

 model UserSettings {
@@ -94,6 +95,15 @@ model UserSettings {
  updatedOn DateTime @updatedAt @db.Timestamp(3)
 }

+model UserEnvironment {
+  id        String  @id @default(cuid())
+  userUid   String
+  user      User    @relation(fields: [userUid], references: [uid], onDelete: Cascade)
+  name      String?
+  variables Json
+  isGlobal  Boolean
+}
+
 enum TeamMemberRole {
  OWNER
  VIEWER