Merge branch 'feature/get-rid-of-agenda' into develop

Author: dotFionn

package-lock.json

@@ -26,7 +26,6 @@
     "@nestjs/platform-express": "10.2.7",
     "@nestjs/serve-static": "4.0.0",
     "@nestjs/swagger": "7.1.17",
-    "agenda": "4.4.0",
     "axios": "1.6.2",
     "body-parser": "^1.20.0",
     "cookie-parser": "^1.4.6",

package.json

@@ -18,7 +18,7 @@ import { FrontendProxyModule } from './frontend-proxy/frontend-proxy.module';
 import { MessageModule } from './message/message.module';
 import { PilotModule } from './pilot/pilot.module';
 import { PluginTokenModule } from './plugin-token/plugin-token.module';
-import { agendaProviders } from './schedule.module';
+import { ScheduleModule } from './schedule/schedule.module';
 import { UserModule } from './user/user.module';
 import { UtilsModule } from './utils/utils.module';
 import { VdgsModule } from './vdgs/vdgs.module';
@@ -54,8 +54,9 @@ const { frontendProxy } = getAppConfig();
     ConfigModule,
     PluginTokenModule,
     VdgsModule,
+    ScheduleModule,
   ],
-  providers: [...databaseProviders, ...agendaProviders],
+  providers: [...databaseProviders],
   exports: [...databaseProviders],
 })
 export class AppModule implements NestModule {

src/backend/app.module.ts

@@ -2,7 +2,6 @@ import { Module, forwardRef } from '@nestjs/common';
 
 import { AirportModule } from '../airport/airport.module';
 import { PilotModule } from '../pilot/pilot.module';
-import { ScheduleModule } from '../schedule.module';
 import { UtilsModule } from '../utils/utils.module';
 
 import { CdmService } from './cdm.service';
@@ -14,7 +13,6 @@ import { CdmService } from './cdm.service';
     forwardRef(() => AirportModule),
     forwardRef(() => PilotModule),
     UtilsModule,
-    ScheduleModule,
   ],
 })
 export class CdmModule {}

src/backend/cdm/cdm.module.ts

@@ -1,12 +1,11 @@
 import { Inject, Injectable, forwardRef } from '@nestjs/common';
-import Agenda from 'agenda';
 import { mongo } from 'mongoose';
 
 import { AirportService } from '../airport/airport.service';
 import logger from '../logger';
 import { PilotDocument } from '../pilot/pilot.model';
 import { PilotService } from '../pilot/pilot.service';
-import { AGENDA_PROVIDER } from '../schedule.module';
+import { Schedule } from '../schedule/schedule.decorator';
 import { UtilsService } from '../utils/utils.service';
 
 import { AirportCapacity } from '@/shared/interfaces/airport.interface';
@@ -16,18 +15,13 @@ interface IBlockAssignment {
   ttot: Date;
 }
 
-const jobNameOptimizeBlockAssignments = 'CDM_optimizeBlockAssignments';
-
 @Injectable()
 export class CdmService {
   constructor(
     @Inject(forwardRef(() => AirportService)) private airportService: AirportService,
     @Inject(forwardRef(() => PilotService)) private pilotService: PilotService,
     private utilsService: UtilsService,
-    @Inject(AGENDA_PROVIDER) private agenda: Agenda,
   ) {
-    this.agenda.define(jobNameOptimizeBlockAssignments, this.optimizeBlockAssignments.bind(this));
-    this.agenda.every('2 minute', jobNameOptimizeBlockAssignments);
   }
 
   determineInitialBlock(pilot: PilotDocument): IBlockAssignment {
@@ -154,6 +148,7 @@ export class CdmService {
     return this.putPilotIntoBlock(pilot, allPilots);
   }
 
+  @Schedule()
   private async optimizeBlockAssignments(): Promise<void> {
     const currentBlockId = this.utilsService.getBlockFromTime(new Date());
     const allAirports = await this.airportService.getAllAirports();

src/backend/cdm/cdm.service.ts

@@ -1,13 +1,12 @@
 import { Module } from '@nestjs/common';
 
 import { DatabaseModule } from '../database.module';
-import { ScheduleModule } from '../schedule.module';
 
 import { EcfmpMeasureProvider } from './ecfmp-measure.model';
 import { EcfmpService } from './ecfmp.service';
 
 @Module({
-  imports: [DatabaseModule, ScheduleModule],
+  imports: [DatabaseModule],
   providers: [EcfmpService, EcfmpMeasureProvider],
   exports: [EcfmpService],
 })

src/backend/ecfmp/ecfmp.module.ts

@@ -1,13 +1,12 @@
 import { Inject, Injectable } from '@nestjs/common';
-import Agenda from 'agenda';
 import axios from 'axios';
 import dayjs from 'dayjs';
 import { FilterQuery } from 'mongoose';
 
 import { EcfmpMeasure, EcfmpPlugin } from '../../shared/interfaces/ecfmp.interface';
 import getAppConfig from '../config';
 import logger from '../logger';
-import { AGENDA_PROVIDER } from '../schedule.module';
+import { Schedule } from '../schedule/schedule.decorator';
 
 import { ECFMP_MEASURE_MODEL, EcfmpMeasureDocument, EcfmpMeasureModel } from './ecfmp-measure.model';
 
@@ -17,10 +16,7 @@ const jobNameEnsureMeasureCurrency = 'ECFMP_ensureMeasureCurrency';
 export class EcfmpService {
   constructor(
     @Inject(ECFMP_MEASURE_MODEL) private ecfmpMeasureModel: EcfmpMeasureModel,
-    @Inject(AGENDA_PROVIDER) private agenda: Agenda,
   ) {
-    this.agenda.define(jobNameEnsureMeasureCurrency, this.ensureMeasureCurrency.bind(this));
-    this.agenda.every('1 minute', jobNameEnsureMeasureCurrency);
   }
 
   acceptedMeasureTypes: EcfmpMeasure['measure']['type'][] = [
@@ -94,6 +90,7 @@ export class EcfmpService {
    * - upserts measures into vacdm database
    * - clears all expired or deleted measures
    */
+  @Schedule({ interval: '1 minute', nextJob: 'EtfmsService:assignMeasuresToPilots' })
   private async ensureMeasureCurrency() {
     logger.verbose(`${jobNameEnsureMeasureCurrency} > running...`);
 

src/backend/ecfmp/ecfmp.service.ts

@@ -3,13 +3,12 @@ import { Module } from '@nestjs/common';
 import { CdmModule } from '../cdm/cdm.module';
 import { EcfmpModule } from '../ecfmp/ecfmp.module';
 import { PilotModule } from '../pilot/pilot.module';
-import { ScheduleModule } from '../schedule.module';
 import { UtilsModule } from '../utils/utils.module';
 
 import { EtfmsService } from './etfms.service';
 
 @Module({
-  imports: [ScheduleModule, EcfmpModule, PilotModule, UtilsModule, CdmModule],
+  imports: [EcfmpModule, PilotModule, UtilsModule, CdmModule],
   providers: [EtfmsService],
   exports: [EtfmsService],
 })