[BUILD FAIL] 테스트클래스 @Transactional 삭제 및 애플리케이션 내 마이크로 초단위 초단위로 변경

.gitignore

@@ -42,4 +42,5 @@ application-pub.yml
 application-local.yml
 application-*.yml
 application_log
-*.gz
+*.gz
+!**/src/test/resources/application-test.yml

src/main/java/com/example/demo/controller/StudyOnceController.java

@@ -1,6 +1,7 @@
 package com.example.demo.controller;
 
 import static com.example.demo.exception.ExceptionType.*;
+import static com.example.demo.util.TruncatedTimeUtil.*;
 
 import java.time.LocalDateTime;
 
@@ -96,7 +97,7 @@ public ResponseEntity<StudyOnceResponse> update(@PathVariable Long studyOnceId,
 		if (studyOnceService.doesOnlyStudyLeaderExist(studyOnceId)) {
 			studyOnceService.updateStudyOnce(leaderId, studyOnceId, request, LocalDateTime.now());
 		} else {
-			studyOnceService.updateStudyOncePartially(leaderId, studyOnceId, request, LocalDateTime.now());
+			studyOnceService.updateStudyOncePartially(leaderId, studyOnceId, request);
 		}
 		StudyOnceResponse response = studyOnceService.findStudyOnce(studyOnceId, LocalDateTime.now());
 		return ResponseEntity.ok(response);
@@ -106,9 +107,8 @@ public ResponseEntity<StudyOnceResponse> update(@PathVariable Long studyOnceId,
 	public ResponseEntity<StudyOnceJoinResult> tryJoin(@PathVariable Long studyOnceId,
 		@RequestHeader("Authorization") String authorization) {
 		long memberId = cafegoryTokenManager.getIdentityId(authorization);
-		LocalDateTime requestTime = LocalDateTime.now();
 		studyOnceService.tryJoin(memberId, studyOnceId);
-		return ResponseEntity.ok(new StudyOnceJoinResult(requestTime, true));
+		return ResponseEntity.ok(new StudyOnceJoinResult(LOCAL_DATE_TIME_NOW, true));
 	}
 
 	@DeleteMapping("/{studyOnceId:[0-9]+}")
@@ -117,7 +117,8 @@ public ResponseEntity<StudyOnceQuitResponse> tryQuit(@PathVariable Long studyOnc
 		long memberId = cafegoryTokenManager.getIdentityId(authorization);
 		LocalDateTime requestTime = LocalDateTime.now();
 		studyOnceService.tryQuit(memberId, studyOnceId);
-		return ResponseEntity.ok(new StudyOnceQuitResponse(requestTime, true));
+		return ResponseEntity.ok(
+			new StudyOnceQuitResponse(truncateDateTimeToSecond(requestTime), true));
 	}
 
 	@PatchMapping("/{studyOnceId:[0-9]+}/attendance")
@@ -126,7 +127,7 @@ public ResponseEntity<UpdateAttendanceResponse> takeAttendance(@PathVariable Lon
 		@RequestBody UpdateAttendanceRequest request) {
 		long leaderId = cafegoryTokenManager.getIdentityId(authorization);
 		UpdateAttendanceResponse response = studyOnceService.updateAttendances(leaderId, studyOnceId,
-			request, LocalDateTime.now());
+			request, LOCAL_DATE_TIME_NOW);
 		return ResponseEntity.ok(response);
 	}
 

src/main/java/com/example/demo/domain/BaseEntity.java

@@ -1,5 +1,7 @@
 package com.example.demo.domain;
 
+import static com.example.demo.util.TruncatedTimeUtil.*;
+
 import java.time.LocalDateTime;
 
 import javax.persistence.Column;
@@ -21,13 +23,13 @@ public class BaseEntity {
 
 	@PrePersist
 	public void prePersist() {
-		LocalDateTime now = LocalDateTime.now();
+		LocalDateTime now = LOCAL_DATE_TIME_NOW;
 		createdDate = now;
 		lastModifiedDate = now;
 	}
 
 	@PreUpdate
 	public void preUpdate() {
-		lastModifiedDate = LocalDateTime.now();
+		lastModifiedDate = LOCAL_DATE_TIME_NOW;
 	}
 }

src/main/java/com/example/demo/domain/cafe/Address.java

@@ -19,10 +19,6 @@ public Address(final String fullAddress, final String region) {
 		this.region = region;
 	}
 
-	public boolean isInRegion(String region) {
-		return true;
-	}
-
 	public String showFullAddress() {
 		return getFullAddress();
 	}

src/main/java/com/example/demo/domain/cafe/BusinessHour.java

@@ -37,7 +37,10 @@ public class BusinessHour {
 	@Column(name = "days_of_week")
 	private String day;
 
+	/// columnDefinition 옵션은 나중에 DB에 직접 적용하고 삭제할 것
+	@Column(columnDefinition = "TIME(6)")
 	private LocalTime startTime;
+	@Column(columnDefinition = "TIME(6)")
 	private LocalTime endTime;
 
 	@ManyToOne(fetch = FetchType.LAZY)

src/main/java/com/example/demo/domain/cafe/BusinessHourOpenChecker.java

@@ -1,5 +1,7 @@
 package com.example.demo.domain.cafe;
 
+import static com.example.demo.util.TruncatedTimeUtil.*;
+
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -40,7 +42,7 @@ private boolean isTodayBusinessDay(DayOfWeek businessDay, LocalDateTime now, boo
 	}
 
 	private boolean is24HourBusiness(LocalTime startTime, LocalTime endTime) {
-		return startTime.equals(LocalTime.MIN) && endTime.equals(LocalTime.MAX);
+		return startTime.equals(LocalTime.MIN) && endTime.equals(MAX_LOCAL_TIME);
 	}
 
 	private boolean isOpenOvernight(LocalTime startTime, LocalTime endTime) {
@@ -58,7 +60,7 @@ private boolean isOpenDuringDay(LocalTime startTime, LocalTime endTime, LocalTim
 
 	@Override
 	public boolean checkWithBusinessHours(List<BusinessHour> businessHours, LocalDateTime now) {
-		if (!hasMatchingDayOfWeek(businessHours, now)) {
+		if (!hasMatchingDayOfWeek(businessHours, truncateDateTimeToSecond(now))) {
 			throw new CafegoryException(ExceptionType.CAFE_NOT_FOUND_DAY_OF_WEEK);
 		}
 		return businessHours.stream()
@@ -68,33 +70,37 @@ public boolean checkWithBusinessHours(List<BusinessHour> businessHours, LocalDat
 
 	public boolean checkBetweenBusinessHours(LocalTime businessStartTime, LocalTime businessEndTime,
 		LocalTime chosenStartTime, LocalTime chosenEndTime) {
+		LocalTime truncatedStartTime = truncateTimeToSecond(chosenStartTime);
+		LocalTime truncatedEndTime = truncateTimeToSecond(chosenEndTime);
+
 		// 영업 시작시간이 당일, 영업 종료시간이 당일
 		if (businessStartTime.isBefore(businessEndTime)) {
-			return (businessStartTime.equals(chosenStartTime) || businessStartTime.isBefore(chosenStartTime)) && (
-				businessEndTime.equals(chosenEndTime) || businessEndTime.isAfter(chosenEndTime));
+			return (businessStartTime.equals(truncatedStartTime) || businessStartTime.isBefore(truncatedStartTime))
+				&& (
+				businessEndTime.equals(truncatedEndTime) || businessEndTime.isAfter(truncatedEndTime));
 		}
 		// 영업 시작시간이 당일, 영업 종료시간이 다음날
 		if (businessStartTime.isAfter(businessEndTime)) {
 			LocalDateTime businessStartDateTime = LocalDateTime.of(LocalDate.now(), businessStartTime);
 			LocalDateTime businessEndDateTime = LocalDateTime.of(LocalDate.now().plusDays(1), businessEndTime);
 			// 선택된 시작시간이 당일, 선택된 종료시간이 당일 || 선택된 시작시간이 다음날, 선택된 종료시간이 다음날
-			if (chosenStartTime.isBefore(chosenEndTime)) {
+			if (truncatedStartTime.isBefore(truncatedEndTime)) {
 				LocalDate chosenDate = LocalDate.now();
 
-				boolean isChosenTimeOvernight = businessStartTime.isAfter(chosenStartTime);
+				boolean isChosenTimeOvernight = businessStartTime.isAfter(truncatedStartTime);
 				LocalDate date = isChosenTimeOvernight ? chosenDate.plusDays(1) : chosenDate;
 				LocalDateTime chosenStartDateTime = LocalDateTime.of(date, chosenStartTime);
-				LocalDateTime chosenEndDateTime = LocalDateTime.of(date, chosenEndTime);
+				LocalDateTime chosenEndDateTime = LocalDateTime.of(date, truncatedEndTime);
 
 				return (businessStartDateTime.isBefore(chosenStartDateTime) || businessStartDateTime.equals(
 					chosenStartDateTime))
 					&& (businessEndDateTime.isAfter(chosenEndDateTime) || businessEndDateTime.equals(
 					chosenEndDateTime));
 			}
 			// 선택된 시작시간이 당일, 선택된 종료시간이 다음날
-			if (chosenStartTime.isAfter(chosenEndTime)) {
-				LocalDateTime chosenStartDateTime = LocalDateTime.of(LocalDate.now(), chosenStartTime);
-				LocalDateTime chosenEndDateTime = LocalDateTime.of(LocalDate.now().plusDays(1), chosenEndTime);
+			if (truncatedStartTime.isAfter(truncatedEndTime)) {
+				LocalDateTime chosenStartDateTime = LocalDateTime.of(LocalDate.now(), truncatedStartTime);
+				LocalDateTime chosenEndDateTime = LocalDateTime.of(LocalDate.now().plusDays(1), truncatedEndTime);
 				return (businessStartDateTime.equals(chosenStartDateTime) || businessStartDateTime.isBefore(
 					chosenStartDateTime)) && (businessEndDateTime.equals(chosenEndDateTime)
 					|| businessEndDateTime.isAfter(chosenEndDateTime));

src/main/java/com/example/demo/domain/cafe/Cafe.java

@@ -1,13 +1,14 @@
 package com.example.demo.domain.cafe;
 
 import static com.example.demo.exception.ExceptionType.*;
+import static com.example.demo.util.TruncatedTimeUtil.*;
 
 import java.time.DayOfWeek;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.OptionalDouble;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -54,7 +55,7 @@ public class Cafe {
 	private boolean isAbleToStudy;
 	private int minBeveragePrice;
 
-	@OneToMany(mappedBy = "cafe")
+	@OneToMany(mappedBy = "cafe", cascade = CascadeType.ALL, orphanRemoval = true)
 	@Builder.Default
 	private List<BusinessHour> businessHours = new ArrayList<>();
 
@@ -83,7 +84,7 @@ public String getRegion() {
 	}
 
 	public boolean isOpen(OpenChecker<BusinessHour> openChecker) {
-		return openChecker.checkWithBusinessHours(this.businessHours, LocalDateTime.now());
+		return openChecker.checkWithBusinessHours(this.businessHours, LOCAL_DATE_TIME_NOW);
 	}
 
 	public OptionalDouble calcAverageRating() {
@@ -98,4 +99,8 @@ public BusinessHour findBusinessHour(DayOfWeek dayOfWeek) {
 			.findFirst()
 			.orElseThrow(() -> new CafegoryException(CAFE_NOT_FOUND_DAY_OF_WEEK));
 	}
+
+	public void changeBusinessHours(List<BusinessHour> businessHours) {
+		this.businessHours = businessHours;
+	}
 }

src/main/java/com/example/demo/domain/cafe/CafeSearchCondition.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.cafe;
 
 import static com.example.demo.exception.ExceptionType.*;
+import static com.example.demo.util.TruncatedTimeUtil.*;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -40,7 +41,7 @@ public static class Builder {
 		private MinMenuPrice minMenuPrice;
 		private LocalTime startTime;
 		private LocalTime endTime;
-		private LocalDateTime now = LocalDateTime.now();
+		private LocalDateTime now = LOCAL_DATE_TIME_NOW;
 
 		public Builder(boolean isAbleToStudy, String region) {
 			this.isAbleToStudy = isAbleToStudy;
@@ -80,7 +81,7 @@ public CafeSearchCondition build() {
 
 		private LocalTime calcLocalTime(int time) {
 			if (time == END_TIME) {
-				return LocalTime.MAX;
+				return MAX_LOCAL_TIME;
 			}
 			return LocalTime.of(time, 0);
 		}

src/main/java/com/example/demo/domain/member/Member.java

@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
@@ -45,7 +44,7 @@ public class Member {
 	private String email;
 	private String introduction;
 
-	@OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+	@OneToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "thumbnail_image_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private ThumbnailImage thumbnailImage;
 

src/main/java/com/example/demo/domain/study/StudyOnce.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.study;
 
 import static com.example.demo.exception.ExceptionType.*;
+import static com.example.demo.util.TruncatedTimeUtil.*;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -96,7 +97,7 @@ private StudyOnce(Long id, String name, Cafe cafe, LocalDateTime startDateTime,
 	}
 
 	private void validateStartDateTime(LocalDateTime startDateTime) {
-		LocalDateTime now = LocalDateTime.now();
+		LocalDateTime now = LOCAL_DATE_TIME_NOW;
 		Duration between = Duration.between(now, startDateTime);
 		if (between.toSeconds() < 3 * 60 * 60) {
 			throw new CafegoryException(ExceptionType.STUDY_ONCE_WRONG_START_TIME);
@@ -116,7 +117,9 @@ private void validateStudyOnceTime(LocalDateTime startDateTime, LocalDateTime en
 	}
 
 	private void validateStartAndEndTime(LocalTime startLocalTime, LocalTime endLocalTime) {
-		if (!(startLocalTime.equals(LocalTime.of(23, 0)) && endLocalTime.equals(LocalTime.MAX))) {
+		if (!(startLocalTime.equals(LocalTime.of(23, 0)) &&
+			(endLocalTime.equals(MAX_LOCAL_TIME) || endLocalTime.equals(LocalTime.of(23, 59, 59))))
+		) {
 			throw new CafegoryException(STUDY_ONCE_SHORT_DURATION);
 		}
 	}
@@ -199,7 +202,7 @@ public boolean isLeader(Member member) {
 	}
 
 	public boolean canJoin(LocalDateTime baseDateTime) {
-		Duration between = Duration.between(baseDateTime, startDateTime);
+		Duration between = Duration.between(truncateDateTimeToSecond(baseDateTime), startDateTime);
 		return between.toSeconds() >= 60 * 60;
 	}
 

src/main/java/com/example/demo/mapper/CafeMapper.java

@@ -14,7 +14,6 @@
 import com.example.demo.dto.cafe.CafeSearchListRequest;
 import com.example.demo.dto.cafe.CafeSearchListResponse;
 import com.example.demo.dto.cafe.CafeSearchResponse;
-import com.example.demo.dto.cafe.CafeSearchReviewResponse;
 import com.example.demo.dto.cafe.CafeSearchSnsResponse;
 import com.example.demo.dto.cafe.CafeSearchStudyOnceResponse;
 import com.example.demo.dto.cafe.SnsResponse;
@@ -90,7 +89,6 @@ public CafeSearchResponse toCafeSearchResponse(
 		Cafe findCafe,
 		List<CafeSearchBusinessHourResponse> cafeSearchBusinessHourResponses,
 		List<CafeSearchSnsResponse> cafeSearchSnsResponses,
-		List<CafeSearchReviewResponse> cafeSearchReviewResponses,
 		List<CafeSearchStudyOnceResponse> cafeSearchStudyOnceResponses,
 		OpenChecker<BusinessHour> openChecker) {
 		return CafeSearchResponse.builder()
@@ -117,7 +115,6 @@ public CafeSearchResponse toCafeSearchResponseWithEmptyInfo(
 		Cafe findCafe,
 		List<CafeSearchBusinessHourResponse> businessHourResponses,
 		List<CafeSearchSnsResponse> snsResponses,
-		List<CafeSearchReviewResponse> reviewResponses,
 		OpenChecker<BusinessHour> openChecker
 	) {
 		return CafeSearchResponse.builder()

src/main/java/com/example/demo/repository/study/StudyOnceRepositoryImpl.java

@@ -1,5 +1,7 @@
 package com.example.demo.repository.study;
 
+import static com.example.demo.util.TruncatedTimeUtil.*;
+
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -54,7 +56,7 @@ public Long count(StudyOnceSearchRequest studyOnceSearchRequest) {
 	}
 
 	private BooleanExpression studyJoinAbleFilter(boolean onlyJoinAble) {
-		LocalDateTime base = LocalDateTime.now().plusHours(3);
+		LocalDateTime base = LOCAL_DATE_TIME_NOW.plusHours(3);
 		if (onlyJoinAble) {
 			return qStudyOnce.startDateTime.after(base)
 				.or(qStudyOnce.startDateTime.eq(base));

src/main/java/com/example/demo/service/cafe/CafeServiceImpl.java

@@ -77,7 +77,6 @@ public CafeSearchResponse searchCafeForMemberByCafeId(Long cafeId, Long memberId
 			findCafe,
 			businessHourMapper.toCafeSearchBusinessHourResponses(findCafe.getBusinessHours()),
 			snsDetailMapper.toCafeSearchSnsResponses(findCafe.getSnsDetails()),
-			reviewMapper.toCafeSearchReviewResponses(findCafe.getReviews()),
 			studyOnceMapper.toCafeSearchStudyOnceResponse(findCafe),
 			openChecker
 		);
@@ -90,7 +89,6 @@ public CafeSearchResponse searchCafeForNotMemberByCafeId(Long cafeId) {
 			findCafe,
 			businessHourMapper.toCafeSearchBusinessHourResponses(findCafe.getBusinessHours()),
 			snsDetailMapper.toCafeSearchSnsResponses(findCafe.getSnsDetails()),
-			reviewMapper.toCafeSearchReviewResponses(findCafe.getReviews()),
 			openChecker
 		);
 	}

src/main/java/com/example/demo/service/profile/ProfileService.java

@@ -1,14 +1,20 @@
 package com.example.demo.service.profile;
 
+import static com.example.demo.util.TruncatedTimeUtil.*;
+
 import java.time.LocalDateTime;
 
+import org.springframework.transaction.annotation.Transactional;
+
 import com.example.demo.dto.profile.ProfileGetResponse;
 import com.example.demo.dto.profile.ProfileUpdateRequest;
 import com.example.demo.dto.profile.ProfileUpdateResponse;
 
 public interface ProfileService {
+
+	@Transactional
 	default ProfileGetResponse get(Long requestMemberId, Long targetMemberId) {
-		return get(requestMemberId, targetMemberId, LocalDateTime.now());
+		return get(requestMemberId, targetMemberId, LOCAL_DATE_TIME_NOW);
 	}
 
 	ProfileGetResponse get(Long requestMemberId, Long targetMemberId, LocalDateTime baseDateTime);

src/main/java/com/example/demo/service/study/StudyOnceService.java

@@ -45,6 +45,5 @@ UpdateAttendanceResponse updateAttendances(long leaderId, long studyOnceId,
 
 	void updateStudyOnce(long requestedMemberId, long studyOnceId, StudyOnceUpdateRequest request, LocalDateTime now);
 
-	void updateStudyOncePartially(long requestedMemberId, long studyOnceId, StudyOnceUpdateRequest request,
-		LocalDateTime now);
+	void updateStudyOncePartially(long requestedMemberId, long studyOnceId, StudyOnceUpdateRequest request);
 }