From aa8d2897e27fd5745bfc84fcd19ddc648015dc04 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 16 Jan 2026 16:48:30 +0000 Subject: [PATCH] Revert incorrect InstalledPackage field additions per PR review - Remove id field: InstalledPackage uses packageId as @id primary key - Remove updatedAt field: Not defined in Prisma schema - Revert tenantId back to null: 'default' tenant may not exist - Schema defines: packageId @id, tenantId?, installedAt, version, enabled, config? Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com> --- .../src/core/entities/operations/system/package/index.ts | 2 -- .../src/core/entities/package/crud/create-package.ts | 2 -- .../db/database-admin/seed-default-data/users/seed-users.ts | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dbal/development/src/core/entities/operations/system/package/index.ts b/dbal/development/src/core/entities/operations/system/package/index.ts index 8a3047712..afcf0d9e0 100644 --- a/dbal/development/src/core/entities/operations/system/package/index.ts +++ b/dbal/development/src/core/entities/operations/system/package/index.ts @@ -56,11 +56,9 @@ const assertValidId = (id: string) => { const withInstalledPackageDefaults = (data: CreatePackageInput): InstalledPackage => { const installedAt = data.installedAt ?? BigInt(Date.now()) return { - id: data.packageId, // Use packageId as id packageId: data.packageId, tenantId: data.tenantId ?? null, installedAt, - updatedAt: installedAt, // Set updatedAt to installedAt initially version: data.version, enabled: data.enabled, config: data.config ?? null, diff --git a/dbal/development/src/core/entities/package/crud/create-package.ts b/dbal/development/src/core/entities/package/crud/create-package.ts index 20f159892..646cfd0e3 100644 --- a/dbal/development/src/core/entities/package/crud/create-package.ts +++ b/dbal/development/src/core/entities/package/crud/create-package.ts @@ -15,11 +15,9 @@ export const createPackage = async ( ): Promise> => { const installedAt = input.installedAt ?? BigInt(Date.now()) const payload: InstalledPackage = { - id: input.packageId, // Use packageId as id packageId: input.packageId, tenantId: input.tenantId ?? null, installedAt, - updatedAt: installedAt, // Set updatedAt to installedAt initially version: input.version, enabled: input.enabled, config: input.config ?? null diff --git a/frontends/nextjs/src/lib/db/database-admin/seed-default-data/users/seed-users.ts b/frontends/nextjs/src/lib/db/database-admin/seed-default-data/users/seed-users.ts index 409929d0c..ffe1886ba 100644 --- a/frontends/nextjs/src/lib/db/database-admin/seed-default-data/users/seed-users.ts +++ b/frontends/nextjs/src/lib/db/database-admin/seed-default-data/users/seed-users.ts @@ -47,7 +47,6 @@ const DEFAULT_USERS = [ export async function seedUsers(): Promise { const adapter = getAdapter() const now = BigInt(Date.now()) - const DEFAULT_TENANT = 'default' // Use 'default' as system tenant for seed data for (const userData of DEFAULT_USERS) { // Check if user already exists @@ -60,7 +59,7 @@ export async function seedUsers(): Promise { continue } - // Create user with default tenant + // Create user await adapter.create('User', { id: userData.id, username: userData.username, @@ -68,7 +67,7 @@ export async function seedUsers(): Promise { role: userData.role, isInstanceOwner: userData.isInstanceOwner, createdAt: now, - tenantId: DEFAULT_TENANT, // Use default tenant instead of null + tenantId: null, profilePicture: null, bio: null, })