readme 수정

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/dogs/__test__/dogs.mocking.ts

@@ -26,17 +26,3 @@ export const MOCK_DOG = {
 	deletedAt: null,
 	userId: 'c84fa63e-7a05-4cd5-b015-d4db9a262b18',
 };
-
-export const UPDATED_MOCK_DOG = {
-	id: '3ce6246c-f37a-426e-b95a-b38ec6d55f4e',
-	name: '댕댕이',
-	age: 5,
-	weight: 10.5,
-	breed: DOG_TYPE.LARGE,
-	specifics: '성격이 착해요',
-	image:
-		'https://storage.cloud.google.com/groomeong-storage/origin/dog/a6c16f50-2946-4dfb-9785-a782cea6c570/%03b%EF%BF%BD2.jpeg',
-	createdAt: '2023-03-21 12:13:02.011088',
-	deletedAt: null,
-	userId: 'c84fa63e-7a05-4cd5-b015-d4db9a262b18',
-};

src/apis/dogs/__test__/dogs.resolver.spec.ts

@@ -7,11 +7,9 @@ import * as httpMocks from 'node-mocks-http';
 import { IContext } from 'src/commons/interface/context';
 import { User } from 'src/apis/users/entities/user.entity';
 import { CreateDogInput } from '../dto/create-dog.input';
-import { UpdateDogInput } from '../dto/update-dog.input';
-import { MOCK_DOG, MOCK_USER, UPDATED_MOCK_DOG } from './dogs.mocking';
+import { MOCK_DOG, MOCK_USER } from './dogs.mocking';
 import { getRepositoryToken } from '@nestjs/typeorm';
 import { Dog } from '../entities/dog.entity';
-import { DOG_TYPE } from '../enum/dog-type.enum';
 
 describe('DogsResolver', () => {
 	let dogsResolver: DogsResolver;
@@ -146,64 +144,6 @@ describe('DogsResolver', () => {
 		});
 	});
 
-	describe('updateDog', () => {
-		const updateDogInput: UpdateDogInput = {
-			weight: UPDATED_MOCK_DOG.weight,
-			breed: UPDATED_MOCK_DOG.breed,
-		};
-
-		it('업데이트한 강아지 정보를 리턴해야 함', async () => {
-			mockDogsRepository.findOne.mockImplementation(
-				(where: { id: string }, relations: { user: true }) => MOCK_DOG,
-			);
-			mockDogsService.findOneById.mockImplementation((id: string) => MOCK_DOG);
-			mockDogsRepository.save.mockImplementation(
-				(
-					id: string,
-					name: string,
-					age: number,
-					weight: number,
-					breed: DOG_TYPE,
-					specifics: string,
-					image: string,
-					createdAt: Date,
-					deleledAt: Date,
-					userId: string,
-				) => UPDATED_MOCK_DOG,
-			);
-			mockDogsService.updateOneById.mockImplementation(
-				(id: string, updateDogInput: UpdateDogInput) => UPDATED_MOCK_DOG,
-			);
-
-			const result = await dogsResolver.updateDog(MOCK_DOG.id, updateDogInput);
-			expect(result).toEqual(UPDATED_MOCK_DOG);
-			expect(mockDogsService.updateOneById).toHaveBeenCalledWith({
-				id: MOCK_DOG.id,
-				updateDogInput,
-			});
-		});
-
-		it('NotFoundException을 던져야 함', () => {
-			const invalidMockId = '3ce6246c-f37a-426e-b95a-b38ec6d55f4f';
-			mockDogsRepository.findOne.mockImplementation(
-				(where: { id: string }) => null,
-			);
-
-			try {
-				dogsResolver.updateDog(invalidMockId, updateDogInput);
-			} catch (error) {
-				expect(error).toBeInstanceOf(NotFoundException);
-				expect(error.message).toBe(
-					`id ${invalidMockId}를 갖는 강아지를 찾을 수 없음`,
-				);
-			}
-			expect(mockDogsService.updateOneById).toHaveBeenCalledWith({
-				id: invalidMockId,
-				updateDogInput,
-			});
-		});
-	});
-
 	describe('deleteDog', () => {
 		it('삭제 여부 true를 반환해야 함', async () => {
 			mockDogsRepository.findOne.mockImplementation(

src/apis/reviews/reviews.resolver.ts

@@ -12,18 +12,20 @@ export class ReviewsResolver {
 		private readonly reviewsService: ReviewsService, //
 	) {}
 
-	@Query(() => Review, {
-		description: 'Return: 리뷰ID 기준으로 1개 불러오기',
-	})
+	@Query(
+		() => Review, //
+		{ description: 'Return: 리뷰ID 기준으로 1개 불러오기' },
+	)
 	fetchReview(
 		@Args('reviewId') reviewId: string, //
 	): Promise<Review> {
 		return this.reviewsService.find({ reviewId });
 	}
 
-	@Query(() => [Review], {
-		description: 'Return: 가게ID 기준으로 모든 리뷰 불러오기',
-	})
+	@Query(
+		() => [Review], //
+		{ description: 'Return: 가게ID 기준으로 모든 리뷰 불러오기' },
+	)
 	async fetchReviewsByShopId(
 		@Args({ name: 'page', defaultValue: 1, nullable: true })
 		page: number, //
@@ -40,9 +42,10 @@ export class ReviewsResolver {
 	}
 
 	@UseGuards(GqlAuthGuard('access'))
-	@Mutation(() => Review, {
-		description: 'Return: 신규 생성된 리뷰 데이터',
-	})
+	@Mutation(
+		() => Review, //
+		{ description: 'Return: 신규 생성된 리뷰 데이터' },
+	)
 	createReview(
 		@Args('createReviewInput') createReviewInput: CreateReviewInput, //
 		@Context() context: IContext,
@@ -54,9 +57,10 @@ export class ReviewsResolver {
 		});
 	}
 
-	@Mutation(() => Boolean, {
-		description: 'Return: 리뷰 삭제 후 true 반환',
-	})
+	@Mutation(
+		() => Boolean, //
+		{ description: 'Return: 리뷰 삭제 후 true 반환' },
+	)
 	deleteReview(
 		@Args('reviewId') id: string, //
 	): Promise<boolean> {

src/apis/reviews/reviews.service.ts

@@ -23,7 +23,6 @@ export class ReviewsService {
 		private readonly shopsService: ShopsService,
 	) {}
 
-	// 리뷰 가져오기
 	async find({ reviewId }: IReviewServiceFindById): Promise<Review> {
 		const result = await this.reviewsRepository.findOne({
 			where: { id: reviewId },
@@ -37,7 +36,6 @@ export class ReviewsService {
 		return result;
 	}
 
-	// 가게의 모든 리뷰 가져오기
 	async findByShopIdWithPage({
 		page,
 		count, //

src/apis/shopImages/shopImage.resolver.ts

@@ -9,47 +9,56 @@ export class ShopImagesResolver {
 		private readonly shopImagesService: ShopImagesService, //
 	) {}
 
-	@Query(() => ShopImage, {
-		description: 'Return: 입력한 가게의 썸네일 가게이미지(1개)',
-	})
+	@Query(
+		() => ShopImage, //
+		{ description: 'Return: 입력한 가게의 썸네일 가게이미지(1개)' },
+	)
 	fetchThumbnailByShop(
 		@Args('shopId') shopId: string, //
 	): Promise<ShopImage> {
 		return this.shopImagesService.findThumbnailByShopId({ shopId });
 	}
 
-	@Query(() => [ShopImage], {
-		description: 'Return: 입력한 가게의 모든 가게이미지',
-	})
+	@Query(
+		() => [ShopImage], //
+		{ description: 'Return: 입력한 가게의 모든 가게이미지' },
+	)
 	fetchShopImagesByShop(
 		@Args('shopId') shopId: string, //
 	): Promise<ShopImage[]> {
 		return this.shopImagesService.findByShopId({ shopId });
 	}
 
-	@Mutation(() => ShopImage, {
-		description: 'Return: 신규 생성된 가게이미지 데이터',
-	})
+	@Mutation(
+		() => ShopImage, //
+		{ description: 'Return: 신규 생성된 가게이미지 데이터' },
+	)
 	async createShopImage(
 		@Args('imageUrl') imageUrl: string,
 		@Args('isThumbnail') isThumbnail: boolean,
 		@Args('shopId') shopId: string,
 	): Promise<ShopImage> {
-		return await this.shopImagesService.save({ imageUrl, isThumbnail, shopId });
+		return await this.shopImagesService.create({
+			imageUrl,
+			isThumbnail,
+			shopId,
+		});
 	}
 
-	@Mutation(() => ShopImage, {
-		description: 'Return: 업데이트된 가게이미지 데이터',
-	})
+	@Mutation(
+		() => ShopImage, //
+		{ description: 'Return: 업데이트된 가게이미지 데이터' },
+	)
 	async updateShopImage(
 		@Args('updateShopImageInput') updateShopImageInput: UpdateShopImageInput,
 	): Promise<ShopImage> {
 		return await this.shopImagesService.update({ updateShopImageInput });
 	}
 
-	@Mutation(() => Boolean, {
-		description: 'Return: 가게 이미지 삭제 완료 시, true',
-	})
+	@Mutation(
+		() => Boolean, //
+		{ description: 'Return: 가게 이미지 삭제 완료 시, true' },
+	)
 	deleteShopImage(
 		@Args('shopImageId') shopImageId: string, //
 	): Promise<boolean> {

src/apis/shopImages/shopImage.service.ts

@@ -1,7 +1,6 @@
 import {
 	ConflictException,
 	Injectable,
-	NotFoundException,
 	UnprocessableEntityException,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
@@ -24,7 +23,6 @@ export class ShopImagesService {
 		private readonly shopsService: ShopsService,
 	) {}
 
-	// 가게ID로 썸네일 찾기
 	async findThumbnailByShopId({
 		shopId,
 	}: IShopImagesServiceFindThumbnail): Promise<ShopImage> {
@@ -44,7 +42,6 @@ export class ShopImagesService {
 		});
 	}
 
-	// 가게ID로 해당 이미지 찾기
 	async findByShopId({
 		shopId,
 	}: IShopImagesServiceFindByShopId): Promise<ShopImage[]> {
@@ -61,8 +58,7 @@ export class ShopImagesService {
 		});
 	}
 
-	// DB테이블에 신규 이미지 저장
-	async save({
+	async create({
 		imageUrl,
 		isThumbnail,
 		shopId,
@@ -81,7 +77,6 @@ export class ShopImagesService {
 		});
 	}
 
-	// DB테이블에서 이미지 업데이트
 	async update({
 		updateShopImageInput,
 	}: IShopImagesServiceUpdate): Promise<ShopImage> {
@@ -90,14 +85,10 @@ export class ShopImagesService {
 			imageUrl: updateShopImageInput.imageUrl,
 		});
 		return await this.shopImageRepository.save({
-			id: updateShopImageInput.id,
-			imageUrl: updateShopImageInput.imageUrl,
-			isThumbnail: updateShopImageInput.isThumbnail,
-			shop: { id: updateShopImageInput.shopId },
+			...updateShopImageInput,
 		});
 	}
 
-	// DB테이블에서 이미지 삭제
 	async delete({ shopImageId }: IShopImagesServiceDelete): Promise<boolean> {
 		const checkImage = await this.shopImageRepository.findOne({
 			where: { id: shopImageId },
@@ -108,12 +99,10 @@ export class ShopImagesService {
 				`가게이미지ID가 ${shopImageId}인 이미지를 찾을 수 없습니다`,
 			);
 		}
-		console.log('찾았음');
 
 		const result = await this.shopImageRepository.delete({
 			id: shopImageId,
 		});
-		console.log('✨✨✨ 삭제 완료 ✨✨✨');
 
 		return result.affected ? true : false;
 	}