Merge remote-tracking branch 'origin/main' into feat/user-history

# Conflicts: # packages/hoppscotch-backend/prisma/schema.prisma
2023-01-24 13:04:19 +05:30
parent e78040a376 161f1db40e
commit 7d98c1b355
11 changed files with 412 additions and 6 deletions
--- a/packages/hoppscotch-backend/prisma/schema.prisma
+++ b/packages/hoppscotch-backend/prisma/schema.prisma
@@ -79,14 +79,24 @@ model TeamEnvironment {
 }

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

+model UserSettings {
+  id         String   @id @default(cuid())
+  userUid    String   @unique
+  user       User     @relation(fields: [userUid], references: [uid], onDelete: Cascade)
+  properties Json
+  updatedOn  DateTime @updatedAt @db.Timestamp(3)
+}
+
 model UserHistory {
  id               String   @id @default(cuid())
  userUid          String