Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add user id to tag database schema (#3837)
Thomas Kaul85cc72627bf9
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 2a3283f75a..fa3fc0bdc8 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Added++- Added read `permissions` to the `Platform` model+- Added read `permissions` to the `Tag` model+- Added `userId` to the `Tag` database schema+### Changed- Considered the availability of the date range selector in the assistant per view@@ -17,6 +23,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Upgraded `prisma` from version `5.19.1` to `5.20.0`- Upgraded `webpack-bundle-analyzer` from version `4.10.1` to `4.10.2`+### Fixed++- Fixed the content height of the create or update platform dialog in the admin control+- Fixed the content height of the create or update tag dialog in the admin control+## 2.110.0 - 2024-09-24### Changeddiff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.tsindex acd7b315b2..ee225e7691 100644--- a/apps/api/src/app/info/info.service.ts+++ b/apps/api/src/app/info/info.service.ts@@ -114,7 +114,7 @@ export class InfoService {}),this.getStatistics(),this.getSubscriptions(),- this.tagService.get()+ this.tagService.getPublic()]);if (isUserSignupEnabled) {diff --git a/apps/api/src/app/platform/platform.controller.ts b/apps/api/src/app/platform/platform.controller.tsindex 4512e7df06..c91f58cf88 100644--- a/apps/api/src/app/platform/platform.controller.ts+++ b/apps/api/src/app/platform/platform.controller.ts@@ -26,6 +26,7 @@ export class PlatformController {public constructor(private readonly platformService: PlatformService) {}@Get()+ @HasPermission(permissions.readPlatforms)@UseGuards(AuthGuard('jwt'), HasPermissionGuard)public async getPlatforms() {return this.platformService.getPlatformsWithAccountCount();diff --git a/apps/api/src/app/tag/tag.controller.ts b/apps/api/src/app/tag/tag.controller.tsindex 4c37b9dfe4..6198a0bf58 100644--- a/apps/api/src/app/tag/tag.controller.ts+++ b/apps/api/src/app/tag/tag.controller.ts@@ -26,6 +26,7 @@ export class TagController {public constructor(private readonly tagService: TagService) {}@Get()+ @HasPermission(permissions.readTags)@UseGuards(AuthGuard('jwt'), HasPermissionGuard)public async getTags() {return this.tagService.getTagsWithActivityCount();diff --git a/apps/api/src/app/tag/tag.service.ts b/apps/api/src/app/tag/tag.service.tsindex b077cbe1ce..c4a5447ac0 100644--- a/apps/api/src/app/tag/tag.service.ts+++ b/apps/api/src/app/tag/tag.service.ts@@ -56,10 +56,11 @@ export class TagService {}});- return tagsWithOrderCount.map(({ _count, id, name }) => {+ return tagsWithOrderCount.map(({ _count, id, name, userId }) => {return {id,name,+ userId,activityCount: _count.orders};});diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex edb27aeadb..a3dfc2fcae 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -70,7 +70,7 @@ export class UserService {},where: { userId: id }}),- this.tagService.getByUser(id)+ this.tagService.getInUseByUser(id)]);let systemMessage: SystemMessage;diff --git a/apps/api/src/services/tag/tag.service.ts b/apps/api/src/services/tag/tag.service.tsindex 25e0a32c4c..5426a0582d 100644--- a/apps/api/src/services/tag/tag.service.ts+++ b/apps/api/src/services/tag/tag.service.ts@@ -6,15 +6,18 @@ import { Injectable } from '@nestjs/common';export class TagService {public constructor(private readonly prismaService: PrismaService) {}- public async get() {+ public async getPublic() {return this.prismaService.tag.findMany({orderBy: {name: 'asc'+ },+ where: {+ userId: null}});}- public async getByUser(userId: string) {+ public async getInUseByUser(userId: string) {return this.prismaService.tag.findMany({orderBy: {name: 'asc'diff --git a/apps/client/src/app/components/admin-platform/admin-platform.component.ts b/apps/client/src/app/components/admin-platform/admin-platform.component.tsindex bef4bc9b06..2c0aa345e5 100644--- a/apps/client/src/app/components/admin-platform/admin-platform.component.ts+++ b/apps/client/src/app/components/admin-platform/admin-platform.component.ts@@ -139,7 +139,7 @@ export class AdminPlatformComponent implements OnInit, OnDestroy {url: null}},- height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',+ height: this.deviceType === 'mobile' ? '97.5vh' : undefined,width: this.deviceType === 'mobile' ? '100vw' : '50rem'});@@ -176,7 +176,7 @@ export class AdminPlatformComponent implements OnInit, OnDestroy {url}},- height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',+ height: this.deviceType === 'mobile' ? '97.5vh' : undefined,width: this.deviceType === 'mobile' ? '100vw' : '50rem'});diff --git a/apps/client/src/app/components/admin-tag/admin-tag.component.html b/apps/client/src/app/components/admin-tag/admin-tag.component.htmlindex 046d0a0a57..f69579ab82 100644--- a/apps/client/src/app/components/admin-tag/admin-tag.component.html+++ b/apps/client/src/app/components/admin-tag/admin-tag.component.html@@ -34,6 +34,20 @@</td></ng-container>+ <ng-container matColumnDef="userId">+ <th+ *matHeaderCellDef+ class="px-1"+ mat-header-cell+ mat-sort-header="userId"+ >+ <ng-container i18n>User</ng-container>+ </th>+ <td *matCellDef="let element" class="px-1" mat-cell>+ <span class="text-monospace">{{ element.userId }}</span>+ </td>+ </ng-container>+<ng-container matColumnDef="activities"><th*matHeaderCellDefdiff --git a/apps/client/src/app/components/admin-tag/admin-tag.component.ts b/apps/client/src/app/components/admin-tag/admin-tag.component.tsindex bd501eaa69..3333f71769 100644--- a/apps/client/src/app/components/admin-tag/admin-tag.component.ts+++ b/apps/client/src/app/components/admin-tag/admin-tag.component.ts@@ -36,7 +36,7 @@ export class AdminTagComponent implements OnInit, OnDestroy {public dataSource: MatTableDataSource<Tag> = new MatTableDataSource();public deviceType: string;- public displayedColumns = ['name', 'activities', 'actions'];+ public displayedColumns = ['name', 'userId', 'activities', 'actions'];public tags: Tag[];private unsubscribeSubject = new Subject<void>();@@ -138,7 +138,7 @@ export class AdminTagComponent implements OnInit, OnDestroy {name: null}},- height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',+ height: this.deviceType === 'mobile' ? '97.5vh' : undefined,width: this.deviceType === 'mobile' ? '100vw' : '50rem'});@@ -174,7 +174,7 @@ export class AdminTagComponent implements OnInit, OnDestroy {name}},- height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',+ height: this.deviceType === 'mobile' ? '97.5vh' : undefined,width: this.deviceType === 'mobile' ? '100vw' : '50rem'});diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.tsindex 8541f65acc..027c06bd6b 100644--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts@@ -158,10 +158,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {{ id: this.data.symbol, type: 'SYMBOL' }];- this.tagsAvailable = tags.map(({ id, name }) => {+ this.tagsAvailable = tags.map((tag) => {return {- id,- name: translate(name)+ ...tag,+ name: translate(tag.name)};});@@ -320,10 +320,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {this.sectors = {};this.SymbolProfile = SymbolProfile;- this.tags = tags.map(({ id, name }) => {+ this.tags = tags.map((tag) => {return {- id,- name: translate(name)+ ...tag,+ name: translate(tag.name)};});diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.tsindex 323796bef5..4690ab6a82 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts@@ -81,10 +81,10 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {this.currencies = currencies;this.defaultDateFormat = getDateFormatString(this.locale);this.platforms = platforms;- this.tagsAvailable = tags.map(({ id, name }) => {+ this.tagsAvailable = tags.map((tag) => {return {- id,- name: translate(name)+ ...tag,+ name: translate(tag.name)};});diff --git a/libs/common/src/lib/permissions.ts b/libs/common/src/lib/permissions.tsindex 1a235f1a90..ab443ea5ee 100644--- a/libs/common/src/lib/permissions.ts+++ b/libs/common/src/lib/permissions.ts@@ -31,6 +31,8 @@ export const permissions = {enableSubscriptionInterstitial: 'enableSubscriptionInterstitial',enableSystemMessage: 'enableSystemMessage',impersonateAllUsers: 'impersonateAllUsers',+ readPlatforms: 'readPlatforms',+ readTags: 'readTags',reportDataGlitch: 'reportDataGlitch',toggleReadOnlyMode: 'toggleReadOnlyMode',updateAccount: 'updateAccount',@@ -64,6 +66,8 @@ export function getPermissions(aRole: Role): string[] {permissions.deletePlatform,permissions.deleteTag,permissions.deleteUser,+ permissions.readPlatforms,+ permissions.readTags,permissions.updateAccount,permissions.updateAuthDevice,permissions.updateOrder,diff --git a/package.json b/package.jsonindex 5b1dfcbc63..dcb99f7edd 100644--- a/package.json+++ b/package.json@@ -37,6 +37,7 @@"ng": "nx","nx": "nx","postinstall": "prisma generate",+ "prisma": "prisma","replace-placeholders-in-build": "node ./replace.build.js","start": "node dist/apps/api/main","start:client": "nx run client:copy-assets && nx run client:serve --configuration=development-en --hmr -o",diff --git a/prisma/migrations/20240928171744_added_user_to_tag/migration.sql b/prisma/migrations/20240928171744_added_user_to_tag/migration.sqlnew file mode 100644index 0000000000..679bec843e--- /dev/null+++ b/prisma/migrations/20240928171744_added_user_to_tag/migration.sql@@ -0,0 +1,11 @@+-- DropIndex+DROP INDEX "Tag_name_key";++-- AlterTable+ALTER TABLE "Tag" ADD COLUMN "userId" TEXT;++-- CreateIndex+CREATE UNIQUE INDEX "Tag_name_userId_key" ON "Tag"("name", "userId");++-- AddForeignKey+ALTER TABLE "Tag" ADD CONSTRAINT "Tag_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex c5ced391af..0ae1df65a3 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -213,9 +213,12 @@ model Subscription {model Tag {id String @id @default(uuid())- name String @unique+ name Stringorders Order[]+ userId String?+ User User? @relation(fields: [userId], onDelete: Cascade, references: [id])+ @@unique([name, userId])@@index([name])}@@ -236,6 +239,7 @@ model User {Order Order[]Settings Settings?Subscription Subscription[]+ Tag Tag[]@@index([accessToken])@@index([createdAt])