@@ -443,6 +491,8 @@
할일 추가
editTodoMode: false,
dDaysLoaded: false,
dDaysPromise: null,
+ searchQuery: '',
+ searchResults: [],
}, mounted() {
if (departmentId) {
this.loadDepartment();
@@ -767,14 +817,15 @@ 할일 추가
minute = ':' + dateTime.getMinutes().toString().padStart(2, '0');
}
return hour + minute + (dateTime.getHours() >= 12 ? 'PM ' : 'AM');
- }
- ,
+ },
+ formattedDateYMD(dateTimeString) {
+ return new Date(dateTimeString).toISOString().split('T')[0];
+ },
formattedDate(year, month, day) {
month = (month < 10) ? '0' + month : month;
day = (day < 10) ? '0' + day : day;
return year + '-' + month + '-' + day;
- }
- ,
+ },
isToday(duty) {
const today = new Date();
return duty.year === today.getFullYear() && duty.month === today.getMonth() + 1 && duty.day === today.getDate();
@@ -1383,7 +1434,22 @@ 할일 추가
}
app.loadDuties(app.year, app.month);
});
- }
+ },
+ search(page = 0) {
+ $('#search-result-modal').modal('show');
+ const query = app.searchQuery;
+ fetch(`/api/schedules/${memberId}/search?q=${query}&page=${page}`)
+ .then((response) => {
+ if (!response.ok) {
+ console.log(`Error searching schedules. Status Code: ${response.status}`);
+ return;
+ }
+ return response.json();
+ })
+ .then((data) => {
+ app.searchResults = data;
+ });
+ },
}
}
)
diff --git a/src/test/kotlin/com/tistory/shanepark/dutypark/schedule/service/ScheduleSearchServiceDBImplTest.kt b/src/test/kotlin/com/tistory/shanepark/dutypark/schedule/service/ScheduleSearchServiceDBImplTest.kt
index c8bc903d..375c2064 100644
--- a/src/test/kotlin/com/tistory/shanepark/dutypark/schedule/service/ScheduleSearchServiceDBImplTest.kt
+++ b/src/test/kotlin/com/tistory/shanepark/dutypark/schedule/service/ScheduleSearchServiceDBImplTest.kt
@@ -33,7 +33,6 @@ class ScheduleSearchServiceDBImplTest : DutyparkIntegrationTest() {
// When
val result = scheduleSearchServiceDBImpl.search(loginMember, loginMember.id, Pageable.ofSize(10), "test")
- System.err.println("result = ${result}")
// Then
assertThat(result).hasSize(3)