Browse Source
Feature/rename Access to accessesGet in User database schema (#5094)
* Rename Access to accessesGet in User database schema
* Update changelog
pull/5096/head^2
Thomas Kaul
2 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
7 additions and
6 deletions
-
CHANGELOG.md
-
apps/api/src/app/user/user.service.ts
-
libs/common/src/lib/permissions.ts
-
libs/common/src/lib/types/user-with-settings.type.ts
-
prisma/schema.prisma
|
|
@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 |
|
|
|
|
|
|
|
### Changed |
|
|
|
|
|
|
|
- Renamed `Access` to `accessesGet` in the `User` database schema |
|
|
|
- Improved the language localization for Italian (`it`) |
|
|
|
- Upgraded `prisma` from version `6.10.1` to `6.11.1` |
|
|
|
|
|
|
|
|
|
@ -180,7 +180,7 @@ export class UserService { |
|
|
|
userWhereUniqueInput: Prisma.UserWhereUniqueInput |
|
|
|
): Promise<UserWithSettings | null> { |
|
|
|
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, |
|
|
|
|
|
@ -185,7 +185,7 @@ export function hasReadRestrictedAccessPermission({ |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
const access = user.Access?.find(({ id }) => { |
|
|
|
const access = user.accessesGet?.find(({ id }) => { |
|
|
|
return id === impersonationId; |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
@ -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[] |
|
|
|