Browse Source

Rename Analytics to analytics in User database schema

pull/5032/head
Thomas Kaul 7 days ago
parent
commit
4c6d510ffb
  1. 20
      apps/api/src/app/admin/admin.service.ts
  2. 6
      apps/api/src/app/info/info.service.ts
  3. 10
      apps/api/src/app/user/user.service.ts

20
apps/api/src/app/admin/admin.service.ts

@ -648,7 +648,7 @@ export class AdminService {
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) { if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
where = { where = {
NOT: { NOT: {
Analytics: null analytics: null
} }
}; };
} }
@ -806,13 +806,13 @@ export class AdminService {
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) { if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
orderBy = { orderBy = {
Analytics: { analytics: {
lastRequestAt: 'desc' lastRequestAt: 'desc'
} }
}; };
where = { where = {
NOT: { NOT: {
Analytics: null analytics: null
} }
}; };
} }
@ -826,7 +826,7 @@ export class AdminService {
_count: { _count: {
select: { accounts: true, activities: true } select: { accounts: true, activities: true }
}, },
Analytics: { analytics: {
select: { select: {
activityCount: true, activityCount: true,
country: true, country: true,
@ -852,11 +852,11 @@ export class AdminService {
}); });
return usersWithAnalytics.map( return usersWithAnalytics.map(
({ _count, Analytics, createdAt, id, role, subscriptions }) => { ({ _count, analytics, createdAt, id, role, subscriptions }) => {
const daysSinceRegistration = const daysSinceRegistration =
differenceInDays(new Date(), createdAt) + 1; differenceInDays(new Date(), createdAt) + 1;
const engagement = Analytics const engagement = analytics
? Analytics.activityCount / daysSinceRegistration ? analytics.activityCount / daysSinceRegistration
: undefined; : undefined;
const subscription = const subscription =
@ -873,9 +873,9 @@ export class AdminService {
subscription, subscription,
accountCount: _count.accounts || 0, accountCount: _count.accounts || 0,
activityCount: _count.activities || 0, activityCount: _count.activities || 0,
country: Analytics?.country, country: analytics?.country,
dailyApiRequests: Analytics?.dataProviderGhostfolioDailyRequests || 0, dailyApiRequests: analytics?.dataProviderGhostfolioDailyRequests || 0,
lastActivity: Analytics?.updatedAt lastActivity: analytics?.updatedAt
}; };
} }
); );

6
apps/api/src/app/info/info.service.ts

@ -133,11 +133,11 @@ export class InfoService {
AND: [ AND: [
{ {
NOT: { NOT: {
Analytics: null analytics: null
} }
}, },
{ {
Analytics: { analytics: {
lastRequestAt: { lastRequestAt: {
gt: subDays(new Date(), aDays) gt: subDays(new Date(), aDays)
} }
@ -216,7 +216,7 @@ export class InfoService {
AND: [ AND: [
{ {
NOT: { NOT: {
Analytics: null analytics: null
} }
}, },
{ {

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

@ -182,7 +182,7 @@ export class UserService {
Access, Access,
accessToken, accessToken,
accounts, accounts,
Analytics, analytics,
authChallenge, authChallenge,
createdAt, createdAt,
id, id,
@ -198,7 +198,7 @@ export class UserService {
accounts: { accounts: {
include: { platform: true } include: { platform: true }
}, },
Analytics: true, analytics: true,
Settings: true, Settings: true,
subscriptions: true subscriptions: true
}, },
@ -217,9 +217,9 @@ export class UserService {
Settings: Settings as UserWithSettings['Settings'], Settings: Settings as UserWithSettings['Settings'],
thirdPartyId, thirdPartyId,
updatedAt, updatedAt,
activityCount: Analytics?.activityCount, activityCount: analytics?.activityCount,
dataProviderGhostfolioDailyRequests: dataProviderGhostfolioDailyRequests:
Analytics?.dataProviderGhostfolioDailyRequests analytics?.dataProviderGhostfolioDailyRequests
}; };
if (user?.Settings) { if (user?.Settings) {
@ -380,7 +380,7 @@ export class UserService {
frequency = 6; frequency = 6;
} }
if (Analytics?.activityCount % frequency === 1) { if (analytics?.activityCount % frequency === 1) {
currentPermissions.push(permissions.enableSubscriptionInterstitial); currentPermissions.push(permissions.enableSubscriptionInterstitial);
} }

Loading…
Cancel
Save