From e1f9d97b9db348a8afcfbbd56c75ca7a94696649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20L=C3=B3pez?= Date: Tue, 4 Mar 2025 10:30:28 +0100 Subject: [PATCH 1/2] feat: move routing protocol module and interfaces --- .../job-launcher/server/src/modules/job/job.module.ts | 6 +++--- .../server/src/modules/job/job.service.ts | 2 +- .../routing-protocol.interface.ts | 0 .../routing-protocol/routing-protocol.module.ts | 11 +++++++++++ .../routing-protocol.service.spec.ts | 0 .../routing-protocol.service.ts | 0 6 files changed, 15 insertions(+), 4 deletions(-) rename packages/apps/job-launcher/server/src/modules/{job => routing-protocol}/routing-protocol.interface.ts (100%) create mode 100644 packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.module.ts rename packages/apps/job-launcher/server/src/modules/{job => routing-protocol}/routing-protocol.service.spec.ts (100%) rename packages/apps/job-launcher/server/src/modules/{job => routing-protocol}/routing-protocol.service.ts (100%) diff --git a/packages/apps/job-launcher/server/src/modules/job/job.module.ts b/packages/apps/job-launcher/server/src/modules/job/job.module.ts index 846e80aa9e..71795c5100 100644 --- a/packages/apps/job-launcher/server/src/modules/job/job.module.ts +++ b/packages/apps/job-launcher/server/src/modules/job/job.module.ts @@ -9,7 +9,6 @@ import { HttpModule } from '@nestjs/axios'; import { PaymentModule } from '../payment/payment.module'; import { JobRepository } from './job.repository'; import { Web3Module } from '../web3/web3.module'; -import { RoutingProtocolService } from './routing-protocol.service'; import { EncryptionModule } from '../encryption/encryption.module'; import { StorageModule } from '../storage/storage.module'; import { AuthModule } from '../auth/auth.module'; @@ -18,6 +17,7 @@ import { WebhookRepository } from '../webhook/webhook.repository'; import { MutexManagerService } from '../mutex/mutex-manager.service'; import { QualificationModule } from '../qualification/qualification.module'; import { WhitelistModule } from '../whitelist/whitelist.module'; +import { RoutingProtocolModule } from '../routing-protocol/routing-protocol.module'; @Module({ imports: [ @@ -31,16 +31,16 @@ import { WhitelistModule } from '../whitelist/whitelist.module'; StorageModule, QualificationModule, WhitelistModule, + RoutingProtocolModule, ], controllers: [JobController], providers: [ Logger, JobService, JobRepository, - RoutingProtocolService, WebhookRepository, MutexManagerService, ], - exports: [JobService, RoutingProtocolService], + exports: [JobService], }) export class JobModule {} diff --git a/packages/apps/job-launcher/server/src/modules/job/job.service.ts b/packages/apps/job-launcher/server/src/modules/job/job.service.ts index 40e9118f3b..119c91378b 100644 --- a/packages/apps/job-launcher/server/src/modules/job/job.service.ts +++ b/packages/apps/job-launcher/server/src/modules/job/job.service.ts @@ -70,7 +70,6 @@ import { } from './job.dto'; import { JobEntity } from './job.entity'; import { JobRepository } from './job.repository'; -import { RoutingProtocolService } from './routing-protocol.service'; import { CANCEL_JOB_STATUSES, HCAPTCHA_BOUNDING_BOX_MAX_POINTS, @@ -122,6 +121,7 @@ import { ModuleRef } from '@nestjs/core'; import { QualificationService } from '../qualification/qualification.service'; import { WhitelistService } from '../whitelist/whitelist.service'; import { UserEntity } from '../user/user.entity'; +import { RoutingProtocolService } from '../routing-protocol/routing-protocol.service'; @Injectable() export class JobService { diff --git a/packages/apps/job-launcher/server/src/modules/job/routing-protocol.interface.ts b/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.interface.ts similarity index 100% rename from packages/apps/job-launcher/server/src/modules/job/routing-protocol.interface.ts rename to packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.interface.ts diff --git a/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.module.ts b/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.module.ts new file mode 100644 index 0000000000..1ae2b644ba --- /dev/null +++ b/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.module.ts @@ -0,0 +1,11 @@ +import { Module } from '@nestjs/common'; +import { RoutingProtocolService } from './routing-protocol.service'; +import { Web3Module } from '../web3/web3.module'; +import { ConfigModule } from '@nestjs/config'; + +@Module({ + imports: [Web3Module, ConfigModule], + providers: [RoutingProtocolService], + exports: [RoutingProtocolService], +}) +export class RoutingProtocolModule {} diff --git a/packages/apps/job-launcher/server/src/modules/job/routing-protocol.service.spec.ts b/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.service.spec.ts similarity index 100% rename from packages/apps/job-launcher/server/src/modules/job/routing-protocol.service.spec.ts rename to packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.service.spec.ts diff --git a/packages/apps/job-launcher/server/src/modules/job/routing-protocol.service.ts b/packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.service.ts similarity index 100% rename from packages/apps/job-launcher/server/src/modules/job/routing-protocol.service.ts rename to packages/apps/job-launcher/server/src/modules/routing-protocol/routing-protocol.service.ts From dd039c8744ed1c13d5257b2fb3dab3444ca041e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20L=C3=B3pez?= Date: Tue, 4 Mar 2025 10:36:00 +0100 Subject: [PATCH 2/2] refactor: update import paths for RoutingProtocolService in job and cron-job services --- .../server/src/modules/cron-job/cron-job.service.spec.ts | 2 +- .../job-launcher/server/src/modules/job/job.service.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apps/job-launcher/server/src/modules/cron-job/cron-job.service.spec.ts b/packages/apps/job-launcher/server/src/modules/cron-job/cron-job.service.spec.ts index 8363549869..05ab5b1cf5 100644 --- a/packages/apps/job-launcher/server/src/modules/cron-job/cron-job.service.spec.ts +++ b/packages/apps/job-launcher/server/src/modules/cron-job/cron-job.service.spec.ts @@ -36,7 +36,7 @@ import { PaymentService } from '../payment/payment.service'; import { JobRepository } from '../job/job.repository'; import { PaymentRepository } from '../payment/payment.repository'; import { ConfigService } from '@nestjs/config'; -import { RoutingProtocolService } from '../job/routing-protocol.service'; +import { RoutingProtocolService } from '../routing-protocol/routing-protocol.service'; import { WebhookEntity } from '../webhook/webhook.entity'; import { WebhookStatus } from '../../common/enums/webhook'; import { WebhookRepository } from '../webhook/webhook.repository'; diff --git a/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts b/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts index 10e389b10e..9b1fbc2bec 100644 --- a/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts +++ b/packages/apps/job-launcher/server/src/modules/job/job.service.spec.ts @@ -23,7 +23,7 @@ import { JobRepository } from './job.repository'; import { WebhookRepository } from '../webhook/webhook.repository'; import { JobService } from './job.service'; import { PaymentRepository } from '../payment/payment.repository'; -import { RoutingProtocolService } from './routing-protocol.service'; +import { RoutingProtocolService } from '../routing-protocol/routing-protocol.service'; import { StorageService } from '../storage/storage.service'; import { ServerConfigService } from '../../common/config/server-config.service'; import { AuthConfigService } from '../../common/config/auth-config.service';