[ chore ] develop 브랜치 변경 사항 적용

cloudbuild.yaml

@@ -16,7 +16,7 @@ steps:
       - set
       - image
       - deployment/groomeong-backend
-      - backend-sha256-1=asia.gcr.io/project-groomeong/backend:2.5
+      - backend-sha256-1=asia.gcr.io/project-groomeong/backend:2.7
     env:
       - CLOUDSDK_COMPUTE_ZONE=asia-northeast3
       - CLOUDSDK_CONTAINER_CLUSTER=autopilot-cluster-5
@@ -26,7 +26,7 @@ steps:
       - set
       - image
       - deployment/groomeong-logstash
-      - logstash-sha256-1=asia.gcr.io/project-groomeong/logstash:1.2
+      - logstash-sha256-1=asia.gcr.io/project-groomeong/logstash:1.3
     env:
       - CLOUDSDK_COMPUTE_ZONE=asia-northeast3
       - CLOUDSDK_CONTAINER_CLUSTER=autopilot-cluster-5

docker-compose.prod.yaml

@@ -2,14 +2,14 @@ version: '3.7'
 
 services:
   my-backend:
-    image: asia.gcr.io/project-groomeong/backend:2.5
+    image: asia.gcr.io/project-groomeong/backend:2.7
     platform: linux/x86_64
     build:
       context: .
       dockerfile: Dockerfile.prod
 
   logstash:
-    image: asia.gcr.io/project-groomeong/logstash:1.2
+    image: asia.gcr.io/project-groomeong/logstash:1.3
     platform: linux/x86_64
     build:
       context: .

elk/logstash/logstash.prod.conf

@@ -5,7 +5,7 @@ input {
         jdbc_connection_string => "jdbc:mysql://10.42.208.3:3306/prod" # jdbc:mysql://SQL인스턴스비공개IP주소:포트번호/db이름
         jdbc_user => "root"
         jdbc_password => "root"
-        schedule => "*/30 * * * *"
+        schedule => "*/5 * * * *"
         use_column_value => true
         tracking_column => "updatedat"
         tracking_column_type => "numeric"

src/apis/users/user.service.ts

@@ -46,7 +46,12 @@ export class UsersService {
 	async findOne({ userId }: IUsersServiceFindOne): Promise<User> {
 		const myUser = await this.userRepository.findOne({
 			where: { id: userId },
-			relations: { reservation: true },
+			relations: [
+				'reservation',
+				'reservation.shop',
+				'dogs',
+				'reservation.review',
+			],
 		});
 		if (!myUser) {
 			throw new NotFoundException(`ID가 ${userId}인 회원을 찾을 수 없습니다`);
@@ -135,6 +140,7 @@ export class UsersService {
 	async findUserDog({ email }: IUsersServiceFindUserDog): Promise<User> {
 		const result = await this.userRepository.findOne({
 			where: { email },
+			relations: ['reservation', 'reservation.shop', 'reservation.review'],
 		});
 		return result;
 	}