Skip to content

Commit fd8310f

Browse files
committed
fix: replace PostgresJsDatabase with DB type in worker constructors for consistency
1 parent 8584730 commit fd8310f

File tree

7 files changed

+14
-21
lines changed

7 files changed

+14
-21
lines changed

controlplane/src/core/workers/AIGraphReadme.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
21
import { ConnectionOptions, Job } from 'bullmq';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { OpenAIGraphql } from '../openai-graphql/index.js';
64
import { SubgraphRepository } from '../repositories/SubgraphRepository.js';
75
import { FederatedGraphRepository } from '../repositories/FederatedGraphRepository.js';
86
import { BaseQueue, BaseWorker } from './base/index.js';
7+
import { DB } from 'src/db/index.js';
98

109
const QueueName = 'ai.graph-readme-generator';
1110
const WorkerName = 'AIGraphReadmeWorker';
@@ -61,7 +60,7 @@ export class AIGraphReadmeWorker extends BaseWorker<CreateReadmeInputEvent> {
6160
constructor(
6261
private input: {
6362
redisConnection: ConnectionOptions;
64-
db: PostgresJsDatabase<typeof schema>;
63+
db: DB;
6564
logger: pino.Logger;
6665
openAiApiKey: string;
6766
},

controlplane/src/core/workers/CacheWarmer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
2-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { BlobStorage } from '../blobstorage/index.js';
64
import { ClickHouseClient } from '../clickhouse/index.js';
75
import { S3RouterConfigMetadata } from '../composition/composer.js';
86
import { CacheWarmerRepository } from '../repositories/CacheWarmerRepository.js';
97
import { BaseQueue, BaseWorker } from './base/index.js';
8+
import { DB } from 'src/db/index.js';
109

1110
const QueueName = 'cache.warmer';
1211
const WorkerName = 'CacheWarmerWorker';
@@ -50,7 +49,7 @@ export class CacheWarmerWorker extends BaseWorker<CacheWarmerInput> {
5049
constructor(
5150
private input: {
5251
redisConnection: ConnectionOptions;
53-
db: PostgresJsDatabase<typeof schema>;
52+
db: DB;
5453
logger: pino.Logger;
5554
chClient: ClickHouseClient | undefined;
5655
blobStorage: BlobStorage;

controlplane/src/core/workers/DeactivateOrganization.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
2-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { OrganizationRepository } from '../repositories/OrganizationRepository.js';
64
import Keycloak from '../services/Keycloak.js';
75
import { DeleteOrganizationQueue } from './DeleteOrganization.js';
86
import { BaseQueue, BaseWorker } from './base/index.js';
7+
import { DB } from 'src/db/index.js';
98

109
const QueueName = 'organization.deactivate';
1110
const WorkerName = 'DeactivateOrganizationWorker';
@@ -42,7 +41,7 @@ export class DeactivateOrganizationWorker extends BaseWorker<DeactivateOrganizat
4241
constructor(
4342
private input: {
4443
redisConnection: ConnectionOptions;
45-
db: PostgresJsDatabase<typeof schema>;
44+
db: DB;
4645
logger: pino.Logger;
4746
keycloakClient: Keycloak;
4847
keycloakRealm: string;

controlplane/src/core/workers/DeleteOrganization.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
2-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { OrganizationRepository } from '../repositories/OrganizationRepository.js';
64
import Keycloak from '../services/Keycloak.js';
75
import { OidcRepository } from '../repositories/OidcRepository.js';
86
import OidcProvider from '../services/OidcProvider.js';
97
import { BlobStorage } from '../blobstorage/index.js';
108
import { DeleteOrganizationAuditLogsQueue } from './DeleteOrganizationAuditLogs.js';
119
import { BaseQueue, BaseWorker } from './base/index.js';
10+
import { DB } from 'src/db/index.js';
1211

1312
const QueueName = 'organization.delete';
1413
const WorkerName = 'DeleteOrganizationWorker';
@@ -42,7 +41,7 @@ export class DeleteOrganizationWorker extends BaseWorker<DeleteOrganizationInput
4241
constructor(
4342
private input: {
4443
redisConnection: ConnectionOptions;
45-
db: PostgresJsDatabase<typeof schema>;
44+
db: DB;
4645
logger: pino.Logger;
4746
keycloakClient: Keycloak;
4847
keycloakRealm: string;

controlplane/src/core/workers/DeleteOrganizationAuditLogs.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
2-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { AuditLogRepository } from '../repositories/AuditLogRepository.js';
64
import { BaseQueue, BaseWorker } from './base/index.js';
5+
import { DB } from 'src/db/index.js';
76

87
const QueueName = 'organization.delete_audit_logs';
98
const WorkerName = 'DeleteOrganizationAuditLogsWorker';
@@ -37,7 +36,7 @@ export class DeleteOrganizationAuditLogsWorker extends BaseWorker<DeleteOrganiza
3736
constructor(
3837
private input: {
3938
redisConnection: ConnectionOptions;
40-
db: PostgresJsDatabase<typeof schema>;
39+
db: DB;
4140
logger: pino.Logger;
4241
},
4342
) {

controlplane/src/core/workers/DeleteUser.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { PlatformEventName } from '@wundergraph/cosmo-connect/dist/notifications/events_pb';
22
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
3-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
43
import pino from 'pino';
5-
import * as schema from '../../db/schema.js';
64
import { BlobStorage } from '../blobstorage/index.js';
75
import { OrganizationRepository } from '../repositories/OrganizationRepository.js';
86
import { UserRepository } from '../repositories/UserRepository.js';
97
import Keycloak from '../services/Keycloak.js';
108
import { PlatformWebhookService } from '../webhooks/PlatformWebhookService.js';
119
import { BaseQueue, BaseWorker } from './base/index.js';
1210
import { DeleteOrganizationAuditLogsQueue } from './DeleteOrganizationAuditLogs.js';
11+
import { DB } from 'src/db/index.js';
1312

1413
const QueueName = 'user.delete';
1514
const WorkerName = 'DeleteUserWorker';
@@ -43,7 +42,7 @@ export class DeleteUserQueue extends BaseQueue<DeleteUserInput> {
4342
export class DeleteUserWorker extends BaseWorker<DeleteUserInput> {
4443
constructor(
4544
private input: {
46-
db: PostgresJsDatabase<typeof schema>;
45+
db: DB;
4746
redisConnection: ConnectionOptions;
4847
logger: pino.Logger;
4948
keycloakClient: Keycloak;

controlplane/src/core/workers/ReactivateOrganization.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { ConnectionOptions, Job, JobsOptions } from 'bullmq';
2-
import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
32
import pino from 'pino';
4-
import * as schema from '../../db/schema.js';
53
import { OrganizationRepository } from '../repositories/OrganizationRepository.js';
64
import { DeleteOrganizationQueue } from './DeleteOrganization.js';
75
import { BaseQueue, BaseWorker } from './base/index.js';
6+
import { DB } from 'src/db/index.js';
87

98
const QueueName = 'organization.reactivate';
109
const WorkerName = 'ReactivateOrganizationWorker';
@@ -39,7 +38,7 @@ export class ReactivateOrganizationWorker extends BaseWorker<ReactivateOrganizat
3938
constructor(
4039
private input: {
4140
redisConnection: ConnectionOptions;
42-
db: PostgresJsDatabase<typeof schema>;
41+
db: DB;
4342
logger: pino.Logger;
4443
deleteOrganizationQueue: DeleteOrganizationQueue;
4544
},

0 commit comments

Comments
 (0)