Skip to content

Commit

Permalink
TypeORM, y u no respect semver?!?!?
Browse files Browse the repository at this point in the history
  • Loading branch information
Maelstromeous committed Mar 15, 2024
1 parent 6473c4a commit 56f8ec3
Show file tree
Hide file tree
Showing 30 changed files with 68 additions and 70 deletions.
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -26,7 +26,7 @@ export default class GlobalOutfitAggregateEntity {
@ObjectIdColumn()
@Exclude()
@ApiHideProperty()
_id: ObjectID;
_id: ObjectId;

@ApiProperty({type: OutfitEmbed, description: 'Outfit details'})
@Column(() => OutfitEmbed)
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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({
Expand Down
4 changes: 2 additions & 2 deletions src/modules/data/entities/instance/instance.death.entity.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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({
Expand Down
Loading

0 comments on commit 56f8ec3

Please sign in to comment.