fix: queue hours default env (#513)

Author: fenos

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Prettier checks
         run: |
-          npm run prettier:check
+          npm run lint
 
       - name: ESLint checks
         run: |

package.json

@@ -7,13 +7,13 @@
     "dev": "tsx watch src/start/server.ts | pino-pretty",
     "build": "node ./build.js && resolve-tspaths",
     "start": "NODE_ENV=production node dist/start/server.js",
-    "migration:run": "tsx ./src/scripts/migrate-call.ts",
+    "format": "prettier -c --write src/**",
+    "lint": "prettier -v && prettier -c src/**",
+    "migration:run": "tsx src/scripts/migrate.ts",
     "docs:export": "tsx ./src/scripts/export-docs.ts",
     "test:dummy-data": "tsx -r dotenv/config ./src/test/db/import-dummy-data.ts",
     "test": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --forceExit",
     "test:coverage": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --coverage --forceExit",
-    "prettier:check": "prettier -v && prettier -c src/**",
-    "format": "prettier -c --write src/**",
     "eslint:check": "eslint 'src/**'",
     "infra:stop": "docker compose --project-directory . -f ./.docker/docker-compose-infra.yml down --remove-orphans",
     "infra:start": "docker compose --project-directory . -f ./.docker/docker-compose-infra.yml up -d && sleep 5 && npm run migration:run",

src/internal/queue/event.ts

@@ -37,6 +37,9 @@ interface BaseEventConstructor<Base extends Event<any>> {
   getWorkerOptions(): WorkOptions | BatchWorkOptions
 }
 
+/**
+ * Base class for all events that are sent to the queue
+ */
 export abstract class Event<T extends Omit<BasePayload, '$version'>> {
   public static readonly version: string = 'v1'
   protected static queueName = ''

src/internal/queue/queue.ts

@@ -53,6 +53,10 @@ export abstract class Queue {
       url = multitenantDatabaseUrl
     }
 
+    console.log({
+      deleteAfterDays: pgQueueDeleteAfterDays,
+      deleteAfterHours: pgQueueDeleteAfterHours,
+    })
     Queue.pgBoss = new PgBoss({
       connectionString: url,
       db: new QueueDB({
@@ -63,7 +67,7 @@ export abstract class Queue {
       }),
       application_name: 'storage-pgboss',
       deleteAfterDays: pgQueueDeleteAfterHours ? undefined : pgQueueDeleteAfterDays,
-      deleteAfterHours: pgQueueDeleteAfterHours,
+      ...(pgQueueDeleteAfterHours ? { deleteAfterHours: pgQueueDeleteAfterHours } : {}),
       archiveCompletedAfterSeconds: pgQueueArchiveCompletedAfterSeconds,
       retentionDays: pgQueueRetentionDays,
       retryBackoff: true,

src/scripts/migrate-call.ts renamed to src/scripts/migrate.ts

@@ -1,7 +1,7 @@
 import dotenv from 'dotenv'
 dotenv.config()
 
-import { runMigrationsOnTenant } from '../internal/database'
+import { runMigrationsOnTenant } from '@internal/database'
 ;(async () => {
   await runMigrationsOnTenant(process.env.DATABASE_URL as string)
 })()

src/storage/events/base-event.ts

@@ -2,7 +2,7 @@ import { Event as QueueBaseEvent, BasePayload, StaticThis, Event } from '@intern
 import { getPostgresConnection, getServiceKeyUser } from '@internal/database'
 import { StorageKnexDB } from '../database'
 import { createAgent, createStorageBackend } from '../backend'
-import { Storage } from '../index'
+import { Storage } from '../storage'
 import { getConfig } from '../../config'
 import { logger } from '@internal/monitoring'