From ee33337a3f070279145f390a048d933df73c3090 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 24 May 2024 08:58:12 +0900
Subject: [PATCH] chore: distinguish between database columns and relations

---
 .../src/models/entities/sw-subscription.ts    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/models/entities/sw-subscription.ts b/packages/backend/src/models/entities/sw-subscription.ts
index 44c0eb6ce3..41cdcd8cad 100644
--- a/packages/backend/src/models/entities/sw-subscription.ts
+++ b/packages/backend/src/models/entities/sw-subscription.ts
@@ -43,13 +43,6 @@ export class SwSubscription {
 	})
 	public sendReadMessage: boolean;
 
-	//#region Relations
-	@ManyToOne(() => User, {
-		onDelete: "CASCADE",
-	})
-	@JoinColumn()
-	public user: Relation<User>;
-
 	/**
 	 * Type of subscription, used for Mastodon API notifications.
 	 * Empty for Misskey notifications.
@@ -71,10 +64,18 @@ export class SwSubscription {
 	})
 	public appAccessTokenId: AccessToken["id"] | null;
 
-	@ManyToOne((type) => AccessToken, {
+	//#region Relations
+	@ManyToOne(() => User, {
 		onDelete: "CASCADE",
 	})
 	@JoinColumn()
-	public appAccessToken: AccessToken | null;
+	public user: Relation<User>;
+
+	@ManyToOne(() => AccessToken, {
+		onDelete: "CASCADE",
+		nullable: true,
+	})
+	@JoinColumn()
+	public appAccessToken: Relation<AccessToken | null>;
 	//#endregion
 }