From ba7fa4393a47b1ece183ba721f2e1db21dc42f24 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 19 May 2024 19:50:53 +0900
Subject: [PATCH] chore (backend): ScheduledNoteCreation -> ScheduledNote
---
docs/downgrade.sql | 6 +++---
packages/backend/src/db/postgre.ts | 4 ++--
...ts => 1714728200194-create-scheduled-note.ts} | 16 ++++++++--------
...eduled-note-creation.ts => scheduled-note.ts} | 4 ++--
packages/backend/src/models/index.ts | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
rename packages/backend/src/migration/{1714728200194-create-scheduled-note-creation.ts => 1714728200194-create-scheduled-note.ts} (61%)
rename packages/backend/src/models/entities/{scheduled-note-creation.ts => scheduled-note.ts} (85%)
diff --git a/docs/downgrade.sql b/docs/downgrade.sql
index 74cfa34e4f..94e2660a15 100644
--- a/docs/downgrade.sql
+++ b/docs/downgrade.sql
@@ -1,7 +1,7 @@
BEGIN;
DELETE FROM "migrations" WHERE name IN (
- 'CreateScheduledNoteCreation1714728200194',
+ 'CreateScheduledNote1714728200194',
'AddBackTimezone1715351290096',
'UserprofileJsonbToArray1714270605574',
'DropUnusedUserprofileColumns1714259023878',
@@ -32,8 +32,8 @@ DELETE FROM "migrations" WHERE name IN (
'RemoveNativeUtilsMigration1705877093218'
);
--- create-scheduled-note-creation
-DROP TABLE "scheduled_note_creation";
+-- create-scheduled-note
+DROP TABLE "scheduled_note";
-- userprofile-jsonb-to-array
ALTER TABLE "user_profile" RENAME COLUMN "mutedInstances" TO "mutedInstances_old";
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index 96059f9567..62bd2f9a1c 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -74,10 +74,10 @@ import { Webhook } from "@/models/entities/webhook.js";
import { UserIp } from "@/models/entities/user-ip.js";
import { NoteEdit } from "@/models/entities/note-edit.js";
import { NoteFile } from "@/models/entities/note-file.js";
+import { ScheduledNote } from "@/models/entities/scheduled-note.js";
import { entities as charts } from "@/services/chart/entities.js";
import { dbLogger } from "./logger.js";
-import { ScheduledNoteCreation } from "@/models/entities/scheduled-note-creation.js";
const sqlLogger = dbLogger.createSubLogger("sql", "gray", false);
@@ -183,7 +183,7 @@ export const entities = [
UserPending,
Webhook,
UserIp,
- ScheduledNoteCreation,
+ ScheduledNote,
...charts,
];
diff --git a/packages/backend/src/migration/1714728200194-create-scheduled-note-creation.ts b/packages/backend/src/migration/1714728200194-create-scheduled-note.ts
similarity index 61%
rename from packages/backend/src/migration/1714728200194-create-scheduled-note-creation.ts
rename to packages/backend/src/migration/1714728200194-create-scheduled-note.ts
index d6884f5f0e..11cbcf6726 100644
--- a/packages/backend/src/migration/1714728200194-create-scheduled-note-creation.ts
+++ b/packages/backend/src/migration/1714728200194-create-scheduled-note.ts
@@ -1,11 +1,11 @@
import type { MigrationInterface, QueryRunner } from "typeorm";
-export class CreateScheduledNoteCreation1714728200194
+export class CreateScheduledNote1714728200194
implements MigrationInterface
{
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
- `CREATE TABLE "scheduled_note_creation" (
+ `CREATE TABLE "scheduled_note" (
"id" character varying(32) NOT NULL PRIMARY KEY,
"noteId" character varying(32) NOT NULL,
"userId" character varying(32) NOT NULL,
@@ -13,22 +13,22 @@ export class CreateScheduledNoteCreation1714728200194
)`,
);
await queryRunner.query(`
- COMMENT ON COLUMN "scheduled_note_creation"."noteId" IS 'The ID of note scheduled.'
+ COMMENT ON COLUMN "scheduled_note"."noteId" IS 'The ID of the temporarily created note that corresponds to the schedule.'
`);
await queryRunner.query(`
- CREATE INDEX "IDX_noteId_ScheduledNoteCreation" ON "scheduled_note_creation" ("noteId")
+ CREATE INDEX "IDX_noteId_ScheduledNote" ON "scheduled_note" ("noteId")
`);
await queryRunner.query(`
- CREATE INDEX "IDX_userId_ScheduledNoteCreation" ON "scheduled_note_creation" ("userId")
+ CREATE INDEX "IDX_userId_ScheduledNote" ON "scheduled_note" ("userId")
`);
await queryRunner.query(`
- ALTER TABLE "scheduled_note_creation"
+ ALTER TABLE "scheduled_note"
ADD FOREIGN KEY ("noteId") REFERENCES "note"("id")
ON DELETE CASCADE
ON UPDATE NO ACTION
`);
await queryRunner.query(`
- ALTER TABLE "scheduled_note_creation"
+ ALTER TABLE "scheduled_note"
ADD FOREIGN KEY ("userId") REFERENCES "user"("id")
ON DELETE CASCADE
ON UPDATE NO ACTION
@@ -36,6 +36,6 @@ export class CreateScheduledNoteCreation1714728200194
}
public async down(queryRunner: QueryRunner): Promise<void> {
- await queryRunner.query(`DROP TABLE "scheduled_note_creation"`);
+ await queryRunner.query(`DROP TABLE "scheduled_note"`);
}
}
diff --git a/packages/backend/src/models/entities/scheduled-note-creation.ts b/packages/backend/src/models/entities/scheduled-note.ts
similarity index 85%
rename from packages/backend/src/models/entities/scheduled-note-creation.ts
rename to packages/backend/src/models/entities/scheduled-note.ts
index ae2cfbdfac..27d5ad98e7 100644
--- a/packages/backend/src/models/entities/scheduled-note-creation.ts
+++ b/packages/backend/src/models/entities/scheduled-note.ts
@@ -13,14 +13,14 @@ import { id } from "../id.js";
import { User } from "./user.js";
@Entity()
-export class ScheduledNoteCreation {
+export class ScheduledNote {
@PrimaryColumn(id())
public id: string;
@Index()
@Column({
...id(),
- comment: "The ID of note scheduled.",
+ comment: "The ID of the temporarily created note that corresponds to the schedule.",
})
public noteId: Note["id"];
diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts
index adf73e0571..d6b81ad70e 100644
--- a/packages/backend/src/models/index.ts
+++ b/packages/backend/src/models/index.ts
@@ -67,7 +67,7 @@ import { Webhook } from "./entities/webhook.js";
import { UserIp } from "./entities/user-ip.js";
import { NoteFileRepository } from "./repositories/note-file.js";
import { NoteEditRepository } from "./repositories/note-edit.js";
-import { ScheduledNoteCreation } from "./entities/scheduled-note-creation.js";
+import { ScheduledNote } from "./entities/scheduled-note.js";
export const Announcements = db.getRepository(Announcement);
export const AnnouncementReads = db.getRepository(AnnouncementRead);
@@ -136,4 +136,4 @@ export const RegistryItems = db.getRepository(RegistryItem);
export const Webhooks = db.getRepository(Webhook);
export const Ads = db.getRepository(Ad);
export const PasswordResetRequests = db.getRepository(PasswordResetRequest);
-export const ScheduledNoteCreations = db.getRepository(ScheduledNoteCreation);
+export const ScheduledNotes = db.getRepository(ScheduledNote);