Merge branch 'main' into bugfix/add-missing-common-module-import-in-rule-settings-dialog

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added the endpoints (`DELETE`, `GET` and `POST`) for the watchlist
 
+### Changed
+
+- Renamed `User` to `user` in the `Subscription` database schema
+
 ### Fixed
 
 - Fixed an issue in the settings dialog to customize the rule thresholds of the _X-ray_ page (experimental)

apps/api/src/app/subscription/subscription.service.ts

@@ -122,7 +122,7 @@ export class SubscriptionService {
       data: {
         expiresAt,
         price,
-        User: {
+        user: {
           connect: {
             id: userId
           }

prisma/schema.prisma

@@ -226,8 +226,8 @@ model Subscription {
   id        String   @id @default(uuid())
   price     Float?
   updatedAt DateTime @updatedAt
+  user      User     @relation(fields: [userId], onDelete: Cascade, references: [id])
   userId    String
-  User      User     @relation(fields: [userId], onDelete: Cascade, references: [id])
 
   @@index([userId])
 }