From 07ea5fe84d36230753e6691e05ca6cdb2bbd1bf2 Mon Sep 17 00:00:00 2001 From: "codegen-sh[bot]" <131295404+codegen-sh[bot]@users.noreply.github.com> Date: Sun, 14 Sep 2025 13:49:02 +0000 Subject: [PATCH] Add database migration and server model changes for Star folders - Add parentId and isFolder columns to stars table - Add self-referential relationship for hierarchical structure - Add database constraints to ensure folders don't have content - Add indexes for efficient folder queries - Update server Star model with new fields and relationships - Update Star presenter to include new fields in API responses This enables users to organize their starred items into folders while maintaining backward compatibility with existing stars. API-only changes - no client-side modifications included. --- .../20250914133745-add-star-folders.js | 63 +++++++++++++++++++ server/models/Star.ts | 14 +++++ server/presenters/star.ts | 2 + 3 files changed, 79 insertions(+) create mode 100644 server/migrations/20250914133745-add-star-folders.js diff --git a/server/migrations/20250914133745-add-star-folders.js b/server/migrations/20250914133745-add-star-folders.js new file mode 100644 index 0000000000..140c414a92 --- /dev/null +++ b/server/migrations/20250914133745-add-star-folders.js @@ -0,0 +1,63 @@ +"use strict"; + +module.exports = { + up: async (queryInterface, Sequelize) => { + // Add parentId column for hierarchical structure + await queryInterface.addColumn("stars", "parentId", { + type: Sequelize.UUID, + allowNull: true, + references: { + model: "stars", + key: "id", + }, + onDelete: "CASCADE", + }); + + // Add isFolder column to distinguish folders from regular stars + await queryInterface.addColumn("stars", "isFolder", { + type: Sequelize.BOOLEAN, + allowNull: false, + defaultValue: false, + }); + + // Add index for efficient parent-child queries + await queryInterface.addIndex("stars", ["parentId"], { + name: "stars_parent_id", + }); + + // Add composite index for user-specific folder queries + await queryInterface.addIndex("stars", ["userId", "parentId"], { + name: "stars_user_id_parent_id", + }); + + // Add composite index for filtering folders vs regular stars + await queryInterface.addIndex("stars", ["userId", "isFolder"], { + name: "stars_user_id_is_folder", + }); + + // Add check constraint to ensure folders don't have documentId or collectionId + await queryInterface.sequelize.query(` + ALTER TABLE stars ADD CONSTRAINT stars_folder_content_check + CHECK ( + (isFolder = true AND documentId IS NULL AND collectionId IS NULL) OR + (isFolder = false) + ) + `); + }, + + down: async (queryInterface, Sequelize) => { + // Remove check constraint + await queryInterface.sequelize.query(` + ALTER TABLE stars DROP CONSTRAINT IF EXISTS stars_folder_content_check + `); + + // Remove indexes + await queryInterface.removeIndex("stars", "stars_user_id_is_folder"); + await queryInterface.removeIndex("stars", "stars_user_id_parent_id"); + await queryInterface.removeIndex("stars", "stars_parent_id"); + + // Remove columns + await queryInterface.removeColumn("stars", "isFolder"); + await queryInterface.removeColumn("stars", "parentId"); + }, +}; diff --git a/server/models/Star.ts b/server/models/Star.ts index 2f71eb1bf8..f9188ddd2e 100644 --- a/server/models/Star.ts +++ b/server/models/Star.ts @@ -6,6 +6,7 @@ import { ForeignKey, Table, Length, + HasMany, } from "sequelize-typescript"; import Collection from "./Collection"; import Document from "./Document"; @@ -26,6 +27,9 @@ class Star extends IdModel< @Column index: string | null; + @Column(DataType.BOOLEAN) + isFolder: boolean; + // associations @BelongsTo(() => User, "userId") @@ -48,6 +52,16 @@ class Star extends IdModel< @ForeignKey(() => Collection) @Column(DataType.UUID) collectionId: string | null; + + @BelongsTo(() => Star, "parentId") + parent: Star | null; + + @ForeignKey(() => Star) + @Column(DataType.UUID) + parentId: string | null; + + @HasMany(() => Star, "parentId") + children: Star[]; } export default Star; diff --git a/server/presenters/star.ts b/server/presenters/star.ts index c8bedb8eb3..c95a64d27a 100644 --- a/server/presenters/star.ts +++ b/server/presenters/star.ts @@ -5,6 +5,8 @@ export default function presentStar(star: Star) { id: star.id, documentId: star.documentId, collectionId: star.collectionId, + parentId: star.parentId, + isFolder: star.isFolder, index: star.index, createdAt: star.createdAt, updatedAt: star.updatedAt,