Skip to content

Commit

Permalink
Merge pull request #115 from modern-agile-team/feature/search
Browse files Browse the repository at this point in the history
Conflict(hobiJeong/search): 충돌 해결
  • Loading branch information
hobiJeong authored Nov 10, 2023
2 parents ec12338 + 910c73d commit 6582848
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/boards/entities/board-image.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class BoardImage {
@PrimaryGeneratedColumn()
id: number;

@ManyToOne(() => Board, (board) => board.boardImage, {
@ManyToOne(() => Board, (board) => board.boardImages, {
onDelete: 'CASCADE',
})
@JoinColumn({ name: 'board_id' })
Expand Down
4 changes: 2 additions & 2 deletions src/boards/entities/board.entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export class Board {
@JoinColumn({ name: 'user_id' })
user: User;

@OneToMany(() => BoardImage, (boardImage) => boardImage.board)
boardImage: BoardImage[];
@OneToMany(() => BoardImage, (boardImages) => boardImages.board)
boardImages: BoardImage[];

@OneToMany(() => BoardLike, (boardLike) => boardLike.boardId)
boardLike: BoardLike;
Expand Down

0 comments on commit 6582848

Please sign in to comment.