Skip to content

Commit 123484a

Browse files
committed
πŸ› fix: νŒ¨ν‚€μ§€λͺ… μˆ˜μ •
1 parent 6db90e4 commit 123484a

File tree

9 files changed

+11
-12
lines changed

9 files changed

+11
-12
lines changed

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/controller/DatePlaceLogQueryController.javaβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.web.bind.annotation.RestController;
99
import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter;
1010
import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO;
11-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
11+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
1212
import org.withtime.be.withtimebe.domain.log.dateplacelog.service.query.DatePlaceLogQueryService;
1313

1414
import io.swagger.v3.oas.annotations.Operation;

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/converter/DatePlaceLogConverter.javaβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.withtime.be.withtimebe.domain.log.dateplacelog.converter;
22

33
import java.time.LocalDate;
4-
import java.time.LocalTime;
54
import java.util.List;
65

76
import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO;
8-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
7+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
98

109
public class DatePlaceLogConverter {
1110

src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/entity/DatePlaceLog.java renamed to src/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/model/DatePlaceLog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.withtime.be.withtimebe.domain.log.dateplacelog.entity;
1+
package org.withtime.be.withtimebe.domain.log.dateplacelog.model;
22

33
import java.time.LocalDate;
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.withtime.be.withtimebe.domain.log.dateplacelog.repository;
22

33
import org.springframework.data.mongodb.repository.MongoRepository;
4-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
4+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
55

66
public interface DatePlaceLogRepository extends MongoRepository<DatePlaceLog, String> {
77
}

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/scheduler/DatePlaceLogScheduler.javaβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.springframework.transaction.annotation.Transactional;
1010
import org.withtime.be.withtimebe.domain.date.repository.DatePlaceRepository;
1111
import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter;
12-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
12+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
1313
import org.withtime.be.withtimebe.domain.log.dateplacelog.repository.DatePlaceLogRepository;
1414

1515
import lombok.RequiredArgsConstructor;

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryService.javaβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.List;
44

5-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
5+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
66

77
public interface DatePlaceLogQueryService {
88
List<DatePlaceLog> findMonthlyDatePlaceLogList();

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImpl.javaβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.data.mongodb.core.aggregation.SortOperation;
1212
import org.springframework.stereotype.Service;
1313
import org.springframework.transaction.annotation.Transactional;
14-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
14+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
1515

1616
import lombok.RequiredArgsConstructor;
1717

β€Žsrc/main/java/org/withtime/be/withtimebe/domain/log/placecategorylog/service/query/PlaceCategoryLogQueryServiceImpl.javaβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.time.DayOfWeek;
44
import java.time.LocalDate;
5+
import java.time.temporal.TemporalAdjusters;
56
import java.util.List;
67

78
import org.springframework.stereotype.Service;
@@ -23,8 +24,8 @@ public List<PlaceCategoryLog> findWeeklyPlaceCategoryLogList() {
2324

2425
LocalDate now = LocalDate.now();
2526

26-
LocalDate startOfWeek = now.with(DayOfWeek.MONDAY);
27-
LocalDate endOfWeek = now.with(DayOfWeek.SUNDAY);
27+
LocalDate startOfWeek = now.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
28+
LocalDate endOfWeek = now.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
2829

2930
return placeCategoryLogRepository.findByDateBetween(startOfWeek, endOfWeek);
3031
}

β€Žsrc/test/java/org/withtime/be/withtimebe/domain/log/dateplacelog/service/query/DatePlaceLogQueryServiceImplTest.javaβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.withtime.be.withtimebe.domain.log.dateplacelog.service.query;
22

33
import static org.assertj.core.api.Assertions.*;
4-
import static org.junit.jupiter.api.Assertions.*;
54
import static org.mockito.ArgumentMatchers.*;
65
import static org.mockito.BDDMockito.*;
76

@@ -19,7 +18,7 @@
1918
import org.springframework.data.mongodb.core.MongoTemplate;
2019
import org.springframework.data.mongodb.core.aggregation.Aggregation;
2120
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
22-
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
21+
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
2322

2423
@ExtendWith(MockitoExtension.class)
2524
@DisplayName("[DatePlaceLogQueryService] λ‹¨μœ„ ν…ŒμŠ€νŠΈ")

0 commit comments

Comments
Β (0)