Refactoring

apps/api/src/app/account-balance/account-balance.controller.ts

@@ -30,28 +30,6 @@ export class AccountBalanceController {
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @HasPermission(permissions.deleteAccountBalance)
-  @Delete(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  public async deleteAccountBalance(
-    @Param('id') id: string
-  ): Promise<AccountBalance> {
-    const accountBalance = await this.accountBalanceService.accountBalance({
-      id
-    });
-
-    if (!accountBalance || accountBalance.userId !== this.request.user.id) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.accountBalanceService.deleteAccountBalance({
-      id
-    });
-  }
-
   @HasPermission(permissions.createAccountBalance)
   @Post()
   @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@@ -85,4 +63,26 @@ export class AccountBalanceController {
       value: data.balance
     });
   }
+
+  @HasPermission(permissions.deleteAccountBalance)
+  @Delete(':id')
+  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  public async deleteAccountBalance(
+    @Param('id') id: string
+  ): Promise<AccountBalance> {
+    const accountBalance = await this.accountBalanceService.accountBalance({
+      id
+    });
+
+    if (!accountBalance || accountBalance.userId !== this.request.user.id) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.accountBalanceService.deleteAccountBalance({
+      id
+    });
+  }
 }

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -154,11 +154,9 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
         accountId: this.data.accountId
       })
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe({
-        next: () => {
-          this.fetchAccountBalances();
-          this.fetchPortfolioPerformance();
-        }
+      .subscribe(() => {
+        this.fetchAccountBalances();
+        this.fetchPortfolioPerformance();
       });
   }
 
@@ -166,11 +164,9 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
     this.dataService
       .deleteAccountBalance(aId)
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe({
-        next: () => {
-          this.fetchAccountBalances();
-          this.fetchPortfolioPerformance();
-        }
+      .subscribe(() => {
+        this.fetchAccountBalances();
+        this.fetchPortfolioPerformance();
       });
   }
 

libs/ui/src/lib/account-balances/account-balances.component.ts

@@ -70,20 +70,20 @@ export class GfAccountBalancesComponent
 
   @ViewChild(MatSort) sort: MatSort;
 
-  public Validators = Validators;
+  public accountBalanceForm = new FormGroup({
+    balance: new FormControl(0, Validators.required),
+    date: new FormControl(new Date(), Validators.required)
+  });
 
   public dataSource: MatTableDataSource<
     AccountBalancesResponse['balances'][0]
   > = new MatTableDataSource();
+
   public displayedColumns: string[] = ['date', 'value', 'actions'];
+  public Validators = Validators;
 
   private unsubscribeSubject = new Subject<void>();
 
-  public accountBalanceForm = new FormGroup({
-    balance: new FormControl(0, Validators.required),
-    date: new FormControl(new Date(), Validators.required)
-  });
-
   public constructor(private dateAdapter: DateAdapter<any>) {}
 
   public ngOnInit() {