fixed merge conflicts

SerpentRace_Backend/src/Domain/Deck/DeckAggregate.ts

@@ -31,13 +31,7 @@ export enum ConsequenceType {
     MOVE_BACKWARD = 1,
     LOSE_TURN = 2,
     EXTRA_TURN = 3,
-<<<<<<< HEAD
     GO_TO_START = 5
-=======
-    SWAP_POSITION = 4,
-    GO_TO_START = 5,
-    TURN_AGAIN = 6
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 }
 
 export interface Consequence {

SerpentRace_Backend/src/Domain/Game/GameAggregate.ts

@@ -1,9 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm';
-<<<<<<< HEAD
 import { Consequence, CardType } from '../Deck/DeckAggregate';
-=======
-import { Consequence } from '../Deck/DeckAggregate';
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 
 export enum GameState {
     WAITING = 0,
@@ -27,12 +23,8 @@ export enum DeckType {
 export interface GameCard {
     cardid: string;
     question?: string;
-<<<<<<< HEAD
     answer?: any; // Support complex answer structures (string, object, array)
     type?: CardType; // Card type for validation logic
-=======
-    answer?: string;
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     consequence?: Consequence | null;
     played?: boolean;
     playerid?: string;
@@ -58,7 +50,6 @@ export class GameAggregate {
     @Column({ type: 'int', default: LoginType.PUBLIC })
     logintype!: LoginType;
 
-<<<<<<< HEAD
     @Column({ type: 'int', default: 50 })
     boardsize!: number;
 
@@ -72,18 +63,6 @@ export class GameAggregate {
     gamedecks!: GameDeck[];
 
     @Column({ type: 'uuid', array: true, default: () => "'{}'", name: 'playerids' })
-=======
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    createdby!: string | null;
-
-    @Column({ type: 'varchar', length: 255, nullable: true })
-    orgid!: string | null;
-
-    @Column({ type: 'json' })
-    gamedecks!: GameDeck[];
-
-    @Column({ type: 'json', default: () => "'[]'" })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     players!: string[];
 
     @Column({ type: 'boolean', default: false })
@@ -92,37 +71,22 @@ export class GameAggregate {
     @Column({ type: 'boolean', default: false })
     finished!: boolean;
 
-<<<<<<< HEAD
     @Column({ type: 'uuid', nullable: true, name: 'winnerid' })
-=======
-    @Column({ type: 'varchar', length: 255, nullable: true })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     winner!: string | null;
 
     @Column({ type: 'int', default: GameState.WAITING })
     state!: GameState;
 
-<<<<<<< HEAD
     @CreateDateColumn({ name: 'createDate' })
-=======
-    @CreateDateColumn({ name: 'create_date' })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     createdate!: Date;
 
     @Column({ type: 'timestamp', nullable: true, name: 'start_date' })
     startdate!: Date | null;
 
-<<<<<<< HEAD
     @Column({ type: 'timestamp', nullable: true, name: 'finishDate' })
     enddate!: Date | null;
 
     @UpdateDateColumn({ name: 'updateDate' })
-=======
-    @Column({ type: 'timestamp', nullable: true, name: 'end_date' })
-    enddate!: Date | null;
-
-    @UpdateDateColumn({ name: 'update_date' })
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     updatedate!: Date;
 }
 
@@ -136,12 +100,6 @@ export interface GameField {
 export interface BoardData {
     gameId?: string;
     fields: GameField[];
-<<<<<<< HEAD
-=======
-    border: number[];
-    validationResults: { [fieldIndex: number]: number[] };
-    totalErrorRate: number;
->>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     generationComplete?: boolean;
     generatedAt?: Date;
     error?: string;