Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/rename GranteeUser to granteeUser in Access database schema (#4979)

Thomas Kauld5d74eb4db88
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1999c836ec..3d77ae783b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Renamed `GranteeUser` to `granteeUser` in the `Access` database schema
- Improved the language localization for French (`fr`)
- Upgraded `class-validator` from version `0.14.1` to `0.14.2`
diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts
index 9913a5c1b5..bc2d22e518 100644
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@@ -37,20 +37,20 @@ export class AccessController {
public async getAllAccesses(): Promise<Access[]> {
const accessesWithGranteeUser = await this.accessService.accesses({
include: {
- GranteeUser: true
+ granteeUser: true
},
orderBy: { granteeUserId: 'asc' },
where: { userId: this.request.user.id }
});
return accessesWithGranteeUser.map(
- ({ alias, GranteeUser, id, permissions }) => {
- if (GranteeUser) {
+ ({ alias, granteeUser, id, permissions }) => {
+ if (granteeUser) {
return {
alias,
id,
permissions,
- grantee: GranteeUser?.id,
+ grantee: granteeUser?.id,
type: 'PRIVATE'
};
}
@@ -85,7 +85,7 @@ export class AccessController {
try {
return this.accessService.createAccess({
alias: data.alias || undefined,
- GranteeUser: data.granteeUserId
+ granteeUser: data.granteeUserId
? { connect: { id: data.granteeUserId } }
: undefined,
permissions: data.permissions,
diff --git a/apps/api/src/app/access/access.service.ts b/apps/api/src/app/access/access.service.ts
index ccba595e39..8403cdc09f 100644
--- a/apps/api/src/app/access/access.service.ts
+++ b/apps/api/src/app/access/access.service.ts
@@ -13,7 +13,7 @@ export class AccessService {
): Promise<AccessWithGranteeUser | null> {
return this.prismaService.access.findFirst({
include: {
- GranteeUser: true
+ granteeUser: true
},
where: accessWhereInput
});
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index cb40a10050..b95801b41f 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -104,7 +104,7 @@ export class UserService {
user: true
},
orderBy: { alias: 'asc' },
- where: { GranteeUser: { id } }
+ where: { granteeUserId: id }
}),
this.prismaService.order.count({
where: { userId: id }
diff --git a/apps/api/src/services/impersonation/impersonation.service.ts b/apps/api/src/services/impersonation/impersonation.service.ts
index 4bf23576a4..71c543a432 100644
--- a/apps/api/src/services/impersonation/impersonation.service.ts
+++ b/apps/api/src/services/impersonation/impersonation.service.ts
@@ -16,7 +16,7 @@ export class ImpersonationService {
if (this.request.user) {
const accessObject = await this.prismaService.access.findFirst({
where: {
- GranteeUser: { id: this.request.user.id },
+ granteeUserId: this.request.user.id,
id: aId
}
});
@@ -35,7 +35,7 @@ export class ImpersonationService {
// Public access
const accessObject = await this.prismaService.access.findFirst({
where: {
- GranteeUser: null,
+ granteeUserId: null,
user: { id: aId }
}
});
diff --git a/libs/common/src/lib/types/access-with-grantee-user.type.ts b/libs/common/src/lib/types/access-with-grantee-user.type.ts
index 18c045fc7a..98551e0fdf 100644
--- a/libs/common/src/lib/types/access-with-grantee-user.type.ts
+++ b/libs/common/src/lib/types/access-with-grantee-user.type.ts
@@ -1,3 +1,3 @@
import { Access, User } from '@prisma/client';
-export type AccessWithGranteeUser = Access & { GranteeUser?: User };
+export type AccessWithGranteeUser = Access & { granteeUser?: User };
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 2c9f0e4bff..5f95c1e843 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -12,12 +12,12 @@ datasource db {
model Access {
alias String?
createdAt DateTime @default(now())
+ granteeUser User? @relation("accessGet", fields: [granteeUserId], onDelete: Cascade, references: [id])
granteeUserId String?
id String @id @default(uuid())
permissions AccessPermission[] @default([READ_RESTRICTED])
updatedAt DateTime @updatedAt
userId String
- GranteeUser User? @relation("accessGet", fields: [granteeUserId], onDelete: Cascade, references: [id])
user User @relation("accessGive", fields: [userId], onDelete: Cascade, references: [id])
@@index([alias])