From 033e2ccf4f3da23aa950f2b57eeacde4305b57b5 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 24 Sep 2022 20:47:09 +0200
Subject: [PATCH] Exclude accounts
---
apps/api/src/app/account/create-account.dto.ts | 12 +++++++++++-
apps/api/src/app/account/update-account.dto.ts | 12 +++++++++++-
.../app/pages/accounts/accounts-page.component.ts | 7 +++++--
.../create-or-update-account-dialog.html | 8 ++++++++
.../create-or-update-account-dialog.module.ts | 2 ++
.../migration.sql | 2 ++
prisma/schema.prisma | 1 +
7 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644 prisma/migrations/20220924175215_added_is_excluded_to_account/migration.sql
diff --git a/apps/api/src/app/account/create-account.dto.ts b/apps/api/src/app/account/create-account.dto.ts
index f53a20e76..3ea13e20a 100644
--- a/apps/api/src/app/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@@ -1,5 +1,11 @@
import { AccountType } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
+import {
+ IsBoolean,
+ IsNumber,
+ IsOptional,
+ IsString,
+ ValidateIf
+} from 'class-validator';
export class CreateAccountDto {
@IsString()
@@ -11,6 +17,10 @@ export class CreateAccountDto {
@IsString()
currency: string;
+ @IsBoolean()
+ @IsOptional()
+ isExcluded?: boolean;
+
@IsString()
name: string;
diff --git a/apps/api/src/app/account/update-account.dto.ts b/apps/api/src/app/account/update-account.dto.ts
index 343f46a7a..0b5737607 100644
--- a/apps/api/src/app/account/update-account.dto.ts
+++ b/apps/api/src/app/account/update-account.dto.ts
@@ -1,5 +1,11 @@
import { AccountType } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
+import {
+ IsBoolean,
+ IsNumber,
+ IsOptional,
+ IsString,
+ ValidateIf
+} from 'class-validator';
export class UpdateAccountDto {
@IsString()
@@ -14,6 +20,10 @@ export class UpdateAccountDto {
@IsString()
id: string;
+ @IsBoolean()
+ @IsOptional()
+ isExcluded?: boolean;
+
@IsString()
name: string;
diff --git a/apps/client/src/app/pages/accounts/accounts-page.component.ts b/apps/client/src/app/pages/accounts/accounts-page.component.ts
index 81c02c2fd..6d7f84555 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts
@@ -59,8 +59,8 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
this.openCreateAccountDialog();
} else if (params['editDialog']) {
if (this.accounts) {
- const account = this.accounts.find((account) => {
- return account.id === params['accountId'];
+ const account = this.accounts.find(({ id }) => {
+ return id === params['accountId'];
});
this.openUpdateAccountDialog(account);
@@ -155,6 +155,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
balance,
currency,
id,
+ isExcluded,
name,
platformId
}: AccountModel): void {
@@ -165,6 +166,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
balance,
currency,
id,
+ isExcluded,
name,
platformId
}
@@ -231,6 +233,7 @@ export class AccountsPageComponent implements OnDestroy, OnInit {
accountType: AccountType.SECURITIES,
balance: 0,
currency: this.user?.settings?.baseCurrency,
+ isExcluded: false,
name: null,
platformId: null
}
diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
index 971487356..8b0272125 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -50,6 +50,14 @@
+
+ Exclude from Analytics
+
Account ID
diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts
index 3a3f2f517..528835f9a 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.module.ts
@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
+import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatDialogModule } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
@@ -15,6 +16,7 @@ import { CreateOrUpdateAccountDialog } from './create-or-update-account-dialog.c
CommonModule,
FormsModule,
MatButtonModule,
+ MatCheckboxModule,
MatDialogModule,
MatFormFieldModule,
MatInputModule,
diff --git a/prisma/migrations/20220924175215_added_is_excluded_to_account/migration.sql b/prisma/migrations/20220924175215_added_is_excluded_to_account/migration.sql
new file mode 100644
index 000000000..81245a47a
--- /dev/null
+++ b/prisma/migrations/20220924175215_added_is_excluded_to_account/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Account" ADD COLUMN "isExcluded" BOOLEAN NOT NULL DEFAULT false;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index bc7ca28f7..11bef3e47 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -27,6 +27,7 @@ model Account {
currency String?
id String @default(uuid())
isDefault Boolean @default(false)
+ isExcluded Boolean @default(false)
name String?
platformId String?
updatedAt DateTime @updatedAt