sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/add lastRequestAt to analytics (#4010)

Browse Source 
* Add lastRequestAt to Analytics
This commit is contained in:
Thomas Kaul 2024-11-02 13:45:26 +01:00 committed by GitHub
parent 5f56812125
commit a80ca507f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/app/admin/admin.service.ts
View File

@ -641,7 +641,7 @@ export class AdminService {
} }
private async getUsersWithAnalytics(): Promise<AdminUsers['users']> { private async getUsersWithAnalytics(): Promise<AdminUsers['users']> {
let orderBy: any = { let orderBy: Prisma.UserOrderByWithRelationInput = {
createdAt: 'desc' createdAt: 'desc'
}; };
let where: Prisma.UserWhereInput; let where: Prisma.UserWhereInput;
@ -649,7 +649,7 @@ export class AdminService {
if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) { if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
orderBy = { orderBy = {
Analytics: { Analytics: {
updatedAt: 'desc' lastRequestAt: 'desc'
} }
}; };
where = { where = {

2
apps/api/src/app/auth/jwt.strategy.ts
View File

@ -46,7 +46,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
update: { update: {
country, country,
activityCount: { increment: 1 }, activityCount: { increment: 1 },
updatedAt: new Date() lastRequestAt: new Date()
}, },
where: { userId: user.id } where: { userId: user.id }
}); });

2
apps/api/src/app/info/info.service.ts
View File

@ -142,7 +142,7 @@ export class InfoService {
}, },
{ {
Analytics: { Analytics: {
updatedAt: { lastRequestAt: {
gt: subDays(new Date(), aDays) gt: subDays(new Date(), aDays)
} }
} }

5
prisma/migrations/20241102121004_added_last_request_at_to_analytics/migration.sql Normal file
View File

@ -0,0 +1,5 @@
-- AlterTable
ALTER TABLE "Analytics" ADD COLUMN "lastRequestAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
-- CreateIndex
CREATE INDEX "Analytics_lastRequestAt_idx" ON "Analytics"("lastRequestAt");

2
prisma/schema.prisma
View File

@ -68,10 +68,12 @@ model Analytics {
activityCount Int @default(0) activityCount Int @default(0)
country String? country String?
dataProviderGhostfolioDailyRequests Int @default(0) dataProviderGhostfolioDailyRequests Int @default(0)
lastRequestAt DateTime @default(now())
updatedAt DateTime @updatedAt updatedAt DateTime @updatedAt
userId String @id userId String @id
User User @relation(fields: [userId], onDelete: Cascade, references: [id]) User User @relation(fields: [userId], onDelete: Cascade, references: [id])
@@index([lastRequestAt])
@@index([updatedAt]) @@index([updatedAt])
} }