Merge pull request #183 from game-node-app/dev

refactored playtime watch job scheduling logic

Author: Lamarcke

src/connections/connections.service.ts

@@ -205,7 +205,7 @@ export class ConnectionsService {
 
     private onConnectionCreate(createdConnection: UserConnection) {
         this.playtimeWatchService
-            .registerManualJob(
+            .registerJob(
                 createdConnection.profileUserId,
                 createdConnection.type,
             )

src/game/external-game/external-game-mappings.service.ts

@@ -16,12 +16,16 @@ export class ExternalGameMappingsService {
             "id" | "createdAt" | "deletedAt" | "updatedAt" | "externalGame"
         >,
     ) {
-        await this.psnExtraMappingsRepository.upsert(
+        const existingMapping = await this.psnExtraMappingsRepository.findOneBy(
             {
-                ...mappings,
-                id: null as never,
+                externalGameId: mappings.externalGameId,
+                npServiceName: mappings.npServiceName,
+                npCommunicationId: mappings.npCommunicationId,
             },
-            ["externalGameId", "npServiceName", "npCommunicationId"],
         );
+
+        if (!existingMapping) {
+            await this.psnExtraMappingsRepository.insert(mappings);
+        }
     }
 }

src/playtime/watch/playtime-watch.processor.ts

@@ -23,7 +23,7 @@ import * as process from "process";
 import { seconds } from "@nestjs/throttler";
 
 @Processor(PLAYTIME_WATCH_QUEUE_NAME, {
-    concurrency: 4,
+    concurrency: 1,
     limiter:
         process.env.NODE_ENV === "development"
             ? {

src/playtime/watch/playtime-watch.service.ts

@@ -1,9 +1,8 @@
 import { forwardRef, Inject, Injectable, Logger } from "@nestjs/common";
 import { Queue } from "bullmq";
 import { InjectQueue } from "@nestjs/bullmq";
-import { Interval } from "@nestjs/schedule";
+import { Cron } from "@nestjs/schedule";
 import { ConnectionsService } from "../../connections/connections.service";
-import { hours } from "@nestjs/throttler";
 import {
     PLAYTIME_WATCH_QUEUE_JOB_NAME,
     PLAYTIME_WATCH_QUEUE_NAME,
@@ -23,11 +22,10 @@ export class PlaytimeWatchService {
         private readonly librariesService: LibrariesService,
         @Inject(forwardRef(() => ConnectionsService))
         private readonly connectionsService: ConnectionsService,
-    ) {
-        this.registerWatchJobs();
-    }
+    ) {}
 
-    @Interval(hours(6))
+    // “At minute 0 past hour 6, 12, 18, and 0.”
+    @Cron("0 6,12,18,0 * * *")
     async registerWatchJobs() {
         const userLibraries = await this.librariesService.findAllLibraries();
         const userIds = userLibraries.map((library) => library.userId);
@@ -47,25 +45,14 @@ export class PlaytimeWatchService {
         }
 
         for (const viableConnection of viableConnections) {
-            const source = connectionToPlaytimeSource(viableConnection.type);
-            this.playtimeWatchQueue
-                .add(
-                    PLAYTIME_WATCH_QUEUE_JOB_NAME,
-                    {
-                        userId: viableConnection.profileUserId,
-                        source: source,
-                    },
-                    {
-                        jobId: `playtime-watch-${viableConnection.profileUserId}-${source}`,
-                    },
-                )
-                .catch((err) => {
-                    this.logger.error(err);
-                });
+            await this.registerJob(
+                viableConnection.profileUserId,
+                viableConnection.type,
+            );
         }
     }
 
-    async registerManualJob(userId: string, source: EConnectionType) {
+    async registerJob(userId: string, source: EConnectionType) {
         const playtimeSource = connectionToPlaytimeSource(source);
 
         this.playtimeWatchQueue

src/sync/psn/psn-sync.service.ts

@@ -21,13 +21,7 @@ import { Cacheable } from "../../utils/cacheable";
 export class PsnSyncService {
     private readonly logger = new Logger(PsnSyncService.name);
 
-    constructor(private readonly authService: PsnSyncAuthService) {
-        // this.getGames("5847504196784127951", 0, 1);
-        // this.getAllGames("5847504196784127951");
-        // this.getUserTrophyTitles("1588575164307436368");
-        // this.getGameAchievements("NPWR00951_00", "trophy");
-        // this.getGameAchievementGroups("NPWR36088_00", "trophy2");
-    }
+    constructor(private readonly authService: PsnSyncAuthService) {}
 
     public async resolveUserInfo(
         userIdentifier: string,