chore(merge): merge develop into main

github-actions[bot] · web-flow · commit 06f498068355 · 2024-12-03T12:45:07.000Z
diff --git a/apps/worker/sync/src/app/processors/sync-ranking/ranking-sync.ts b/apps/worker/sync/src/app/processors/sync-ranking/ranking-sync.ts
@@ -306,9 +306,10 @@ export class RankingSyncer {
           if (places.has(foundPlayer.id)) {
             const place = places.get(foundPlayer.id);
 
-            place[type] = points.Level;
+            // place[type] = points.Level; // disabled, BVL uploads this manually
             place[`${type}Points`] = points.Totalpoints;
             place[`${type}Rank`] = points.Rank;
+            await place.save({ transaction: args.transaction });
           } else {
             places.set(
               foundPlayer.id,
@@ -325,15 +326,16 @@ export class RankingSyncer {
             );
           }
 
-          if (publication.usedForUpdate === false && foundPlayer.rankingLastPlaces != null) {
-            const place = foundPlayer.rankingLastPlaces.find(
-              (r) => r.systemId === ranking.system.id,
-            );
-            if (place?.[type] != null && place[type] !== points.Level) {
-              place[type] = points.Level;
-              await place.save({ transaction: args.transaction });
-            }
-          }
+          // disabled, BVL uploads this manually
+          // if (publication.usedForUpdate === false && foundPlayer.rankingLastPlaces != null) {
+          //   const place = foundPlayer.rankingLastPlaces.find(
+          //     (r) => r.systemId === ranking.system.id,
+          //   );
+          //   if (place?.[type] != null && place[type] !== points.Level) {
+          //     place[type] = points.Level;
+          //     await place.save({ transaction: args.transaction });
+          //   }
+          // }
         }
       };
 
@@ -505,9 +507,9 @@ export class RankingSyncer {
 
       // For now we only check if it's the last update
 
-      const lastPublication = visiblePublications.slice()?.sort(
-        (a, b) => b.date.valueOf() - a.date.valueOf(),
-      )?.[0];
+      const lastPublication = visiblePublications
+        .slice()
+        ?.sort((a, b) => b.date.valueOf() - a.date.valueOf())?.[0];
 
       if (lastPublication == null) {
         return;
diff --git a/libs/backend/orchestrator/src/orchestrators/base.orchestrator.ts b/libs/backend/orchestrator/src/orchestrators/base.orchestrator.ts
@@ -16,20 +16,23 @@ export class OrchestratorBase implements OnModuleInit {
 
   constructor(
     protected readonly serviceName: Services,
-    protected readonly configSerivce: ConfigService<ConfigType>,
+    protected readonly configService: ConfigService<ConfigType>,
     private readonly gateway: EventsGateway,
     private readonly queue: Queue,
     private readonly renderService: RenderService,
   ) {
-    const configuredTimeout = this.configSerivce.get<string>('RENDER_WAIT_TIME');
+    const configuredTimeout = this.configService.get<string>('RENDER_WAIT_TIME');
 
     if (configuredTimeout) {
       this.timeoutTime = parseInt(configuredTimeout);
     }
   }
 
   async onModuleInit() {
-    if (this.configSerivce.get<string>('NODE_ENV') === 'test') {
+    if (
+      this.configService.get<string>('NODE_ENV') === 'development' ||
+      this.configService.get<string>('NODE_ENV') === 'test'
+    ) {
       return;
     }
 
@@ -42,7 +45,10 @@ export class OrchestratorBase implements OnModuleInit {
 
   @Cron('*/1 * * * *')
   async checkQueue() {
-    if (this.configSerivce.get<string>('NODE_ENV') === 'test') {
+    if (
+      this.configService.get<string>('NODE_ENV') === 'development' ||
+      this.configService.get<string>('NODE_ENV') === 'test'
+    ) {
       return;
     }
 
diff --git a/libs/backend/orchestrator/src/services/render.service.ts b/libs/backend/orchestrator/src/services/render.service.ts
@@ -14,23 +14,33 @@ export class RenderService {
   private renderApi!: string;
 
   constructor(private readonly configService: ConfigService<ConfigType>) {
-    this.headers = {
-      accept: 'application/json',
-      authorization: `Bearer ${this.configService.get<string>('RENDER_API_KEY')}`,
-    };
+    if (
+      this.configService.get<string>('NODE_ENV') === 'development' ||
+      this.configService.get<string>('NODE_ENV') === 'test'
+    ) {
+      this._logger.verbose(`Skipping startService for ${RenderService.name} in development`);
+    } else {
+      this.headers = {
+        accept: 'application/json',
+        authorization: `Bearer ${this.configService.get<string>('RENDER_API_KEY')}`,
+      };
 
-    const api = this.configService.get<string>('RENDER_API_URL');
+      const api = this.configService.get<string>('RENDER_API_URL');
 
-    if (!api) {
-      throw new Error('RENDER_API_URL is not defined');
-    }
+      if (!api) {
+        throw new Error('RENDER_API_URL is not defined');
+      }
 
-    this.renderApi = api;
+      this.renderApi = api;
+    }
   }
 
   async startService(service: Service) {
     // Don't start services in development
-    if (this.configService.get<string>('NODE_ENV') === 'development') {
+    if (
+      this.configService.get<string>('NODE_ENV') === 'development' ||
+      this.configService.get<string>('NODE_ENV') === 'test'
+    ) {
       this._logger.verbose(`Skipping startService for ${service.name} in development`);
       return;
     }
@@ -64,7 +74,10 @@ export class RenderService {
 
   async suspendService(service: Service) {
     // Don't suspend services in development
-    if (this.configService.get<string>('NODE_ENV') === 'development') {
+    if (
+      this.configService.get<string>('NODE_ENV') === 'development' ||
+      this.configService.get<string>('NODE_ENV') === 'test'
+    ) {
       this._logger.verbose(`Skipping suspendService for ${service.name} in development`);
       return;
     }
diff --git a/libs/utils/src/config/configuration.ts b/libs/utils/src/config/configuration.ts
@@ -111,13 +111,24 @@ export const configSchema = Joi.object({
   VR_API_USER: Joi.string().optional(),
   VR_API_PASS: Joi.string().optional(),
 
-  TWIZZIT_API: Joi.string().uri().required(),
-  TWIZZIT_API_USER: Joi.string().required(),
-  TWIZZIT_API_PASS: Joi.string().required(),
+  TWIZZIT_API: Joi.when('NODE_ENV', {
+    is: Joi.valid('production', 'beta'),
+    then: Joi.string().required(),
+    otherwise: Joi.string().optional(),
+  }),
+  TWIZZIT_API_USER: Joi.when('NODE_ENV', {
+    is: Joi.valid('production', 'beta'),
+    then: Joi.string().required(),
+    otherwise: Joi.string().optional(),
+  }),
+  TWIZZIT_API_PASS: Joi.when('NODE_ENV', {
+    is: Joi.valid('production', 'beta'),
+    then: Joi.string().required(),
+    otherwise: Joi.string().optional(),
+  }),
 
   CP_PASS: Joi.string().optional(),
 
-
   APOLLO_GRAPH_REF: Joi.when('NODE_ENV', {
     is: Joi.valid('production', 'beta'),
     then: Joi.string().required(),
@@ -126,8 +137,16 @@ export const configSchema = Joi.object({
 
   GRAPH_ID: Joi.string().optional(),
 
-  RENDER_API_KEY: Joi.string().required(),
-  RENDER_API_URL: Joi.string().uri().required(),
+  RENDER_API_KEY: Joi.when('NODE_ENV', {
+    is: Joi.valid('production', 'beta'),
+    then: Joi.string().required(),
+    otherwise: Joi.string().optional(),
+  }),
+  RENDER_API_URL: Joi.when('NODE_ENV', {
+    is: Joi.valid('production', 'beta'),
+    then: Joi.string().uri().required(),
+    otherwise: Joi.string().uri().optional(),
+  }),
   RENDER_WAIT_TIME: Joi.number().integer().optional().default(2_100_000),
 });
 
