chore: 엔티티 수정 및 개발 환경 설정

docker-compose.yaml

@@ -27,10 +27,10 @@ services:
       - 6379:6379
 
   elasticsearch:
-    image: elasticsearch:7.17.0
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile.elasticsearch
+    # image: elasticsearch:7.17.0
+    build:
+      context: .
+      dockerfile: Dockerfile.elasticsearch
     restart: always
     environment:
       discovery.type: single-node

elk/logstash/auto_template2.json

@@ -1,6 +1,6 @@
 {
 	"template": "auto-*",
-	"index_patterns": ["autocomplete-shop-*"],
+	"index_patterns": ["auto_shop_*"],
 	"order": "1",
 	"settings": {
 		"analysis": {

src/apis/dogs/entities/dog.entity.ts

@@ -68,18 +68,25 @@ export class Dog {
 	@Field(() => String, { nullable: true })
 	image: string;
 
-	@CreateDateColumn({ nullable: true })
+	@CreateDateColumn()
 	createdAt: Date;
 
-	@DeleteDateColumn({ nullable: true })
+	@DeleteDateColumn()
 	deletedAt: Date;
 
 	@ManyToOne(() => User, (user) => user.dogs)
 	@Field(() => User)
 	user: User;
 
 	// Dog : Reservation = 1 : N
-	@OneToMany(() => Reservation, (reservation) => reservation.dog)
-	@Field(() => [Reservation])
+	@OneToMany(
+		() => Reservation,
+		(reservation) => reservation.dog, //
+		{ nullable: true },
+	)
+	@Field(
+		() => [Reservation], //
+		{ nullable: true },
+	)
 	reservation: Reservation[];
 }

src/apis/reservations/entities/reservation.entity.ts

@@ -8,7 +8,6 @@ import {
 	CreateDateColumn,
 	DeleteDateColumn,
 	Entity,
-	JoinColumn,
 	ManyToOne,
 	OneToOne,
 	PrimaryGeneratedColumn,

src/apis/reviews/entities/review.entity.ts

@@ -32,7 +32,8 @@ export class Review {
 
 	// 예약(own) : 리뷰 = 1 : 1 // FK컬럼이 생기는 곳 = 리뷰
 	@JoinColumn()
-	@OneToOne(() => Reservation)
+	@OneToOne(() => Reservation, (reservation) => reservation.review)
+	@Field(() => Reservation)
 	reservation: Reservation;
 
 	// // 가게 : 리뷰 = 1:N //OneToMany 받음

src/apis/shops/entities/shop.entity.ts

@@ -3,7 +3,6 @@ import { Reservation } from 'src/apis/reservations/entities/reservation.entity';
 import { Review } from 'src/apis/reviews/entities/review.entity';
 import { ShopImage } from 'src/apis/shopImages/entities/shopImages.entity';
 import {
-	Any,
 	Column,
 	DeleteDateColumn,
 	Entity,
@@ -60,21 +59,21 @@ export class Shop {
 	@OneToMany(() => Reservation, (reservation) => reservation.shop, {
 		nullable: true,
 	})
-	@Field(() => [Reservation])
+	@Field(() => [Reservation], { nullable: true })
 	reservation: Reservation[];
 
 	// 가게(own):가게이미지 = 1:N
 	@OneToMany(() => ShopImage, (shopImage) => shopImage.shop, {
 		nullable: true,
 	})
-	@Field(() => [ShopImage])
+	@Field(() => [ShopImage], { nullable: true })
 	image: ShopImage[];
 
 	// 가게(own):리뷰 = 1:N
 	@OneToMany(() => Review, (review) => review.shop, {
 		nullable: true,
 	})
-	@Field(() => [Review])
+	@Field(() => [Review], { nullable: true })
 	review: Review[];
 
 	// logstash 데이터 폴링 기준 칼럼

src/apis/users/entities/user.entity.ts

@@ -51,14 +51,20 @@ export class User {
 	updateAt: Date;
 
 	// Dog
-	@OneToMany(() => Dog, (dogs) => dogs.user)
-	@Field(() => [Dog])
+	@OneToMany(
+		() => Dog,
+		(dogs) => dogs.user, //
+		{ nullable: true },
+	)
+	@Field(() => [Dog], { nullable: true })
 	dogs: Dog[];
 
 	// reservation
-	@OneToMany(() => Reservation, (reservation) => reservation.user, {
-		nullable: true,
-	})
-	@Field(() => [Reservation])
+	@OneToMany(
+		() => Reservation,
+		(reservation) => reservation.user, //
+		{ nullable: true },
+	)
+	@Field(() => [Reservation], { nullable: true })
 	reservation: Reservation[];
 }

src/app.module.ts

@@ -71,7 +71,7 @@ import { HttpExceptionFilter } from './commons/filter/http-exception.filter';
 			password: process.env.DATABASE_PASSWORD,
 			database: process.env.DATABASE_DATABASE,
 			entities: [__dirname + '/apis/**/*.entity.*'],
-			synchronize: false,
+			synchronize: true,
 			logging: true,
 		}),
 		CacheModule.register<RedisClientOptions>({