diff --git a/src/lib/workflow/actionExecutor.ts b/src/lib/workflow/actionExecutor.ts index 1801071..dddf90c 100644 --- a/src/lib/workflow/actionExecutor.ts +++ b/src/lib/workflow/actionExecutor.ts @@ -65,7 +65,7 @@ async function immichFetch(path: string, method: string, body: any, user: IUser) return null; } -async function resolveTemplate(template: string, assetIds: string[]): Promise { +async function resolveTemplate(template: string, assetIds: string[], ownerId: string): Promise { if (!template || assetIds.length === 0) return template; let result = template; @@ -112,7 +112,10 @@ async function resolveTemplate(template: string, assetIds: string[]): Promise API_BATCH_SIZE) { await immichFetchBatched(`/albums/${album.id}/assets`, "PUT", assetIds.slice(API_BATCH_SIZE), {}, user); diff --git a/src/lib/workflow/conditionBuilder.ts b/src/lib/workflow/conditionBuilder.ts index b52f1a1..bd31dfc 100644 --- a/src/lib/workflow/conditionBuilder.ts +++ b/src/lib/workflow/conditionBuilder.ts @@ -13,14 +13,14 @@ export function buildConditions(conditions: ICondition[], ownerId: string): SQL[ ]; for (const c of conditions) { - const clause = buildSingleCondition(c); + const clause = buildSingleCondition(c, ownerId); if (clause) clauses.push(clause); } return clauses; } -function buildSingleCondition(c: ICondition): SQL | undefined { +function buildSingleCondition(c: ICondition, ownerId: string): SQL | undefined { switch (c.type) { case "city": return c.match === "not_equals" @@ -171,7 +171,7 @@ function buildSingleCondition(c: ICondition): SQL | undefined { if (c.match === "not_contains") { // Asset must not contain ANY of these people const checks = ids.map((pid: string) => - sql`NOT EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personId" = ${pid})` + sql`NOT EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personGroupId" = ${pid})` ); return and(...checks)!; } @@ -179,14 +179,14 @@ function buildSingleCondition(c: ICondition): SQL | undefined { if (c.match === "contains_all") { // Asset must contain ALL of these people const checks = ids.map((pid: string) => - sql`EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personId" = ${pid})` + sql`EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personGroupId" = ${pid})` ); return and(...checks)!; } // contains_any (default) — asset contains at least one of these people const idList = ids.map((id: string) => `'${id}'`).join(","); - return sql`EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personId" IN (${sql.raw(idList)}))`; + return sql`EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personGroupId" IN (${sql.raw(idList)}))`; } case "tag": { @@ -221,9 +221,9 @@ function buildSingleCondition(c: ICondition): SQL | undefined { case "person_unnamed": if (c.match === "no_unnamed") { - return sql`NOT EXISTS (SELECT 1 FROM "asset_face" af JOIN "person" p ON af."personId" = p.id WHERE af."assetId" = ${assets.id} AND (p.name = '' OR p.name IS NULL))`; + return sql`NOT EXISTS (SELECT 1 FROM "asset_face" af JOIN "person" p ON af."personGroupId" = p."personGroupId" AND p."ownerId" = ${ownerId} WHERE af."assetId" = ${assets.id} AND (p.name = '' OR p.name IS NULL))`; } - return sql`EXISTS (SELECT 1 FROM "asset_face" af JOIN "person" p ON af."personId" = p.id WHERE af."assetId" = ${assets.id} AND (p.name = '' OR p.name IS NULL))`; + return sql`EXISTS (SELECT 1 FROM "asset_face" af JOIN "person" p ON af."personGroupId" = p."personGroupId" AND p."ownerId" = ${ownerId} WHERE af."assetId" = ${assets.id} AND (p.name = '' OR p.name IS NULL))`; case "not_in_album": return sql`NOT EXISTS (SELECT 1 FROM "album_asset" aa WHERE aa."assetId" = ${assets.id})`; diff --git a/src/pages/api/albums/[id]/assets.ts b/src/pages/api/albums/[id]/assets.ts index 17327af..b14ded0 100644 --- a/src/pages/api/albums/[id]/assets.ts +++ b/src/pages/api/albums/[id]/assets.ts @@ -46,12 +46,12 @@ export default async function handler( .leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id)) .leftJoin(exif, eq(assets.id, exif.assetId)) .leftJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, eq(assetFaces.personId, person.id)) + .leftJoin(person, and(eq(assetFaces.personGroupId, person.personGroupId),eq(person.ownerId, currentUser.id))) .where(and( eq(albumsAssetsAssets.albumId, id), eq(assets.visibility, "timeline"), eq(assets.status, "active"), - faceId ? eq(assetFaces.personId, faceId) : undefined, + faceId ? eq(assetFaces.personGroupId, faceId) : undefined, )) .orderBy(desc(assets.id), desc(assets.localDateTime)) .limit(100) diff --git a/src/pages/api/albums/[id]/info.ts b/src/pages/api/albums/[id]/info.ts index c9dc209..7c5eca0 100644 --- a/src/pages/api/albums/[id]/info.ts +++ b/src/pages/api/albums/[id]/info.ts @@ -29,7 +29,7 @@ export default async function handler( assetCount: count(assets.id), firstPhotoDate: min(exif.dateTimeOriginal), lastPhotoDate: max(exif.dateTimeOriginal), - faceCount: count(sql`DISTINCT ${person.id}`), // Ensure unique personId + faceCount: count(sql`DISTINCT ${person.personGroupId}`), // Ensure unique personId }) .from(albums) .innerJoin(albumUsers, and(eq(albums.id, albumUsers.albumId), eq(albumUsers.role, "owner"))) @@ -37,7 +37,7 @@ export default async function handler( .leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id)) .leftJoin(exif, and(eq(assets.id, exif.assetId), eq(assets.visibility, "timeline"))) .leftJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false))) + .leftJoin(person, and(eq(assetFaces.personGroupId, person.personGroupId),eq(person.ownerId, currentUser.id), eq(person.isHidden, false))) .where(and(eq(albumUsers.userId, currentUser.id), eq(albums.id, id))) .groupBy(albums.id) .limit(1); diff --git a/src/pages/api/albums/[id]/people.ts b/src/pages/api/albums/[id]/people.ts index 364af31..6eddb82 100644 --- a/src/pages/api/albums/[id]/people.ts +++ b/src/pages/api/albums/[id]/people.ts @@ -21,7 +21,7 @@ export default async function handler( const { id } = req.query as { id: string }; const dbAlbumPeople = await db.select({ - id: person.id, + id: person.personGroupId, name: person.name, thumbnailAssetId: person.faceAssetId, numberOfPhotos: count(assets.id), @@ -31,10 +31,10 @@ export default async function handler( .leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId)) .leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id)) .leftJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false))) - .where(and(eq(albumUsers.userId, currentUser.id), eq(albums.id, id), isNotNull(person.id))) + .leftJoin(person, and(eq(assetFaces.personGroupId, person.personGroupId),eq(person.ownerId, currentUser.id), eq(person.isHidden, false))) + .where(and(eq(albumUsers.userId, currentUser.id), eq(albums.id, id), isNotNull(person.personGroupId))) .orderBy(desc(person.name)) - .groupBy(person.id); + .groupBy(person.ownerId, person.personGroupId); res.status(200).json(dbAlbumPeople); } \ No newline at end of file diff --git a/src/pages/api/albums/[id]/public-info.ts b/src/pages/api/albums/[id]/public-info.ts index 5296144..43ff2a1 100644 --- a/src/pages/api/albums/[id]/public-info.ts +++ b/src/pages/api/albums/[id]/public-info.ts @@ -24,14 +24,14 @@ export default async function handler( assetCount: count(assets.id), firstPhotoDate: min(exif.dateTimeOriginal), lastPhotoDate: max(exif.dateTimeOriginal), - faceCount: count(sql`DISTINCT ${person.id}`), // Ensure unique personId + faceCount: count(sql`DISTINCT ${person.personGroupId}`), // Ensure unique personId }) .from(albums) .leftJoin(albumsAssetsAssets, eq(albums.id, albumsAssetsAssets.albumId)) .leftJoin(assets, eq(albumsAssetsAssets.assetId, assets.id)) .leftJoin(exif, and(eq(assets.id, exif.assetId), eq(assets.visibility, "timeline"))) .leftJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false))) + .leftJoin(person, and(eq(assetFaces.personGroupId, person.personGroupId),eq(person.ownerId, assets.ownerId),eq(person.isHidden, false))) .where(and(eq(albums.id, id))) .groupBy(albums.id) .limit(1); diff --git a/src/pages/api/albums/list.ts b/src/pages/api/albums/list.ts index bd94d6d..1673c6c 100644 --- a/src/pages/api/albums/list.ts +++ b/src/pages/api/albums/list.ts @@ -71,7 +71,7 @@ export default async function handler( myRole: albumUsers.role, description: albums.description, lastModifiedAssetTimestamp: max(exif.dateTimeOriginal), - faceCount: count(sql`DISTINCT ${assetFaces.personId}`), // Ensure unique personId + faceCount: count(sql`DISTINCT ${assetFaces.personGroupId}`), // Ensure unique personId }) .from(albums) .innerJoin(albumUsers, and(eq(albums.id, albumUsers.albumId), inArray(albumUsers.role, roles))) @@ -83,7 +83,7 @@ export default async function handler( )) .leftJoin(exif, eq(assets.id, exif.assetId)) .leftJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, and(eq(assetFaces.personId, person.id), eq(person.isHidden, false))) + .leftJoin(person, and(eq(assetFaces.personGroupId, person.personGroupId),eq(person.ownerId, currentUser.id), eq(person.isHidden, false))) .where(eq(albumUsers.userId, currentUser.id)) .groupBy(albums.id, albumUsers.userId, albumUsers.role) .orderBy(desc(albums.createdAt)); diff --git a/src/pages/api/assets/[id]/detail.ts b/src/pages/api/assets/[id]/detail.ts index 6fc8a06..7dbb357 100644 --- a/src/pages/api/assets/[id]/detail.ts +++ b/src/pages/api/assets/[id]/detail.ts @@ -73,13 +73,16 @@ export default async function handler( // Fetch people detected in this asset const faces = await db .select({ - personId: person.id, + personId: person.personGroupId, personName: person.name, thumbnailPath: person.thumbnailPath, isHidden: person.isHidden, }) .from(assetFaces) - .innerJoin(person, eq(assetFaces.personId, person.id)) + .innerJoin(person, and( + eq(assetFaces.personGroupId, person.personGroupId), + eq(person.ownerId, currentUser.id), + )) .where(eq(assetFaces.assetId, id)); return res.status(200).json({ diff --git a/src/pages/api/assets/geo-heatmap.ts b/src/pages/api/assets/geo-heatmap.ts index 57828d9..25f49cc 100644 --- a/src/pages/api/assets/geo-heatmap.ts +++ b/src/pages/api/assets/geo-heatmap.ts @@ -31,7 +31,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) if (peopleIds?.length > 0) { query = query .innerJoin(assetFaces, eq(assets.id, assetFaces.assetId)) - .innerJoin(person, eq(assetFaces.personId, person.id)); + .innerJoin(person, and( + eq(assetFaces.personGroupId, person.personGroupId), + eq(person.ownerId, currentUser.id), + )); } const dbAssets = await query.where( @@ -40,7 +43,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) isNotNull(exif.latitude), isNotNull(exif.longitude), albumIds?.length > 0 ? inArray(albumsAssetsAssets.albumId, [albumIds]) : undefined, - peopleIds?.length > 0 ? inArray(person.id, [peopleIds]) : undefined + peopleIds?.length > 0 ? inArray(person.personGroupId, [peopleIds]) : undefined ) ); const heatmapData = dbAssets.map((asset) => [ diff --git a/src/pages/api/assets/orphan-finder.ts b/src/pages/api/assets/orphan-finder.ts index ffd682b..e618a3a 100644 --- a/src/pages/api/assets/orphan-finder.ts +++ b/src/pages/api/assets/orphan-finder.ts @@ -55,7 +55,7 @@ export default async function handler( if (noPeople === "true") { conditions.push( - sql`NOT EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personId" IS NOT NULL)` + sql`NOT EXISTS (SELECT 1 FROM "asset_face" af WHERE af."assetId" = ${assets.id} AND af."personGroupId" IS NOT NULL)` ); } diff --git a/src/pages/api/find/search.ts b/src/pages/api/find/search.ts index ed90792..0a17d14 100644 --- a/src/pages/api/find/search.ts +++ b/src/pages/api/find/search.ts @@ -7,7 +7,7 @@ import { parseFindQuery } from "@/helpers/ai.helper"; import { getUserHeaders } from "@/helpers/user.helper"; import { person } from "@/schema"; import { Person } from "@/schema/person.schema"; -import { inArray } from "drizzle-orm"; +import { and, eq, inArray } from "drizzle-orm"; import { NextApiRequest, NextApiResponse } from "next"; export default async function search( @@ -28,7 +28,10 @@ export default async function search( dbPeople = await db .select() .from(person) - .where(inArray(person.id, personIds)); + .where(and( + inArray(person.personGroupId, personIds), + eq(person.ownerId, currentUser.id), + )); } // Smart search requires query text; a filter-only search (e.g. "photos diff --git a/src/pages/api/people/[id]/info.ts b/src/pages/api/people/[id]/info.ts index 1f26f24..4bc22a9 100644 --- a/src/pages/api/people/[id]/info.ts +++ b/src/pages/api/people/[id]/info.ts @@ -3,6 +3,7 @@ import { NextApiResponse } from "next"; import { and, desc, eq, isNotNull, sql } from "drizzle-orm"; import { db } from "@/config/db"; +import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; import { person } from "@/schema/person.schema"; import { NextApiRequest } from "next"; import { albums } from "@/schema/albums.schema"; @@ -11,10 +12,17 @@ import { albumsAssetsAssets } from "@/schema/albumAssetsAssets.schema"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { const { id } = req.query; + const currentUser = await getCurrentUser(req); + if (!currentUser) { + return res.status(401).json({ error: "Unauthorized" }); + } const personRecords = await db .select() .from(person) - .where(eq(person.id, id as string)) + .where(and( + eq(person.personGroupId, id as string), + eq(person.ownerId, currentUser.id), + )) .limit(1); const personRecord = personRecords?.[0]; @@ -33,7 +41,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) lastAssetDate: sql`max(${exif.dateTimeOriginal})`, }) .from(albums) - .leftJoin(assetFaces, eq(assetFaces.personId, personRecord.id)) + .leftJoin(assetFaces, eq(assetFaces.personGroupId, personRecord.personGroupId)) .leftJoin(assets, eq(assets.id, assetFaces.assetId)) .leftJoin(exif, eq(exif.assetId, assets.id)) .leftJoin(albumsAssetsAssets, eq(albumsAssetsAssets.assetId, assets.id)) @@ -49,7 +57,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) .leftJoin(assets, eq(assets.id, exif.assetId)) .leftJoin(assetFaces, eq(assetFaces.assetId, assets.id)) .where(and( - eq(assetFaces.personId, personRecord.id), + eq(assetFaces.personGroupId, personRecord.personGroupId), isNotNull(exif.city), isNotNull(exif.country), )) @@ -59,6 +67,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return res.status(200).json({ ...personRecord, + // The Immich API identifies a person by its personGroupId + id: personRecord.personGroupId, albums: dbPersonAlbums.sort((a, b) => b.assetCount - a.assetCount).map((album) => ({ ...album, lastAssetYear: album.lastAssetDate ? new Date(album.lastAssetDate).getFullYear() : null, diff --git a/src/pages/api/people/[id]/similar-faces.ts b/src/pages/api/people/[id]/similar-faces.ts index b2937b5..d57cb88 100644 --- a/src/pages/api/people/[id]/similar-faces.ts +++ b/src/pages/api/people/[id]/similar-faces.ts @@ -33,7 +33,7 @@ export default async function handler( const personRecords = await db .select() .from(person) - .where(eq(person.id, id)) + .where(and(eq(person.personGroupId, id), eq(person.ownerId, currentUser.id))) .limit(1); const personRecord = personRecords?.[0]; @@ -46,7 +46,7 @@ export default async function handler( const assetFaceRecords = await db .select() .from(assetFaces) - .where(eq(assetFaces.personId, personRecord.id)) + .where(eq(assetFaces.personGroupId, personRecord.personGroupId)) .limit(1); const assetFaceRecord = assetFaceRecords?.[0]; @@ -75,8 +75,8 @@ export default async function handler( )})`; const people = await db - .selectDistinctOn([person.id], { - id: person.id, + .selectDistinctOn([person.personGroupId], { + id: person.personGroupId, name: person.name, birthDate: person.birthDate, isHidden: person.isHidden, @@ -87,11 +87,11 @@ export default async function handler( }) .from(faceSearch) .leftJoin(assetFaces, eq(assetFaces.id, faceSearch.faceId)) - .innerJoin(person, eq(person.id, assetFaces.personId)) + .innerJoin(person, eq(person.personGroupId, assetFaces.personGroupId)) .where( and( - ne(person.id, id), + ne(person.personGroupId, id), eq(person.ownerId, currentUser.id), gt(similarity, threshold) ) diff --git a/src/pages/api/people/list.ts b/src/pages/api/people/list.ts index 76c990f..770c014 100644 --- a/src/pages/api/people/list.ts +++ b/src/pages/api/people/list.ts @@ -56,6 +56,7 @@ export default async function handler( eq(assets.visibility, "timeline"), eq(assets.status, "active"), eq(assets.ownerId, currentUser.id), + eq(person.ownerId, currentUser.id), type === "all" ? undefined : (type === "nameless" ? eq(person.name, "") : ne(person.name, "")), query && query.length > 0 ? ilike(person.name, `%${query}%`) : undefined, visibility === "visible" ? eq(person.isHidden, false) : visibility === "hidden" ? eq(person.isHidden, true) : undefined @@ -63,7 +64,7 @@ export default async function handler( let dbQuery = db .select({ - id: person.id, + id: person.personGroupId, name: person.name, birthDate: person.birthDate, isHidden: person.isHidden, @@ -71,11 +72,11 @@ export default async function handler( assetCount: count(assetFaces.id), }) .from(person) - .leftJoin(assetFaces, eq(assetFaces.personId, person.id)) + .leftJoin(assetFaces, eq(assetFaces.personGroupId, person.personGroupId)) .leftJoin(assets, eq(assets.id, assetFaces.assetId)) .where(whereClause) .having(lte(count(assetFaces.id), maximumAssetCount)) - .groupBy(person.id); + .groupBy(person.ownerId, person.personGroupId); let sortedQuery; if (sort === "assetCount") { diff --git a/src/pages/api/rewind/stats.ts b/src/pages/api/rewind/stats.ts index 3824478..b4218b8 100644 --- a/src/pages/api/rewind/stats.ts +++ b/src/pages/api/rewind/stats.ts @@ -83,12 +83,15 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) .select({ name: person.name, count: count(assets.id), - id: person.id, + id: person.personGroupId, cover: person.faceAssetId }) .from(assetFaces) .leftJoin(assets, eq(assets.id, assetFaces.assetId)) - .leftJoin(person, eq(person.id, assetFaces.personId)) + .leftJoin(person, and( + eq(person.personGroupId, assetFaces.personGroupId), + eq(person.ownerId, user.id), + )) .leftJoin(exif, eq(exif.assetId, assets.id)) .where(and( eq(sql`EXTRACT(YEAR FROM ${exif.dateTimeOriginal})`, year), @@ -99,7 +102,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) )) .orderBy(desc(count(assets.id))) .limit(2) - .groupBy(person.id); + .groupBy(person.ownerId, person.personGroupId); const favoritedAssets = await db .select({ id: assets.id }) diff --git a/src/pages/api/share-link/[token]/assets.ts b/src/pages/api/share-link/[token]/assets.ts index bfbc939..c4389d3 100644 --- a/src/pages/api/share-link/[token]/assets.ts +++ b/src/pages/api/share-link/[token]/assets.ts @@ -77,7 +77,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) .leftJoin(albums, eq(albumsAssetsAssets.albumId, albums.id)) .innerJoin(exif, eq(exif.assetId, assets.id)) .where(and( - filteredPersonIds?.length > 0 ? inArray(assetFaces.personId, filteredPersonIds) : undefined, + filteredPersonIds?.length > 0 ? inArray(assetFaces.personGroupId, filteredPersonIds) : undefined, albumIds?.length > 0 ? inArray(albums.id, albumIds) : undefined, startDate ? gte(assets.createdAt, new Date(startDate)) : undefined, endDate ? lte(assets.createdAt, new Date(endDate)) : undefined, diff --git a/src/pages/api/share-link/[token]/people.ts b/src/pages/api/share-link/[token]/people.ts index 02449f3..87cd04e 100644 --- a/src/pages/api/share-link/[token]/people.ts +++ b/src/pages/api/share-link/[token]/people.ts @@ -38,28 +38,31 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) const { personIds, albumIds, startDate, endDate } = decoded as ShareLinkFilters; const dbPeople = await db.select({ - id: person.id, + id: person.personGroupId, name: person.name, thumbnailAssetId: person.faceAssetId, assetCount: count(assets.id), }).from(assets) .innerJoin(assetFaces, eq(assets.id, assetFaces.assetId)) .innerJoin(albumsAssetsAssets, eq(assets.id, albumsAssetsAssets.assetId)) - .innerJoin(person, eq(assetFaces.personId, person.id)) + .innerJoin(person, and( + eq(assetFaces.personGroupId, person.personGroupId), + eq(person.ownerId, assets.ownerId), + )) .innerJoin(albums, eq(albumsAssetsAssets.albumId, albums.id)) .innerJoin(exif, eq(exif.assetId, assets.id)) .where(and( - personIds?.length > 0 ? inArray(assetFaces.personId, personIds) : undefined, + personIds?.length > 0 ? inArray(assetFaces.personGroupId, personIds) : undefined, albumIds?.length > 0 ? inArray(albums.id, albumIds) : undefined, startDate ? gte(assets.createdAt, new Date(startDate)) : undefined, endDate ? lte(assets.createdAt, new Date(endDate)) : undefined, eq(assets.status, "active"), eq(assets.visibility, "timeline"), eq(assets.isOffline, false), - isNotNull(person.id), + isNotNull(person.personGroupId), ne(person.name, "") )) - .groupBy(person.id) + .groupBy(person.ownerId, person.personGroupId) .orderBy(desc(count(assets.id))); const cleanedPeople = dbPeople.map((person) => { diff --git a/src/schema/albums.schema.ts b/src/schema/albums.schema.ts index 11f8d34..7b27a62 100644 --- a/src/schema/albums.schema.ts +++ b/src/schema/albums.schema.ts @@ -6,7 +6,7 @@ export const albums = pgTable('album', { createdAt: timestamp('createdAt', { withTimezone: true }).defaultNow().notNull(), albumThumbnailAssetId: uuid('albumThumbnailAssetId'), updatedAt: timestamp('updatedAt', { withTimezone: true }).defaultNow().notNull(), - description: text('description').notNull().default(''), + description: text('description'), deletedAt: timestamp('deletedAt', { withTimezone: true }), isActivityEnabled: boolean('isActivityEnabled').notNull().default(true), order: varchar('order').notNull().default('desc'), diff --git a/src/schema/assetFaces.schema.ts b/src/schema/assetFaces.schema.ts index fd2c1ce..4d0adf0 100644 --- a/src/schema/assetFaces.schema.ts +++ b/src/schema/assetFaces.schema.ts @@ -3,7 +3,7 @@ import { pgTable, uuid, integer } from "drizzle-orm/pg-core"; export const assetFaces = pgTable("asset_face", { id: uuid("id").defaultRandom().primaryKey(), assetId: uuid("assetId").notNull(), - personId: uuid("personId"), + personGroupId: uuid("personGroupId"), imageWidth: integer("imageWidth").notNull().default(0), imageHeight: integer("imageHeight").notNull().default(0), boundingBoxX1: integer("boundingBoxX1").notNull().default(0), diff --git a/src/schema/person.schema.ts b/src/schema/person.schema.ts index 0559c22..85b4bd0 100644 --- a/src/schema/person.schema.ts +++ b/src/schema/person.schema.ts @@ -1,8 +1,8 @@ -import { pgTable, uuid, varchar, timestamp, boolean, date, pgEnum } from "drizzle-orm/pg-core"; +import { pgTable, uuid, varchar, timestamp, boolean, date, primaryKey } from "drizzle-orm/pg-core"; export const person = pgTable("person", { - id: uuid("id").defaultRandom().primaryKey(), + personGroupId: uuid("personGroupId").notNull(), createdAt: timestamp("createdAt", { withTimezone: true }).defaultNow(), updatedAt: timestamp("updatedAt", { withTimezone: true }).defaultNow(), ownerId: uuid("ownerId").notNull(), @@ -11,6 +11,8 @@ export const person = pgTable("person", { isHidden: boolean("isHidden").notNull().default(false), birthDate: date("birthDate", { mode: "date" }), faceAssetId: uuid("faceAssetId"), -}); +}, (table) => ({ + pk: primaryKey({ columns: [table.ownerId, table.personGroupId] }), +})); export type Person = typeof person.$inferSelect; \ No newline at end of file diff --git a/src/schema/relationships.ts b/src/schema/relationships.ts index 303c359..c46a3ce 100644 --- a/src/schema/relationships.ts +++ b/src/schema/relationships.ts @@ -13,8 +13,8 @@ export const assetFacesRelations = relations(assetFaces, ({ one }) => ({ references: [assets.id], }), person: one(person, { - fields: [assetFaces.personId], - references: [person.id], + fields: [assetFaces.personGroupId], + references: [person.personGroupId], }), })); diff --git a/src/schema/users.schema.ts b/src/schema/users.schema.ts index 6c1ce40..7ad04c7 100644 --- a/src/schema/users.schema.ts +++ b/src/schema/users.schema.ts @@ -3,7 +3,7 @@ import { pgTable, uuid, varchar, timestamp, boolean, bigint } from "drizzle-orm/ export const users = pgTable("user", { id: uuid("id").defaultRandom().primaryKey(), email: varchar("email").notNull(), - password: varchar("password").notNull().default(''), + password: varchar("password"), createdAt: timestamp("createdAt", { withTimezone: true }).defaultNow(), profileImagePath: varchar("profileImagePath").notNull().default(''), isAdmin: boolean("isAdmin").notNull().default(false), diff --git a/src/types/album.d.ts b/src/types/album.d.ts index 56b7638..61b6c56 100644 --- a/src/types/album.d.ts +++ b/src/types/album.d.ts @@ -1,6 +1,6 @@ export interface IAlbum { albumName: string; - description: string; + description: string | null; albumThumbnailAssetId: string; createdAt: Date; updatedAt: Date;