Outfit wars support

.gitignore

@@ -3,7 +3,7 @@
 /node_modules
 
 # Provisioning
-provisioning/vars.local.yml
+vars.local.yml
 
 # Logs
 logs

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "src/modules/data/ps2alerts-constants"]
 	path = src/modules/data/ps2alerts-constants
 	url = https://github.com/ps2alerts/constants
+	branch = outfit-wars
 [submodule "provisioning/helm"]
 	path = provisioning/helm
 	url = https://github.com/ps2alerts/helm-charts

provisioning/dev/start.yml

@@ -2,6 +2,7 @@
 - hosts: localhost
   vars_files:
     - "{{ playbook_dir }}/../vars.yml"
+    - ../../vars.local.yml
   #    - "{{ playbook_dir }}/../vars_local.yml"
   tasks:
     - debug:
@@ -46,6 +47,7 @@
           REST_ENABLED: "true"
           INTERNAL_API_USER: "ps2alerts"
           INTERNAL_API_PASS: "foobar"
+          CENSUS_SERVICE_ID: "{{ census_service_id }}"
         labels:
           traefik.enable: "true"
           traefik.http.routers.ps2alerts_api_http.rule: "Host(`dev.api.ps2alerts.com`)"

provisioning/production/values.yaml

@@ -89,6 +89,8 @@ deployments:
         value: "${{ secrets.INTERNAL_API_USER }}"
       - name: INTERNAL_API_PASS
         value: "${{ secrets.INTERNAL_API_PASS }}"
+      - name: CENSUS_SERVICE_ID
+        value: "${{ secrets.CENSUS_SERVICE_ID }}"
     scaling:
       enabled: true
       min: 2
@@ -175,6 +177,8 @@ deployments:
         value: "${{ secrets.INTERNAL_API_USER }}"
       - name: INTERNAL_API_PASS
         value: "${{ secrets.INTERNAL_API_PASS }}"
+      - name: CENSUS_SERVICE_ID
+        value: "${{ secrets.CENSUS_SERVICE_ID }}"
     scaling:
       enabled: true
       min: 1
@@ -254,6 +258,8 @@ deployments:
         value: "${{ secrets.INTERNAL_API_USER }}"
       - name: INTERNAL_API_PASS
         value: "${{ secrets.INTERNAL_API_PASS }}"
+      - name: CENSUS_SERVICE_ID
+        value: "${{ secrets.CENSUS_SERVICE_ID }}"
     nodeSelector:
       nodepool: perm-pool
     scaling:

provisioning/staging/values.yaml

@@ -79,6 +79,8 @@ deployments:
         value: "${{ secrets.INTERNAL_API_USER }}"
       - name: INTERNAL_API_PASS
         value: "${{ secrets.INTERNAL_API_PASS }}"
+      - name: CENSUS_SERVICE_ID
+        value: "${{ secrets.CENSUS_SERVICE_ID }}"
 #    nodeSelector:
 #      nodepool: perm-pool
     scaling:

src/config/index.ts

@@ -4,6 +4,10 @@ export const config = () => ({
 
     env: process.env.NODE_ENV,
 
+    census: {
+        serviceId: process.env.CENSUS_SERVICE_ID
+    },
+
     database: {
         mongo: {
             type: 'mongodb',

src/modules/aggregator/aggregator.data.handler.ts

@@ -5,7 +5,7 @@ import {Inject, Injectable, Logger} from '@nestjs/common';
 import MongoOperationsService from '../../services/mongo/mongo.operations.service';
 import GlobalAggregatorMessageInterface from './interfaces/global.aggregator.message.interface';
 import InstanceMetagameTerritoryEntity from '../data/entities/instance/instance.metagame.territory.entity';
-import {Ps2alertsEventState} from '../data/ps2alerts-constants/ps2alertsEventState';
+import {Ps2AlertsEventState} from '../data/ps2alerts-constants/ps2AlertsEventState';
 import {Bracket} from '../data/ps2alerts-constants/bracket';
 
 @Injectable()
@@ -88,45 +88,40 @@ export default class AggregatorDataHandler {
     public async transformGlobal(data: GlobalAggregatorMessageInterface): Promise<GlobalAggregatorMessageInterface> {
         const newConditionals: any[] = [];
 
-        // If bracket has been supplied intentionally (such as the "Total" bracket (0)) then add it in now
-        if (data.bracket === Bracket.TOTAL) {
-            data.conditionals.forEach((conditional) => {
-                // Format for any dates
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                conditional = this.transformDateConditional(conditional);
+        for (let conditional of data.conditionals) {
+            // Format for any dates
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            conditional = this.transformDateConditional(conditional);
 
-                newConditionals.push(Object.assign(conditional, {
-                    bracket: Bracket.TOTAL,
-                }));
-            });
-        } else {
-            let instance: InstanceMetagameTerritoryEntity;
-
-            try {
-                // If none is found an exception will throw (fineOneOrFail)
-                instance = await this.mongoOperationsService.findOne(
-                    InstanceMetagameTerritoryEntity,
-                    {instanceId: data.instance},
-                );
-            } catch (e) {
-                throw new Error(`Instance ${data.instance} does not exist.`);
-            }
+            let bracket: Bracket;
 
-            // Pull out conditionals and apply bracket to them
-            if (instance.state === Ps2alertsEventState.ENDED) {
-                data.conditionals.forEach((conditional) => {
-                    // Format for any dates
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                    conditional = this.transformDateConditional(conditional);
-                    newConditionals.push(Object.assign(conditional, {
-                        bracket: instance.bracket,
-                    }));
-                });
+            // If total bracket was not supplied, we are going to pull in the instance and get it's bracket
+            if (data.bracket === Bracket.TOTAL) {
+                bracket = Bracket.TOTAL;
             } else {
-                this.logger.error(`Received Global Aggregate message for unfinished instance ${data.instance}`);
+                let instance: InstanceMetagameTerritoryEntity;
+
+                try {
+                    // If none is found an exception will throw (fineOneOrFail)
+                    instance = await this.mongoOperationsService.findOne(
+                        InstanceMetagameTerritoryEntity,
+                        {instanceId: data.instance},
+                    );
+                } catch (e) {
+                    throw new Error(`Instance ${data.instance} does not exist.`);
+                }
+
+                if (instance.state === Ps2AlertsEventState.ENDED) {
+                    bracket = instance.bracket;
+                } else {
+                    throw new Error(`Received Global Aggregate message for unfinished instance ${data.instance}`);
+                }
             }
+
+            newConditionals.push(Object.assign(conditional, {bracket}));
         }
 
+        // Reassign the conditionals to the newly generated conditions
         data.conditionals = newConditionals;
 
         return data;

src/modules/cron/CronModule.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import {CacheModule, Module} from '@nestjs/common';
+import {CacheModule, HttpModule, Module} from '@nestjs/common';
 import {CombatHistoryCron} from './combat.history.cron';
 import MongoOperationsService from '../../services/mongo/mongo.operations.service';
 import {TypeOrmModule} from '@nestjs/typeorm';
@@ -14,13 +14,17 @@ import {ConfigService} from '@nestjs/config';
 import * as redisStore from 'cache-manager-ioredis';
 import {RedisCacheService} from '../../services/cache/redis.cache.service';
 import {XpmCron} from './xpm.cron';
+import { OutfitWarsRankingsCron } from './outfitwars.rankings.cron';
+import OutfitwarsRankingEntity from '../data/entities/instance/outfitwars.ranking.entity';
 
 @Module({
     imports: [
+        HttpModule,
         TypeOrmModule.forFeature([
             InstanceCombatHistoryAggregateEntity,
             InstanceFactionCombatAggregateEntity,
             InstanceMetagameTerritoryEntity,
+            OutfitwarsRankingEntity,
         ]),
         CacheModule.registerAsync({
             imports: [ConfigModule],
@@ -41,6 +45,7 @@ import {XpmCron} from './xpm.cron';
         RedisCacheService,
         CombatHistoryCron,
         BracketCron,
+        OutfitWarsRankingsCron,
         XpmCron,
     ],
 })

src/modules/cron/bracket.cron.ts

@@ -2,7 +2,7 @@
 import {Inject, Injectable, Logger} from '@nestjs/common';
 import {Cron, CronExpression} from '@nestjs/schedule';
 import MongoOperationsService from '../../services/mongo/mongo.operations.service';
-import {Ps2alertsEventState} from '../data/ps2alerts-constants/ps2alertsEventState';
+import {Ps2AlertsEventState} from '../data/ps2alerts-constants/ps2AlertsEventState';
 import InstanceMetagameTerritoryEntity from '../data/entities/instance/instance.metagame.territory.entity';
 import InstancePopulationAggregateEntity
     from '../data/entities/aggregate/instance/instance.population.aggregate.entity';
@@ -38,7 +38,7 @@ export class BracketCron {
 
         // Grab the current actives
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const actives: InstanceMetagameTerritoryEntity[] = await this.mongoOperationsService.findMany(InstanceMetagameTerritoryEntity, {state: Ps2alertsEventState.STARTED});
+        const actives: InstanceMetagameTerritoryEntity[] = await this.mongoOperationsService.findMany(InstanceMetagameTerritoryEntity, {state: Ps2AlertsEventState.STARTED});
 
         for await (const instance of actives) {
             // If Jaeger, skip and keep as 0 (N/A)

src/modules/cron/combat.history.cron.ts

@@ -1,13 +1,14 @@
 import {Inject, Injectable, Logger} from '@nestjs/common';
 import {Cron, CronExpression} from '@nestjs/schedule';
 import MongoOperationsService from '../../services/mongo/mongo.operations.service';
-import {Ps2alertsEventState} from '../data/ps2alerts-constants/ps2alertsEventState';
+import {Ps2AlertsEventState} from '../data/ps2alerts-constants/ps2AlertsEventState';
 import InstanceMetagameTerritoryEntity from '../data/entities/instance/instance.metagame.territory.entity';
 import InstanceFactionCombatAggregateEntity
     from '../data/entities/aggregate/instance/instance.faction.combat.aggregate.entity';
 import InstanceCombatHistoryAggregateEntity
     from '../data/entities/aggregate/instance/instance.combat.history.aggregate.entity';
 import {RedisCacheService} from '../../services/cache/redis.cache.service';
+import InstanceOutfitWarsTerritoryEntity from '../data/entities/instance/instance.outfitwars.territory.entity';
 
 @Injectable()
 export class CombatHistoryCron {
@@ -24,10 +25,12 @@ export class CombatHistoryCron {
         const documents = [];
 
         // Grab the current actives
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const actives: InstanceMetagameTerritoryEntity[] = await this.mongoOperationsService.findMany(InstanceMetagameTerritoryEntity, {state: Ps2alertsEventState.STARTED});
+        const territoryActives: InstanceMetagameTerritoryEntity[] = await this.mongoOperationsService.findMany(InstanceMetagameTerritoryEntity, {state: Ps2AlertsEventState.STARTED});
+        const outfitWarsActives: InstanceOutfitWarsTerritoryEntity[] = await this.mongoOperationsService.findMany(InstanceOutfitWarsTerritoryEntity, {state: Ps2AlertsEventState.STARTED});
 
-        for await (const row of actives) {
+        const combinedActives = [...territoryActives, ...outfitWarsActives];
+
+        for await (const row of combinedActives) {
             // If instance is overdue, don't process
             if (Date.now() > (row.timeStarted.getTime() + row.duration)) {
                 this.logger.warn(`Instance [${row.instanceId}] is overdue, skipping combat history job`);