OOP is my passion ( ͡° ͜ʖ ͡°)

src/events/character/charactersScreen/characterHairList.ts

@@ -1,6 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterHair } from '#entities/characterHair'
-import characterHairRepository from '#repositories/characterHairRepository'
+import CharacterHairRepository from '#repositories/characterHairRepository'
 
 interface IPayload {}
 
@@ -11,6 +11,7 @@ export default class characterHairListEvent extends BaseEvent {
 
   private async handleEvent(data: IPayload, callback: (response: CharacterHair[]) => void): Promise<void> {
     try {
+      const characterHairRepository = new CharacterHairRepository()
       const items: CharacterHair[] = await characterHairRepository.getAllSelectable(['sprite'])
 
       return callback(items)

src/events/character/connect.ts

@@ -11,6 +11,9 @@ interface CharacterConnectPayload {
 }
 
 export default class CharacterConnectEvent extends BaseEvent {
+  private readonly characterHairRepository = new CharacterHairRepository()
+  private readonly characterRepository = new CharacterRepository()
+
   public listen(): void {
     this.socket.on('character:connect', this.handleEvent.bind(this))
   }
@@ -22,10 +25,7 @@ export default class CharacterConnectEvent extends BaseEvent {
         return
       }
 
-      const character = await CharacterRepository.getByUserAndId(this.socket.userId!, data.characterId, [
-        'characterType',
-        'characterHair'
-      ])
+      const character = await this.characterRepository.getByUserAndId(this.socket.userId!, data.characterId, ['characterType', 'characterHair'])
 
       if (!character) {
         this.emitError('Character not found or does not belong to this user')
@@ -37,7 +37,7 @@ export default class CharacterConnectEvent extends BaseEvent {
 
       // Set character hair
       if (data.characterHairId !== undefined && data.characterHairId !== null) {
-        const characterHair = await CharacterHairRepository.getById(data.characterHairId)
+        const characterHair = await this.characterHairRepository.getById(data.characterHairId)
         await character.setCharacterHair(characterHair).update()
       }
 
@@ -61,7 +61,7 @@ export default class CharacterConnectEvent extends BaseEvent {
   }
 
   private async checkForActiveCharacters(): Promise<boolean> {
-    const characters = await CharacterRepository.getByUserId(this.socket.userId!)
+    const characters = await this.characterRepository.getByUserId(this.socket.userId!)
     return characters?.some((char) => MapManager.getCharacterById(char.id)) ?? false
   }
 }

src/events/character/create.ts

@@ -4,8 +4,8 @@ import { BaseEvent } from '#application/base/baseEvent'
 import { ZCharacterCreate } from '#application/zodTypes'
 import { Character } from '#entities/character'
 import CharacterRepository from '#repositories/characterRepository'
-import UserRepository from '#repositories/userRepository'
 import MapRepository from '#repositories/mapRepository'
+import UserRepository from '#repositories/userRepository'
 
 export default class CharacterCreateEvent extends BaseEvent {
   public listen(): void {
@@ -17,27 +17,31 @@ export default class CharacterCreateEvent extends BaseEvent {
     try {
       data = ZCharacterCreate.parse(data)
 
-      const user = await UserRepository.getById(this.socket.userId!)
+      const userRepository = new UserRepository()
+      const characterRepository = new CharacterRepository()
+      const mapRepository = new MapRepository()
+
+      const user = await userRepository.getById(this.socket.userId!)
 
       if (!user) {
         return this.socket.emit('notification', { message: 'User not found' })
       }
 
       // Check if character name already exists
-      const characterExists = await CharacterRepository.getByName(data.name)
+      const characterExists = await characterRepository.getByName(data.name)
 
       if (characterExists) {
         return this.socket.emit('notification', { message: 'Character name already exists' })
       }
 
-      let characters: Character[] = await CharacterRepository.getByUserId(user.getId())
+      let characters: Character[] = await characterRepository.getByUserId(user.getId())
 
       if (characters.length >= 4) {
         return this.socket.emit('notification', { message: 'You can only have 4 characters' })
       }
 
       // @TODO: Change to default location
-      const map = await MapRepository.getFirst()
+      const map = await mapRepository.getFirst()
 
       const newCharacter = new Character()
       await newCharacter.setName(data.name).setUser(user).setMap(map!).save()

src/events/character/list.ts

@@ -9,11 +9,12 @@ export default class CharacterListEvent extends BaseEvent {
 
   private async handleEvent(data: any): Promise<void> {
     try {
-      let characters: Character[] = await CharacterRepository.getByUserId(this.socket.userId!, [
-        'characterType',
-        'characterHair'
-      ])
+      const characterRepository = new CharacterRepository()
+      let characters: Character[] = await characterRepository.getByUserId(this.socket.userId!)
 
+      await characterRepository.getEntityManager().populate(characters, ['characterType', 'characterHair'])
+
+      console.log(characters)
       this.socket.emit('character:list', characters)
     } catch (error: any) {
       this.logger.error('character:list error', error.message)

src/events/gameMaster/assetManager/characterHair/delete.ts

@@ -1,6 +1,6 @@
 import { BaseEvent } from '#application/base/baseEvent'
-import CharacterHairRepository from '#repositories/characterHairRepository'
 import { UUID } from '#application/types'
+import CharacterHairRepository from '#repositories/characterHairRepository'
 
 interface IPayload {
   id: UUID

src/events/gameMaster/assetManager/characterHair/update.ts

@@ -29,7 +29,7 @@ export default class CharacterHairUpdateEvent extends BaseEvent {
         return callback(false)
       }
 
-      await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite!).update()
+      await characterHair.setName(data.name).setGender(data.gender).setIsSelectable(data.isSelectable).setSprite(sprite).update()
       return callback(true)
     } catch (error) {
       this.logger.error(`Error updating character hair: ${error instanceof Error ? error.message : String(error)}`)

src/events/gameMaster/assetManager/characterType/delete.ts

@@ -1,6 +1,6 @@
+import { BaseEvent } from '#application/base/baseEvent'
 import { UUID } from '#application/types'
 import CharacterTypeRepository from '#repositories/characterTypeRepository'
-import { BaseEvent } from '#application/base/baseEvent'
 
 interface IPayload {
   id: UUID

src/events/gameMaster/assetManager/characterType/list.ts

@@ -1,6 +1,6 @@
-import CharacterTypeRepository from '#repositories/characterTypeRepository'
 import { BaseEvent } from '#application/base/baseEvent'
 import { CharacterType } from '#entities/characterType'
+import CharacterTypeRepository from '#repositories/characterTypeRepository'
 
 interface IPayload {}
 

src/events/gameMaster/assetManager/mapObject/list.ts

@@ -1,6 +1,6 @@
-import ObjectRepository from '#repositories/mapObjectRepository'
 import { BaseEvent } from '#application/base/baseEvent'
 import { MapObject } from '#entities/mapObject'
+import ObjectRepository from '#repositories/mapObjectRepository'
 
 interface IPayload {}
 

src/events/gameMaster/assetManager/mapObject/remove.ts

@@ -1,8 +1,9 @@
 import fs from 'fs'
-import Storage from '#application/storage'
+
 import { BaseEvent } from '#application/base/baseEvent'
-import MapObjectRepository from '#repositories/mapObjectRepository'
+import Storage from '#application/storage'
 import { UUID } from '#application/types'
+import MapObjectRepository from '#repositories/mapObjectRepository'
 
 interface IPayload {
   mapObjectId: UUID

src/events/gameMaster/assetManager/mapObject/update.ts

@@ -1,5 +1,5 @@
-import { UUID } from '#application/types'
 import { BaseEvent } from '#application/base/baseEvent'
+import { UUID } from '#application/types'
 import MapObjectRepository from '#repositories/mapObjectRepository'
 
 type Payload = {
@@ -26,16 +26,7 @@ export default class MapObjectUpdateEvent extends BaseEvent {
       const mapObject = await MapObjectRepository.getById(data.id)
       if (!mapObject) return callback(false)
 
-      await mapObject
-        .setName(data.name)
-        .setTags(data.tags)
-        .setOriginX(data.originX)
-        .setOriginY(data.originY)
-        .setIsAnimated(data.isAnimated)
-        .setFrameRate(data.frameRate)
-        .setFrameWidth(data.frameWidth)
-        .setFrameHeight(data.frameHeight)
-        .update()
+      await mapObject.setName(data.name).setTags(data.tags).setOriginX(data.originX).setOriginY(data.originY).setIsAnimated(data.isAnimated).setFrameRate(data.frameRate).setFrameWidth(data.frameWidth).setFrameHeight(data.frameHeight).update()
 
       return callback(true)
     } catch (error) {

src/events/gameMaster/assetManager/mapObject/upload.ts

@@ -2,8 +2,9 @@ import fs from 'fs/promises'
 import { writeFile } from 'node:fs/promises'
 
 import sharp from 'sharp'
-import Storage from '#application/storage'
+
 import { BaseEvent } from '#application/base/baseEvent'
+import Storage from '#application/storage'
 import { MapObject } from '#entities/mapObject'
 
 interface IObjectData {

src/events/gameMaster/mapEditor/request.ts

@@ -1,8 +1,8 @@
 import { BaseEvent } from '#application/base/baseEvent'
+import Database from '#application/database'
 import { UUID } from '#application/types'
 import { Map } from '#entities/map'
 import MapRepository from '#repositories/mapRepository'
-import Database from '#application/database'
 
 interface IPayload {
   mapId: UUID
@@ -26,14 +26,13 @@ export default class MapRequestEvent extends BaseEvent {
 
       const map = await MapRepository.getById(data.mapId)
 
-
       if (!map) {
         this.logger.info(`User ${(await this.getCharacter())!.getId()} tried to request map ${data.mapId} but it does not exist.`)
         return callback(null)
       }
 
       console.log(map)
-      await Database.getEntityManager().populate(map, ['mapEventTiles', 'placedMapObjects'])
+      // await Database.getEntityManager().populate(map, ['mapEventTiles', 'placedMapObjects'])
 
       return callback(map)
     } catch (error: any) {

src/events/gameMaster/mapEditor/update.ts

@@ -5,9 +5,9 @@ import { Map } from '#entities/map'
 import { MapEffect } from '#entities/mapEffect'
 import { MapEventTile } from '#entities/mapEventTile'
 import { MapEventTileTeleport } from '#entities/mapEventTileTeleport'
+import { PlacedMapObject } from '#entities/placedMapObject'
 import mapManager from '#managers/mapManager'
 import MapRepository from '#repositories/mapRepository'
-import { PlacedMapObject } from '#entities/placedMapObject'
 
 interface IPayload {
   mapId: UUID
@@ -83,7 +83,7 @@ export default class MapUpdateEvent extends BaseEvent {
 
         if (tile.teleport) {
           const teleport = new MapEventTileTeleport()
-            .setToMap((await MapRepository.getById(tile.teleport.toMapId))!)
+            .setToMap(await MapRepository.getById(tile.teleport.toMapId))
             .setToPositionX(tile.teleport.toPositionX)
             .setToPositionY(tile.teleport.toPositionY)
             .setToRotation(tile.teleport.toRotation)

src/events/login.ts

@@ -6,14 +6,15 @@ export default class LoginEvent extends BaseEvent {
     this.socket.on('login', this.handleEvent.bind(this))
   }
 
-  private handleEvent(): void {
+  private async handleEvent() {
     try {
       if (!this.socket.userId) {
         this.logger.warn('Login attempt without user data')
         return
       }
 
-      this.socket.emit('logged_in', { user: UserRepository.getById(this.socket.userId) })
+      const userRepository = new UserRepository()
+      this.socket.emit('logged_in', { user: userRepository.getById(this.socket.userId) })
       this.logger.info(`User logged in: ${this.socket.userId}`)
     } catch (error: any) {
       this.logger.error('login error: ' + error.message)

src/events/zone/characterMove.ts

@@ -51,11 +51,7 @@ export default class CharacterMove extends BaseEvent {
         const [start, end] = [path[i], path[i + 1]]
         character.rotation = CharacterService.calculateRotation(start.x, start.y, end.x, end.y)
 
-        const zoneEventTile = await zoneEventTileRepository.getEventTileByZoneIdAndPosition(
-          character.zone.id,
-          Math.floor(end.x),
-          Math.floor(end.y)
-        )
+        const zoneEventTile = await zoneEventTileRepository.getEventTileByZoneIdAndPosition(character.zone.id, Math.floor(end.x), Math.floor(end.y))
 
         if (zoneEventTile?.type === 'BLOCK') break
         if (zoneEventTile?.type === 'TELEPORT' && zoneEventTile.teleport) {