From ceed0ab781f3aaebf12e395e89032d3205f02f0f Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 5 Jul 2025 16:43:40 +0200 Subject: [PATCH] Rename Access to accessesGet in User database schema --- apps/api/src/app/user/user.service.ts | 6 +++--- libs/common/src/lib/permissions.ts | 2 +- libs/common/src/lib/types/user-with-settings.type.ts | 2 +- prisma/schema.prisma | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 7b55210eb..1652a2b91 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -180,7 +180,7 @@ export class UserService { userWhereUniqueInput: Prisma.UserWhereUniqueInput ): Promise { const { - Access, + accessesGet, accessToken, accounts, analytics, @@ -195,7 +195,7 @@ export class UserService { updatedAt } = await this.prismaService.user.findUnique({ include: { - Access: true, + accessesGet: true, accounts: { include: { platform: true } }, @@ -207,7 +207,7 @@ export class UserService { }); const user: UserWithSettings = { - Access, + accessesGet, accessToken, accounts, authChallenge, diff --git a/libs/common/src/lib/permissions.ts b/libs/common/src/lib/permissions.ts index 5bc8664b8..83ccdbb42 100644 --- a/libs/common/src/lib/permissions.ts +++ b/libs/common/src/lib/permissions.ts @@ -185,7 +185,7 @@ export function hasReadRestrictedAccessPermission({ return false; } - const access = user.Access?.find(({ id }) => { + const access = user.accessesGet?.find(({ id }) => { return id === impersonationId; }); diff --git a/libs/common/src/lib/types/user-with-settings.type.ts b/libs/common/src/lib/types/user-with-settings.type.ts index 9bff8c625..fc4a81280 100644 --- a/libs/common/src/lib/types/user-with-settings.type.ts +++ b/libs/common/src/lib/types/user-with-settings.type.ts @@ -5,7 +5,7 @@ import { Access, Account, Settings, User } from '@prisma/client'; // TODO: Compare with User interface export type UserWithSettings = User & { - Access: Access[]; + accessesGet: Access[]; accounts: Account[]; activityCount: number; dataProviderGhostfolioDailyRequests: number; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 2021a26a1..a7ffe4d21 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -244,6 +244,7 @@ model Tag { } model User { + accessesGet Access[] @relation("accessGet") accessToken String? accounts Account[] activities Order[] @@ -260,7 +261,6 @@ model User { thirdPartyId String? updatedAt DateTime @updatedAt watchlist SymbolProfile[] @relation("UserWatchlist") - Access Access[] @relation("accessGet") AccessGive Access[] @relation("accessGive") Settings Settings? SymbolProfile SymbolProfile[]