Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/rename Analytics to analytics in User database schema (#5032)

Thomas Kaul5dfe9b54fea7
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index deb48b7bba..ed55198f0b 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -648,7 +648,7 @@ export class AdminService {
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
where = {
NOT: {
- Analytics: null
+ analytics: null
}
};
}
@@ -806,13 +806,13 @@ export class AdminService {
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
orderBy = {
- Analytics: {
+ analytics: {
lastRequestAt: 'desc'
}
};
where = {
NOT: {
- Analytics: null
+ analytics: null
}
};
}
@@ -826,7 +826,7 @@ export class AdminService {
_count: {
select: { accounts: true, activities: true }
},
- Analytics: {
+ analytics: {
select: {
activityCount: true,
country: true,
@@ -852,11 +852,11 @@ export class AdminService {
});
return usersWithAnalytics.map(
- ({ _count, Analytics, createdAt, id, role, subscriptions }) => {
+ ({ _count, analytics, createdAt, id, role, subscriptions }) => {
const daysSinceRegistration =
differenceInDays(new Date(), createdAt) + 1;
- const engagement = Analytics
- ? Analytics.activityCount / daysSinceRegistration
+ const engagement = analytics
+ ? analytics.activityCount / daysSinceRegistration
: undefined;
const subscription =
@@ -873,9 +873,9 @@ export class AdminService {
subscription,
accountCount: _count.accounts || 0,
activityCount: _count.activities || 0,
- country: Analytics?.country,
- dailyApiRequests: Analytics?.dataProviderGhostfolioDailyRequests || 0,
- lastActivity: Analytics?.updatedAt
+ country: analytics?.country,
+ dailyApiRequests: analytics?.dataProviderGhostfolioDailyRequests || 0,
+ lastActivity: analytics?.updatedAt
};
}
);
diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.ts
index 9581807b93..327245adee 100644
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@@ -133,11 +133,11 @@ export class InfoService {
AND: [
{
NOT: {
- Analytics: null
+ analytics: null
}
},
{
- Analytics: {
+ analytics: {
lastRequestAt: {
gt: subDays(new Date(), aDays)
}
@@ -216,7 +216,7 @@ export class InfoService {
AND: [
{
NOT: {
- Analytics: null
+ analytics: null
}
},
{
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 7499048033..a229e36c49 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -182,7 +182,7 @@ export class UserService {
Access,
accessToken,
accounts,
- Analytics,
+ analytics,
authChallenge,
createdAt,
id,
@@ -198,7 +198,7 @@ export class UserService {
accounts: {
include: { platform: true }
},
- Analytics: true,
+ analytics: true,
Settings: true,
subscriptions: true
},
@@ -217,9 +217,9 @@ export class UserService {
Settings: Settings as UserWithSettings['Settings'],
thirdPartyId,
updatedAt,
- activityCount: Analytics?.activityCount,
+ activityCount: analytics?.activityCount,
dataProviderGhostfolioDailyRequests:
- Analytics?.dataProviderGhostfolioDailyRequests
+ analytics?.dataProviderGhostfolioDailyRequests
};
if (user?.Settings) {
@@ -388,7 +388,7 @@ export class UserService {
frequency = 6;
}
- if (Analytics?.activityCount % frequency === 1) {
+ if (analytics?.activityCount % frequency === 1) {
currentPermissions.push(permissions.enableSubscriptionInterstitial);
}
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index f1950569df..3d821987de 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -247,6 +247,7 @@ model User {
accessToken String?
accounts Account[]
activities Order[]
+ analytics Analytics?
apiKeys ApiKey[]
authChallenge String?
createdAt DateTime @default(now())
@@ -260,7 +261,6 @@ model User {
watchlist SymbolProfile[] @relation("UserWatchlist")
Access Access[] @relation("accessGet")
AccessGive Access[] @relation("accessGive")
- Analytics Analytics?
AuthDevice AuthDevice[]
Settings Settings?
SymbolProfile SymbolProfile[]