Merge branch 'dev' into tags-in-public-collection

prisma/schema.prisma

@@ -27,7 +27,7 @@ model Account {
 
 model User {
   id                      Int                   @id @default(autoincrement())
-  name                    String
+  name                    String?
   username                String?               @unique
   email                   String?               @unique
   emailVerified           DateTime?
@@ -35,10 +35,14 @@ model User {
   image                   String?
   password                String?
   locale                  String                @default("en")
+  parentSubscription      Subscription?         @relation("ChildUsers", fields: [parentSubscriptionId], references: [id])
+  parentSubscriptionId    Int?
   accounts                Account[]
   collections             Collection[]
   tags                    Tag[]
-  pinnedLinks             Link[]
+  pinnedLinks             Link[]                @relation("PinnedLinks")
+  createdLinks            Link[]                @relation("CreatedLinks")
+  createdCollections      Collection[]          @relation("CreatedCollections")
   collectionsJoined       UsersAndCollections[]
   collectionOrder         Int[]                 @default([])
   whitelistedUsers        WhitelistedUser[]
@@ -105,6 +109,8 @@ model Collection {
   owner           User                  @relation(fields: [ownerId], references: [id])
   ownerId         Int
   members         UsersAndCollections[]
+  createdBy       User?                 @relation("CreatedCollections", fields: [createdById], references: [id])
+  createdById     Int?
   links           Link[]
   createdAt       DateTime              @default(now())
   updatedAt       DateTime              @default(now()) @updatedAt
@@ -132,7 +138,9 @@ model Link {
   name          String     @default("")
   type          String     @default("url")
   description   String     @default("")
-  pinnedBy      User[]
+  pinnedBy      User[]     @relation("PinnedLinks")
+  createdBy     User?      @relation("CreatedLinks", fields: [createdById], references: [id])
+  createdById   Int?
   collection    Collection @relation(fields: [collectionId], references: [id])
   collectionId  Int
   tags          Tag[]
@@ -171,8 +179,10 @@ model Subscription {
   stripeSubscriptionId String   @unique
   currentPeriodStart   DateTime
   currentPeriodEnd     DateTime
+  quantity             Int      @default(1)
   user                 User     @relation(fields: [userId], references: [id])
   userId               Int      @unique
+  childUsers           User[]   @relation("ChildUsers")
   createdAt            DateTime @default(now())
   updatedAt            DateTime @default(now()) @updatedAt
 }