Refactoring

apps/api/src/app/user/user.service.ts

@@ -14,7 +14,6 @@ import {
   hasRole,
   permissions
 } from '@ghostfolio/common/permissions';
-import { AnalyticsEventType } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { Prisma, Role, User } from '@prisma/client';
 import { sortBy } from 'lodash';
@@ -261,12 +260,10 @@ export class UserService {
     });
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      await this.prismaService.analyticsEvent.create({
+      await this.prismaService.analytics.create({
         data: {
-          data: {
-            country
-          },
-          type: <AnalyticsEventType>'createUser'
+          country,
+          User: { connect: { id: user.id } }
         }
       });
     }

apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts

@@ -19,7 +19,7 @@ export class SubscriptionInterstitialDialog {
     public dialogRef: MatDialogRef<SubscriptionInterstitialDialog>
   ) {}
 
-  public onCancel() {
+  public closeDialog() {
     this.dialogRef.close({});
   }
 }

apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html

@@ -34,8 +34,13 @@
   <p>Refine your personal investment strategy now.</p>
 </div>
 <div class="justify-content-end" mat-dialog-actions>
-  <button i18n mat-button (click)="onCancel()">Skip</button>
-  <a color="primary" mat-flat-button [routerLink]="['/pricing']">
+  <button i18n mat-button (click)="closeDialog()">Skip</button>
+  <a
+    color="primary"
+    mat-flat-button
+    [routerLink]="['/pricing']"
+    (click)="closeDialog()"
+  >
     <span i18n>Upgrade Plan</span>
     <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>
   </a>

libs/common/src/lib/types/analyticsEventType.type.ts

@@ -1 +0,0 @@
-export type AnalyticsEventType = 'createUser';

libs/common/src/lib/types/index.ts

@@ -1,7 +1,6 @@
 import type { AccessWithGranteeUser } from './access-with-grantee-user.type';
 import { AccountWithPlatform } from './account-with-platform.type';
 import { AccountWithValue } from './account-with-value.type';
-import { AnalyticsEventType } from './analyticsEventType.type';
 import type { ColorScheme } from './color-scheme';
 import type { DateRange } from './date-range.type';
 import type { Granularity } from './granularity.type';
@@ -17,7 +16,6 @@ export type {
   AccessWithGranteeUser,
   AccountWithPlatform,
   AccountWithValue,
-  AnalyticsEventType,
   ColorScheme,
   DateRange,
   Granularity,

prisma/schema.prisma

@@ -41,18 +41,12 @@ model Account {
 
 model Analytics {
   activityCount Int      @default(0)
+  country       String?
   updatedAt     DateTime @updatedAt
   userId        String   @id
   User          User     @relation(fields: [userId], references: [id])
 }
 
-model AnalyticsEvent {
-  createdAt DateTime @default(now())
-  data      Json?
-  id        String   @id @default(uuid())
-  type      String
-}
-
 model AuthDevice {
   createdAt           DateTime @default(now())
   credentialId        Bytes