From 2a8801b5100681500873265c10fc7ffe4b0fc673 Mon Sep 17 00:00:00 2001
From: kkangh00n <kig2454@gmail.com>
Date: Sun, 7 Jan 2024 21:40:02 +0900
Subject: [PATCH] fix : conflict resolve
---
.../com/prgrms/catchtable/owner/fixture/OwnerFixture.java | 4 +++-
.../controller/OwnerReservationControllerTest.java | 2 +-
.../reservation/service/OwnerReservationServiceTest.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/test/java/com/prgrms/catchtable/owner/fixture/OwnerFixture.java b/src/test/java/com/prgrms/catchtable/owner/fixture/OwnerFixture.java
index f8cd2c02..5666f366 100644
--- a/src/test/java/com/prgrms/catchtable/owner/fixture/OwnerFixture.java
+++ b/src/test/java/com/prgrms/catchtable/owner/fixture/OwnerFixture.java
@@ -14,9 +14,11 @@
public class OwnerFixture {
- public static Owner getOwner() {
+ public static Owner getOwner(String email, String password) {
Owner owner = Owner.builder()
.name("ownerA")
+ .email(email)
+ .password(password)
.phoneNumber("010-3462-2480")
.gender(MALE)
.dateBirth(LocalDate.of(2000, 9, 13))
diff --git a/src/test/java/com/prgrms/catchtable/reservation/controller/OwnerReservationControllerTest.java b/src/test/java/com/prgrms/catchtable/reservation/controller/OwnerReservationControllerTest.java
index a0237637..e2d7ef7b 100644
--- a/src/test/java/com/prgrms/catchtable/reservation/controller/OwnerReservationControllerTest.java
+++ b/src/test/java/com/prgrms/catchtable/reservation/controller/OwnerReservationControllerTest.java
@@ -62,7 +62,7 @@ void setUp() {
Reservation reservation2 = reservationRepository.save(
ReservationFixture.getReservation(savedReservationTime2));
- Owner owner = OwnerFixture.getOwner();
+ Owner owner = OwnerFixture.getOwner("email", "password");
owner.insertShop(shop);
ownerRepository.save(owner);
}
diff --git a/src/test/java/com/prgrms/catchtable/reservation/service/OwnerReservationServiceTest.java b/src/test/java/com/prgrms/catchtable/reservation/service/OwnerReservationServiceTest.java
index f114d342..96c21097 100644
--- a/src/test/java/com/prgrms/catchtable/reservation/service/OwnerReservationServiceTest.java
+++ b/src/test/java/com/prgrms/catchtable/reservation/service/OwnerReservationServiceTest.java
@@ -109,7 +109,7 @@ void getAllReservation() {
reservations.add(reservation1);
reservations.add(reservation2);
- Owner owner = OwnerFixture.getOwner();
+ Owner owner = OwnerFixture.getOwner("email", "password");
when(reservationRepository.findAllWithReservationTimeAndShopByShopId(
any(Long.class))).thenReturn(reservations);
when(ownerRepository.findById(any(Long.class))).thenReturn(Optional.of(owner));
@@ -127,7 +127,7 @@ void getAllReservation() {
@Test
@DisplayName("매장에 예약이 없을 시 빈 리스트가 조회된다.")
void getAllReservationEmpty() {
- Owner owner = OwnerFixture.getOwner();
+ Owner owner = OwnerFixture.getOwner("email", "password");
when(reservationRepository.findAllWithReservationTimeAndShopByShopId(
any(Long.class))).thenReturn(List.of());