From 56f8ec3e435c244a4d1bdf79cc9ee30650e42f37 Mon Sep 17 00:00:00 2001 From: Matt Cavanagh Date: Fri, 15 Mar 2024 15:58:19 +0000 Subject: [PATCH] TypeORM, y u no respect semver?!?!? --- .../global/global.character.aggregate.entity.ts | 4 ++-- .../global.facility.control.aggregate.entity.ts | 4 ++-- .../global.faction.combat.aggregate.entity.ts | 4 ++-- .../global/global.loadout.aggregate.entity.ts | 4 ++-- .../global/global.outfit.aggregate.entity.ts | 4 ++-- .../global/global.vehicle.aggregate.entity.ts | 4 ++-- .../global.vehicle.character.aggregate.entity.ts | 4 ++-- .../global/global.victory.aggregate.entity.ts | 4 ++-- .../global/global.weapon.aggregate.entity.ts | 4 ++-- .../instance.character.aggregate.entity.ts | 4 ++-- .../instance.combat.history.aggregate.entity.ts | 4 ++-- .../instance.facility.control.aggregate.entity.ts | 4 ++-- .../instance.faction.combat.aggregate.entity.ts | 4 ++-- .../instance/instance.loadout.aggregate.entity.ts | 4 ++-- .../instance/instance.outfit.aggregate.entity.ts | 4 ++-- .../instance.population.aggregate.entity.ts | 4 ++-- ...nstance.population.averages.aggregate.entity.ts | 4 ++-- .../instance/instance.vehicle.aggregate.entity.ts | 4 ++-- .../instance.vehicle.character.aggregate.entity.ts | 4 ++-- .../instance/instance.weapon.aggregate.entity.ts | 4 ++-- .../entities/instance/instance.death.entity.ts | 4 ++-- .../instance/instance.facilitycontrol.entity.ts | 4 ++-- .../instance/instance.metagame.territory.entity.ts | 4 ++-- .../instance.outfitwars.territory.entity.ts | 4 ++-- .../instance/outfitwars.facility.control.entity.ts | 4 ++-- .../entities/instance/outfitwars.ranking.entity.ts | 4 ++-- .../rest.instance.facility.control.controller.ts | 6 +++--- .../rest.instance.metagame.controller.ts | 4 ++-- .../rest/controllers/rest.outfitwars.controller.ts | 10 +++++----- src/services/mongo/mongo.operations.service.ts | 14 ++++++-------- 30 files changed, 68 insertions(+), 70 deletions(-) diff --git a/src/modules/data/entities/aggregate/global/global.character.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.character.aggregate.entity.ts index e1845432..17dab805 100644 --- a/src/modules/data/entities/aggregate/global/global.character.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.character.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import CharacterEmbed from '../common/character.embed'; import {Bracket, ps2alertsBracketArray} from '../../../ps2alerts-constants/bracket'; @@ -26,7 +26,7 @@ export default class GlobalCharacterAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.facility.control.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.facility.control.aggregate.entity.ts index 664c14ee..166dfd3b 100644 --- a/src/modules/data/entities/aggregate/global/global.facility.control.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.facility.control.aggregate.entity.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; import {World, worldArray} from '../../../ps2alerts-constants/world'; @@ -19,7 +19,7 @@ export default class GlobalFacilityControlAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.faction.combat.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.faction.combat.aggregate.entity.ts index 6bdd33fc..54dddd9b 100644 --- a/src/modules/data/entities/aggregate/global/global.faction.combat.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.faction.combat.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, ObjectID, Index} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, ObjectId, Index} from 'typeorm'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import CombatStats from '../common/combat.stats.embed'; import {Bracket, ps2alertsBracketArray} from '../../../ps2alerts-constants/bracket'; @@ -19,7 +19,7 @@ export default class GlobalFactionCombatAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.loadout.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.loadout.aggregate.entity.ts index f135d799..900c3a24 100644 --- a/src/modules/data/entities/aggregate/global/global.loadout.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.loadout.aggregate.entity.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; import {Loadout, loadoutArray} from '../../../ps2alerts-constants/loadout'; @@ -19,7 +19,7 @@ export default class GlobalLoadoutAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.outfit.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.outfit.aggregate.entity.ts index 86e9d599..9eb018d9 100644 --- a/src/modules/data/entities/aggregate/global/global.outfit.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.outfit.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import OutfitEmbed from '../common/outfit.embed'; import {Bracket, ps2alertsBracketArray} from '../../../ps2alerts-constants/bracket'; @@ -26,7 +26,7 @@ export default class GlobalOutfitAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({type: OutfitEmbed, description: 'Outfit details'}) @Column(() => OutfitEmbed) diff --git a/src/modules/data/entities/aggregate/global/global.vehicle.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.vehicle.aggregate.entity.ts index 8da3f606..2eba7725 100644 --- a/src/modules/data/entities/aggregate/global/global.vehicle.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.vehicle.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import VehicleStatsEmbed from '../common/vehicle.vs.vehicle.embed'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import {Vehicle, vehicleArray} from '../../../ps2alerts-constants/vehicle'; @@ -18,7 +18,7 @@ export default class GlobalVehicleAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: Vehicle.FLASH, enum: vehicleArray, description: 'Vehicle ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.vehicle.character.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.vehicle.character.aggregate.entity.ts index 9929c13f..10daad08 100644 --- a/src/modules/data/entities/aggregate/global/global.vehicle.character.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.vehicle.character.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import VehicleStatsEmbed from '../common/vehicle.vs.vehicle.embed'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import {Vehicle, vehicleArray} from '../../../ps2alerts-constants/vehicle'; @@ -19,7 +19,7 @@ export default class GlobalVehicleCharacterAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: World.MILLER, enum: worldArray, description: 'World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.victory.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.victory.aggregate.entity.ts index b27da644..2b104a5c 100644 --- a/src/modules/data/entities/aggregate/global/global.victory.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.victory.aggregate.entity.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; import {World, worldArray} from '../../../ps2alerts-constants/world'; @@ -18,7 +18,7 @@ export default class GlobalVictoryAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/global/global.weapon.aggregate.entity.ts b/src/modules/data/entities/aggregate/global/global.weapon.aggregate.entity.ts index 6ae5f4f2..fdacd091 100644 --- a/src/modules/data/entities/aggregate/global/global.weapon.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/global/global.weapon.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {World, worldArray} from '../../../ps2alerts-constants/world'; import ItemEmbed from '../common/item.embed'; import {Bracket, ps2alertsBracketArray} from '../../../ps2alerts-constants/bracket'; @@ -23,7 +23,7 @@ export default class GlobalWeaponAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.character.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.character.aggregate.entity.ts index 967d89c8..aa6e3f66 100644 --- a/src/modules/data/entities/aggregate/instance/instance.character.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.character.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import CharacterEmbed from '../common/character.embed'; import FactionVersusFactionEmbed from '../common/faction.versus.faction.embed'; import XperminuteEmbed from '../common/xperminute.embed'; @@ -17,7 +17,7 @@ export default class InstanceCharacterAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.combat.history.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.combat.history.aggregate.entity.ts index 90dd6b7e..270f02de 100644 --- a/src/modules/data/entities/aggregate/instance/instance.combat.history.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.combat.history.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import CombatStats from '../common/combat.stats.embed'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -13,7 +13,7 @@ export default class InstanceCombatHistoryAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.facility.control.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.facility.control.aggregate.entity.ts index 3ac9cfa9..8b2a5093 100644 --- a/src/modules/data/entities/aggregate/instance/instance.facility.control.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.facility.control.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import FacilityFactionControl from '../common/facility.faction.control.embed'; import FacilityEmbed from '../common/facility.embed'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -16,7 +16,7 @@ export default class InstanceFacilityControlAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.faction.combat.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.faction.combat.aggregate.entity.ts index c92afc7f..d5dd4b2d 100644 --- a/src/modules/data/entities/aggregate/instance/instance.faction.combat.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.faction.combat.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, ObjectID, Index} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, ObjectId, Index} from 'typeorm'; import CombatStats from '../common/combat.stats.embed'; import FactionVersusFactionEmbed from '../common/faction.versus.faction.embed'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -15,7 +15,7 @@ export default class InstanceFactionCombatAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id?: ObjectID; + _id?: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.loadout.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.loadout.aggregate.entity.ts index e979a653..9b8b64ba 100644 --- a/src/modules/data/entities/aggregate/instance/instance.loadout.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.loadout.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {Loadout, loadoutArray} from '../../../ps2alerts-constants/loadout'; import FactionVersusFactionEmbed from '../common/faction.versus.faction.embed'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -16,7 +16,7 @@ export default class InstanceLoadoutAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.outfit.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.outfit.aggregate.entity.ts index e1c05c0e..0098de53 100644 --- a/src/modules/data/entities/aggregate/instance/instance.outfit.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.outfit.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import OutfitEmbed from '../common/outfit.embed'; import FactionVersusFactionEmbed from '../common/faction.versus.faction.embed'; import XperminuteOutfitEmbed from '../common/xperminute.outfit.embed'; @@ -17,7 +17,7 @@ export default class InstanceOutfitAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.population.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.population.aggregate.entity.ts index 1bc9c221..4fe9e178 100644 --- a/src/modules/data/entities/aggregate/instance/instance.population.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.population.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; @Entity({ name: 'aggregate_instance_populations', @@ -11,7 +11,7 @@ export default class InstancePopulationAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.population.averages.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.population.averages.aggregate.entity.ts index 9500e48f..6fef0838 100644 --- a/src/modules/data/entities/aggregate/instance/instance.population.averages.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.population.averages.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; @Entity({ name: 'aggregate_instance_population_averages', @@ -11,7 +11,7 @@ export default class InstancePopulationAveragesAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.vehicle.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.vehicle.aggregate.entity.ts index 330c51af..905f6817 100644 --- a/src/modules/data/entities/aggregate/instance/instance.vehicle.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.vehicle.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import VehicleStatsEmbed from '../common/vehicle.vs.vehicle.embed'; import {Vehicle} from '../../../ps2alerts-constants/vehicle'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -16,7 +16,7 @@ export default class InstanceVehicleAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.vehicle.character.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.vehicle.character.aggregate.entity.ts index 5b67e7a6..10f5c2a5 100644 --- a/src/modules/data/entities/aggregate/instance/instance.vehicle.character.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.vehicle.character.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import VehicleStatsEmbed from '../common/vehicle.vs.vehicle.embed'; import {Vehicle} from '../../../ps2alerts-constants/vehicle'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -16,7 +16,7 @@ export default class InstanceVehicleCharacterAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/aggregate/instance/instance.weapon.aggregate.entity.ts b/src/modules/data/entities/aggregate/instance/instance.weapon.aggregate.entity.ts index 2ed285ad..4e078b93 100644 --- a/src/modules/data/entities/aggregate/instance/instance.weapon.aggregate.entity.ts +++ b/src/modules/data/entities/aggregate/instance/instance.weapon.aggregate.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiHideProperty, ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import ItemEmbed from '../common/item.embed'; import FactionVersusFactionEmbed from '../common/faction.versus.faction.embed'; import {Ps2AlertsEventType} from '../../../ps2alerts-constants/ps2AlertsEventType'; @@ -16,7 +16,7 @@ export default class InstanceWeaponAggregateEntity { @ObjectIdColumn() @Exclude() @ApiHideProperty() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/instance/instance.death.entity.ts b/src/modules/data/entities/instance/instance.death.entity.ts index bd3581b4..ca1d8d97 100644 --- a/src/modules/data/entities/instance/instance.death.entity.ts +++ b/src/modules/data/entities/instance/instance.death.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {Loadout, loadoutArray} from '../../ps2alerts-constants/loadout'; import CharacterEmbed from '../aggregate/common/character.embed'; @@ -14,7 +14,7 @@ export default class InstanceDeathEntity { @ObjectIdColumn() @Exclude() // eslint-disable-next-line @typescript-eslint/naming-convention - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/instance/instance.facilitycontrol.entity.ts b/src/modules/data/entities/instance/instance.facilitycontrol.entity.ts index 9db9a106..9ece7873 100644 --- a/src/modules/data/entities/instance/instance.facilitycontrol.entity.ts +++ b/src/modules/data/entities/instance/instance.facilitycontrol.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {Faction, factionArray} from '../../ps2alerts-constants/faction'; import TerritoryControlMapControlEmbed from './territory.control.mapcontrol.embed'; @@ -12,7 +12,7 @@ import TerritoryControlMapControlEmbed from './territory.control.mapcontrol.embe export default class InstanceFacilityControlEntity { @ObjectIdColumn() @Exclude() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: '10-12345', description: 'The Server-CensusInstanceId combination'}) @Column({ diff --git a/src/modules/data/entities/instance/instance.metagame.territory.entity.ts b/src/modules/data/entities/instance/instance.metagame.territory.entity.ts index c64e7cb9..ee419ce9 100644 --- a/src/modules/data/entities/instance/instance.metagame.territory.entity.ts +++ b/src/modules/data/entities/instance/instance.metagame.territory.entity.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {World, worldArray} from '../../ps2alerts-constants/world'; import {Zone, zoneArray} from '../../ps2alerts-constants/zone'; import {MetagameEventType, metagameEventTypeArray} from '../../ps2alerts-constants/metagameEventType'; @@ -22,7 +22,7 @@ export default class InstanceMetagameTerritoryEntity { @ObjectIdColumn() @Exclude() // eslint-disable-next-line @typescript-eslint/naming-convention - _id: ObjectID; + _id: ObjectId; @ApiProperty({enum: worldArray, example: 10, description: 'Server / World ID'}) @Column({ diff --git a/src/modules/data/entities/instance/instance.outfitwars.territory.entity.ts b/src/modules/data/entities/instance/instance.outfitwars.territory.entity.ts index 7fac4e3c..e82bb1d0 100644 --- a/src/modules/data/entities/instance/instance.outfitwars.territory.entity.ts +++ b/src/modules/data/entities/instance/instance.outfitwars.territory.entity.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {World, worldArray} from '../../ps2alerts-constants/world'; import {Zone, zoneArray} from '../../ps2alerts-constants/zone'; import {Ps2AlertsEventState, ps2AlertsEventStateArray} from '../../ps2alerts-constants/ps2AlertsEventState'; @@ -21,7 +21,7 @@ export default class InstanceOutfitWarsTerritoryEntity { @ObjectIdColumn() @Exclude() // eslint-disable-next-line @typescript-eslint/naming-convention - _id: ObjectID; + _id: ObjectId; @ApiProperty({ example: 'outfitwars-17-10-123', diff --git a/src/modules/data/entities/instance/outfitwars.facility.control.entity.ts b/src/modules/data/entities/instance/outfitwars.facility.control.entity.ts index 4797c11f..49cbe0d6 100644 --- a/src/modules/data/entities/instance/outfitwars.facility.control.entity.ts +++ b/src/modules/data/entities/instance/outfitwars.facility.control.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, Index, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, Index, ObjectId} from 'typeorm'; import {outfitWarsTeamArray, Team} from '../../ps2alerts-constants/outfitwars/team'; import OutfitWarsTerritoryResultEmbed from '../aggregate/common/outfitwars.territory.result.embed'; @@ -12,7 +12,7 @@ import OutfitWarsTerritoryResultEmbed from '../aggregate/common/outfitwars.terri export default class OutfitwarsFacilityControlEntity { @ObjectIdColumn() @Exclude() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: 'outfitwars-1-10-34709', description: 'Unique outfitwars identifier'}) @Column({ diff --git a/src/modules/data/entities/instance/outfitwars.ranking.entity.ts b/src/modules/data/entities/instance/outfitwars.ranking.entity.ts index d6098937..65e37a91 100644 --- a/src/modules/data/entities/instance/outfitwars.ranking.entity.ts +++ b/src/modules/data/entities/instance/outfitwars.ranking.entity.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-member-accessibility,@typescript-eslint/naming-convention */ import {ApiProperty} from '@nestjs/swagger'; import {Exclude} from 'class-transformer'; -import {Column, ObjectIdColumn, Entity, ObjectID} from 'typeorm'; +import {Column, ObjectIdColumn, Entity, ObjectId} from 'typeorm'; import OutfitEmbed from '../aggregate/common/outfit.embed'; import OutfitwarsRankingParamsEmbed from './outfitwars.ranking.params.embed'; import {World} from '../../ps2alerts-constants/world'; @@ -12,7 +12,7 @@ import {World} from '../../ps2alerts-constants/world'; export default class OutfitwarsRankingEntity { @ObjectIdColumn() @Exclude() - _id: ObjectID; + _id: ObjectId; @ApiProperty({example: new Date(), description: 'Time of ranking retrieval in UTC'}) @Column({ diff --git a/src/modules/rest/controllers/rest.instance.facility.control.controller.ts b/src/modules/rest/controllers/rest.instance.facility.control.controller.ts index c1f60852..c0e599b9 100644 --- a/src/modules/rest/controllers/rest.instance.facility.control.controller.ts +++ b/src/modules/rest/controllers/rest.instance.facility.control.controller.ts @@ -30,7 +30,7 @@ import {PAGINATION_IMPLICIT_QUERIES} from './common/rest.pagination.queries'; import {OptionalBoolPipe} from '../pipes/OptionalBoolPipe'; import {CreateFacilityControlDto} from '../Dto/CreateFacilityControlDto'; import {AuthGuard} from '@nestjs/passport'; -import {ObjectID} from 'typeorm'; +import {ObjectId} from 'typeorm'; import {UpdateFacilityControlDto} from '../Dto/UpdateFacilityControlDto'; @ApiTags('Instance Facility Control Entries') @@ -118,7 +118,7 @@ export default class RestInstanceFacilityControlController { const updatedRecord = Object.assign(record, entity); - // eslint-disable-next-line @typescript-eslint/naming-convention + // eslint-disable-next-line @typescript-eslint/naming-convention,@typescript-eslint/no-unsafe-assignment await this.mongoOperationsService.upsert(InstanceFacilityControlEntity, [{$set: updatedRecord}], [{_id: updatedRecord._id}]); } @@ -133,7 +133,7 @@ export default class RestInstanceFacilityControlController { @ApiBody({type: [CreateFacilityControlDto]}) async createMany( @Body() entities: CreateFacilityControlDto[], - ): Promise { + ): Promise { return await this.mongoOperationsService.insertMany(InstanceFacilityControlEntity, entities); } } diff --git a/src/modules/rest/controllers/rest.instance.metagame.controller.ts b/src/modules/rest/controllers/rest.instance.metagame.controller.ts index b92de35e..e05a0bf7 100644 --- a/src/modules/rest/controllers/rest.instance.metagame.controller.ts +++ b/src/modules/rest/controllers/rest.instance.metagame.controller.ts @@ -37,7 +37,7 @@ import {RedisCacheService} from '../../../services/cache/redis.cache.service'; import {AuthGuard} from '@nestjs/passport'; import {UpdateInstanceMetagameDto} from '../Dto/UpdateInstanceMetagameDto'; import {CreateInstanceMetagameDto} from '../Dto/CreateInstanceMetagameDto'; -import {ObjectID} from 'typeorm'; +import {ObjectId} from 'typeorm'; import {ZONE_IMPLICIT_QUERY} from './common/rest.zone.query'; const INSTANCE_IMPLICIT_QUERIES = [ @@ -89,7 +89,7 @@ export class RestInstanceMetagameController { @UseGuards(AuthGuard('basic')) async createOne( @Body() entity: CreateInstanceMetagameDto, - ): Promise { + ): Promise { return await this.mongoOperationsService.insertOne(InstanceMetagameTerritoryEntity, entity); } diff --git a/src/modules/rest/controllers/rest.outfitwars.controller.ts b/src/modules/rest/controllers/rest.outfitwars.controller.ts index d568a565..e257bc4f 100644 --- a/src/modules/rest/controllers/rest.outfitwars.controller.ts +++ b/src/modules/rest/controllers/rest.outfitwars.controller.ts @@ -30,7 +30,7 @@ import {Zone} from '../../data/ps2alerts-constants/zone'; import {RESULT_VICTOR_QUERY} from './common/rest.result.victor.query'; import {RedisCacheService} from '../../../services/cache/redis.cache.service'; import {AuthGuard} from '@nestjs/passport'; -import {ObjectID} from 'typeorm'; +import {ObjectId} from 'typeorm'; import InstanceOutfitWarsTerritoryEntity from '../../data/entities/instance/instance.outfitwars.territory.entity'; import {Team} from '../../data/ps2alerts-constants/outfitwars/team'; import {CreateInstanceOutfitWarsDto} from '../Dto/outfitwars/CreateInstanceOutfitWarsDto'; @@ -109,7 +109,7 @@ export class RestOutfitwarsController { @UseGuards(AuthGuard('basic')) async createOne( @Body() entity: CreateInstanceOutfitWarsDto, - ): Promise { + ): Promise { return await this.mongoOperationsService.insertOne(InstanceOutfitWarsTerritoryEntity, entity); } @@ -316,7 +316,7 @@ export class RestOutfitwarsController { const updatedRecord = Object.assign(record, entity); - // eslint-disable-next-line @typescript-eslint/naming-convention + // eslint-disable-next-line @typescript-eslint/naming-convention,@typescript-eslint/no-unsafe-assignment await this.mongoOperationsService.upsert(OutfitwarsFacilityControlEntity, [{$set: updatedRecord}], [{_id: updatedRecord._id}]); } @@ -331,7 +331,7 @@ export class RestOutfitwarsController { @ApiBody({type: [CreateFacilityControlDto]}) async createManyInstanceFacility( @Body() entities: CreateFacilityControlDto[], - ): Promise { + ): Promise { return await this.mongoOperationsService.insertMany(OutfitwarsFacilityControlEntity, entities); } @@ -414,7 +414,7 @@ export class RestOutfitwarsController { } /* eslint-enable @typescript-eslint/naming-convention */ - // eslint-disable-next-line @typescript-eslint/naming-convention + // eslint-disable-next-line @typescript-eslint/naming-convention,@typescript-eslint/no-unsafe-assignment return await this.mongoOperationsService.upsert(OutfitwarsRankingEntity, [{$set: updatedRecord}], [{_id: updatedRecord._id}]); } diff --git a/src/services/mongo/mongo.operations.service.ts b/src/services/mongo/mongo.operations.service.ts index 0b35f5f3..4d72cb4a 100644 --- a/src/services/mongo/mongo.operations.service.ts +++ b/src/services/mongo/mongo.operations.service.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-argument */ -import {CollectionAggregationOptions, MongoEntityManager, ObjectID, ObjectLiteral} from 'typeorm'; +import {CollectionOptions, MongoEntityManager, ObjectId, ObjectLiteral} from 'typeorm'; import {InjectEntityManager} from '@nestjs/typeorm'; import {Injectable} from '@nestjs/common'; import Pagination from './pagination'; @@ -42,7 +42,7 @@ export default class MongoOperationsService { return await this.em.find(entity, MongoOperationsService.createFindOptions(filter, pagination)); } - public async insertOne(entity: any, doc: any): Promise { + public async insertOne(entity: any, doc: any): Promise { doc = this.transform(doc); try { @@ -59,15 +59,13 @@ export default class MongoOperationsService { throw new Error(`insertOne failed! No documents were inserted! ${JSON.stringify(doc)}`); } - public async insertMany(entity: any, docs: any[]): Promise { + public async insertMany(entity: any, docs: any[]): Promise { docs = this.transform(docs); try { const result = await this.em.insertMany(entity, docs); - if (result.insertedCount > 0) { - return result.insertedIds; - } + return Object.values(result.insertedIds); } catch (error: any) { // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access if (!error.message.includes('E11000')) { @@ -158,14 +156,14 @@ export default class MongoOperationsService { try { const result = await this.em.deleteOne(entity, conditional); - return !!result.result.ok; + return result.deletedCount > 0; } catch (error: any) { // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/restrict-template-expressions throw new Error(`Delete failed! E:${error.message}`); } } - public aggregate (entity: any, pipeline: any, options?: CollectionAggregationOptions): Promise { + public aggregate (entity: any, pipeline: any, options?: CollectionOptions): Promise { try { return this.em.aggregate(entity, pipeline, options).toArray(); } catch (error: any) {