Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/extend user detail dialog of admin control with subscriptions (#7078)
Thomas Kaulbf39fd89d23b
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex 46ab25e969..f08fb6a377 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -240,6 +240,24 @@ export class AdminService {throw new NotFoundException(`User with ID ${id} not found`);}+ if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {+ const subscriptions = await this.prismaService.subscription.findMany({+ orderBy: {+ expiresAt: 'desc'+ },+ where: {+ userId: id+ }+ });++ user.subscriptions = subscriptions.map((subscription) => {+ return {+ ...subscription,+ price: subscription.price ?? 0+ };+ });+ }+return user;}diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.tsindex 05001a6bb8..7b008786d5 100644--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts@@ -1,5 +1,6 @@+import { getSum } from '@ghostfolio/common/helper';import { AdminUserResponse } from '@ghostfolio/common/interfaces';-import { AdminService } from '@ghostfolio/ui/services';+import { AdminService, DataService } from '@ghostfolio/ui/services';import { GfValueComponent } from '@ghostfolio/ui/value';import {@@ -16,7 +17,11 @@ import { MatButtonModule } from '@angular/material/button';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';import { MatDialogModule } from '@angular/material/dialog';import { MatMenuModule } from '@angular/material/menu';+import { MatTableDataSource, MatTableModule } from '@angular/material/table';import { IonIcon } from '@ionic/angular/standalone';+import { Subscription } from '@prisma/client';+import { Big } from 'big.js';+import { differenceInDays } from 'date-fns';import { addIcons } from 'ionicons';import { ellipsisVertical } from 'ionicons/icons';import { EMPTY } from 'rxjs';@@ -35,7 +40,8 @@ import {IonIcon,MatButtonModule,MatDialogModule,- MatMenuModule+ MatMenuModule,+ MatTableModule],schemas: [CUSTOM_ELEMENTS_SCHEMA],selector: 'gf-user-detail-dialog',@@ -43,18 +49,29 @@ import {templateUrl: './user-detail-dialog.html'})export class GfUserDetailDialogComponent implements OnInit {+ public baseCurrency: string;+ public subscriptionsDataSource = new MatTableDataSource<Subscription>();+ public subscriptionsDisplayedColumns = [+ 'createdAt',+ 'type',+ 'price',+ 'expiresAt'+ ];public user: AdminUserResponse;public constructor(private adminService: AdminService,private changeDetectorRef: ChangeDetectorRef,@Inject(MAT_DIALOG_DATA) public data: UserDetailDialogParams,+ private dataService: DataService,private destroyRef: DestroyRef,public dialogRef: MatDialogRef<GfUserDetailDialogComponent,UserDetailDialogResult>) {+ this.baseCurrency = this.dataService.fetchInfo().baseCurrency;+addIcons({ellipsisVertical});@@ -74,6 +91,8 @@ export class GfUserDetailDialogComponent implements OnInit {.subscribe((user) => {this.user = user;+ this.subscriptionsDataSource.data = this.user.subscriptions ?? [];+this.changeDetectorRef.markForCheck();});}@@ -85,6 +104,24 @@ export class GfUserDetailDialogComponent implements OnInit {});}+ public getSum() {+ return getSum(+ this.subscriptionsDataSource.data.map(({ price }) => {+ return new Big(price);+ })+ ).toNumber();+ }++ public getType({ createdAt, expiresAt, price }: Subscription) {+ if (price) {+ return $localize`Paid`;+ }++ return differenceInDays(expiresAt, createdAt) <= 90+ ? $localize`Trial`+ : $localize`Coupon`;+ }+public onClose() {this.dialogRef.close();}diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.htmlindex caf1679ebf..df935c780a 100644--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html@@ -124,6 +124,102 @@></div></div>++ @if (subscriptionsDataSource.data.length > 0) {+ <div class="row">+ <div class="col">+ <h2 class="h6" i18n>Subscriptions</h2>+ <div class="overflow-x-auto">+ <table+ class="gf-table w-100"+ mat-table+ [dataSource]="subscriptionsDataSource"+ >+ <ng-container matColumnDef="createdAt">+ <th *matHeaderCellDef class="px-1" mat-header-cell>+ <ng-container i18n>Created</ng-container>+ </th>+ <td *matCellDef="let element" class="px-1" mat-cell>+ <gf-value+ [isDate]="true"+ [locale]="data.locale"+ [value]="element.createdAt"+ />+ </td>+ <td *matFooterCellDef class="px-1" i18n mat-footer-cell>+ Total+ </td>+ </ng-container>++ <ng-container matColumnDef="type">+ <th *matHeaderCellDef class="px-1" mat-header-cell>+ <ng-container i18n>Type</ng-container>+ </th>+ <td *matCellDef="let element" class="px-1" mat-cell>+ {{ getType(element) }}+ </td>+ <td *matFooterCellDef class="px-1" mat-footer-cell></td>+ </ng-container>++ <ng-container matColumnDef="price">+ <th *matHeaderCellDef class="px-1 text-right" mat-header-cell>+ <ng-container i18n>Price</ng-container>+ </th>+ <td+ *matCellDef="let element"+ class="px-1 text-right"+ mat-cell+ >+ <gf-value+ class="d-inline-block justify-content-end"+ [isCurrency]="true"+ [locale]="data.locale"+ [unit]="baseCurrency"+ [value]="element.price"+ />+ </td>+ <td *matFooterCellDef class="px-1 text-right" mat-footer-cell>+ <gf-value+ class="d-inline-block justify-content-end"+ [isCurrency]="true"+ [locale]="data.locale"+ [unit]="baseCurrency"+ [value]="getSum()"+ />+ </td>+ </ng-container>++ <ng-container matColumnDef="expiresAt">+ <th *matHeaderCellDef class="px-1" mat-header-cell>+ <ng-container i18n>Expires</ng-container>+ </th>+ <td *matCellDef="let element" class="px-1" mat-cell>+ <gf-value+ [isDate]="true"+ [locale]="data.locale"+ [value]="element.expiresAt"+ />+ </td>+ <td *matFooterCellDef class="px-1" mat-footer-cell></td>+ </ng-container>++ <tr+ *matHeaderRowDef="subscriptionsDisplayedColumns"+ mat-header-row+ ></tr>+ <tr+ *matRowDef="let row; columns: subscriptionsDisplayedColumns"+ mat-row+ ></tr>+ <tr+ *matFooterRowDef="subscriptionsDisplayedColumns"+ mat-footer-row+ ></tr>+ </table>+ </div>+ </div>+ </div>+ }}</div></div>diff --git a/libs/common/src/lib/interfaces/admin-user.interface.ts b/libs/common/src/lib/interfaces/admin-user.interface.tsindex 4cb02b16ec..a7cda68a81 100644--- a/libs/common/src/lib/interfaces/admin-user.interface.ts+++ b/libs/common/src/lib/interfaces/admin-user.interface.ts@@ -12,4 +12,5 @@ export interface AdminUser {provider: Provider;role: Role;subscription?: Subscription;+ subscriptions?: Subscription[];}