From 90dee4e12ca6ba61424836950e489247129c4e93 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 5 Feb 2023 18:13:19 +0100
Subject: [PATCH] Refactoring

---
 apps/api/src/app/user/user.service.ts                    | 9 +++------
 .../subscription-interstitial-dialog.component.ts        | 2 +-
 .../subscription-interstitial-dialog.html                | 9 +++++++--
 libs/common/src/lib/types/analyticsEventType.type.ts     | 1 -
 libs/common/src/lib/types/index.ts                       | 2 --
 prisma/schema.prisma                                     | 8 +-------
 6 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 libs/common/src/lib/types/analyticsEventType.type.ts

diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 55752c78a..7f02c86af 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/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 } }
         }
       });
     }
diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
index 4f5b43fe4..de93be298 100644
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
+++ b/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({});
   }
 }
diff --git a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
index a45bb42a8..22ba74715 100644
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
+++ b/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>
diff --git a/libs/common/src/lib/types/analyticsEventType.type.ts b/libs/common/src/lib/types/analyticsEventType.type.ts
deleted file mode 100644
index 590119f3b..000000000
--- a/libs/common/src/lib/types/analyticsEventType.type.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type AnalyticsEventType = 'createUser';
diff --git a/libs/common/src/lib/types/index.ts b/libs/common/src/lib/types/index.ts
index d8c7fa9d9..255a1c3fe 100644
--- a/libs/common/src/lib/types/index.ts
+++ b/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,
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 9f4c860d1..ae5f29dee 100644
--- a/prisma/schema.prisma
+++ b/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