1
0
forked from noxious/server

Renamed hair > characterHair

This commit is contained in:
Dennis Postma 2024-11-24 15:13:28 +01:00
parent 1017013032
commit 1839bd9a22
5 changed files with 28 additions and 13 deletions

View File

@ -0,0 +1,15 @@
/*
Warnings:
- You are about to drop the column `hairId` on the `Character` table. All the data in the column will be lost.
*/
-- DropForeignKey
ALTER TABLE `Character` DROP FOREIGN KEY `Character_hairId_fkey`;
-- AlterTable
ALTER TABLE `Character` DROP COLUMN `hairId`,
ADD COLUMN `characterHairId` INTEGER NULL;
-- AddForeignKey
ALTER TABLE `Character` ADD CONSTRAINT `Character_characterHairId_fkey` FOREIGN KEY (`characterHairId`) REFERENCES `CharacterHair`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

View File

@ -68,12 +68,12 @@ model Character {
positionX Int @default(0) positionX Int @default(0)
positionY Int @default(0) positionY Int @default(0)
rotation Int @default(0) rotation Int @default(0)
zoneId Int @default(1)
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
characterTypeId Int? characterTypeId Int?
characterType CharacterType? @relation(fields: [characterTypeId], references: [id], onDelete: Cascade) characterType CharacterType? @relation(fields: [characterTypeId], references: [id], onDelete: Cascade)
hairId Int? characterHairId Int?
hair CharacterHair? @relation(fields: [hairId], references: [id], onDelete: Cascade) characterHair CharacterHair? @relation(fields: [characterHairId], references: [id], onDelete: Cascade)
zoneId Int @default(1)
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
chats Chat[] chats Chat[]
items CharacterItem[] items CharacterItem[]
} }

View File

@ -15,7 +15,7 @@ class CharacterRepository {
sprite: true sprite: true
} }
}, },
hair: { characterHair: {
include: { include: {
sprite: true sprite: true
} }
@ -43,7 +43,7 @@ class CharacterRepository {
sprite: true sprite: true
} }
}, },
hair: { characterHair: {
include: { include: {
sprite: true sprite: true
} }
@ -70,7 +70,7 @@ class CharacterRepository {
sprite: true sprite: true
} }
}, },
hair: { characterHair: {
include: { include: {
sprite: true sprite: true
} }
@ -97,7 +97,7 @@ class CharacterRepository {
sprite: true sprite: true
} }
}, },
hair: { characterHair: {
include: { include: {
sprite: true sprite: true
} }

View File

@ -23,11 +23,11 @@ export class CharacterService {
}) })
} }
async updateHair(characterId: number, hairId: number | null) { async updateHair(characterId: number, characterHairId: number | null) {
await prisma.character.update({ await prisma.character.update({
where: { id: characterId }, where: { id: characterId },
data: { data: {
hairId characterHairId
} }
}) })
} }

View File

@ -7,7 +7,7 @@ import { CharacterService } from '../../services/characterService'
interface CharacterConnectPayload { interface CharacterConnectPayload {
characterId: number characterId: number
hairId?: number characterHairId?: number
} }
export default class CharacterConnectEvent { export default class CharacterConnectEvent {
@ -20,7 +20,7 @@ export default class CharacterConnectEvent {
this.socket.on('character:connect', this.handleCharacterConnect.bind(this)) this.socket.on('character:connect', this.handleCharacterConnect.bind(this))
} }
private async handleCharacterConnect({ characterId, hairId }: CharacterConnectPayload): Promise<void> { private async handleCharacterConnect({ characterId, characterHairId }: CharacterConnectPayload): Promise<void> {
if (!this.socket.userId) { if (!this.socket.userId) {
this.emitError('User not authenticated') this.emitError('User not authenticated')
return return
@ -34,7 +34,7 @@ export default class CharacterConnectEvent {
// Update hair // Update hair
const characterService = new CharacterService() const characterService = new CharacterService()
await characterService.updateHair(characterId, hairId ?? null) await characterService.updateHair(characterId, characterHairId ?? null)
const character = await this.connectCharacter(characterId) const character = await this.connectCharacter(characterId)
if (!character) { if (!character) {