diff --git a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequest.java b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequest.java
index fa34ea5..5609407 100644
--- a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequest.java
+++ b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequest.java
@@ -82,7 +82,7 @@ private void validateSearchDate(final LocalDate startDate, final LocalDate endDa
/**
* 조회 시작일 초기화
*
- * - 조회 시작일이 없을 경우, 1달 전으로 초기화
+ * - 조회 시작일이 없을 경우, 1년 전으로 초기화
* - 조회 시작일이 있을 경우, 그대로 반환
*
* @param startDate 조회 시작일
@@ -90,7 +90,7 @@ private void validateSearchDate(final LocalDate startDate, final LocalDate endDa
*/
private LocalDate initStartDate(LocalDate startDate) {
if (startDate == null) {
- return LocalDate.now().minusMonths(1);
+ return LocalDate.now().minusYears(1);
}
return startDate;
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequestTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequestTest.java
index 70dff32..1d9ab4f 100644
--- a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequestTest.java
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/boards/common/category/request/GetRequestTest.java
@@ -31,7 +31,7 @@ void searchDateConstructor() {
}
@Test
- @DisplayName("시작일이 null일 때, 시작일은 현재 날짜의 한달 전이다.")
+ @DisplayName("시작일이 null일 때, 시작일은 현재 날짜의 1년 전이다.")
void searchDateConstructor2() {
//given
final LocalDate startDate = null;
@@ -44,7 +44,7 @@ void searchDateConstructor2() {
.build();
//then
- assertThat(searchDate.startDate()).isEqualTo(LocalDate.now().minusMonths(1));
+ assertThat(searchDate.startDate()).isEqualTo(LocalDate.now().minusYears(1));
}
@Test
@@ -253,7 +253,7 @@ void getRequestConstructor() {
final GetRequest.SearchCondition requestSearchCondition = getRequest.getSearchCondition();
final GetRequest.SearchPaging requestSearchPaging = getRequest.getSearchPaging();
- assertThat(requestSearchDate.startDate()).isEqualTo(LocalDate.now().minusMonths(1));
+ assertThat(requestSearchDate.startDate()).isEqualTo(LocalDate.now().minusYears(1));
assertThat(requestSearchDate.endDate()).isEqualTo(LocalDate.now());
assertThat(requestSearchCondition.category()).isEmpty();
assertThat(requestSearchCondition.searchText()).isEmpty();
diff --git a/my-garden-fe/src/components/dailyRoutine/api/util.js b/my-garden-fe/src/components/dailyRoutine/api/util.js
index 6eea964..8ae3a86 100644
--- a/my-garden-fe/src/components/dailyRoutine/api/util.js
+++ b/my-garden-fe/src/components/dailyRoutine/api/util.js
@@ -45,14 +45,14 @@ export function convertDateFormat(date) {
}
/**
- * 현재 시간을 기준으로 한 달 전의 일자를 특정 포맷으로 반환한다.
+ * 현재 시간을 기준으로 1년 전의 일자를 특정 포맷으로 반환한다.
*
- * @returns {string} 한 달 전의 일자 (yyyy-MM-dd)
+ * @returns {string} 1년 전의 일자 (yyyy-MM-dd)
*/
-export function getOneMonthAgoDate() {
+export function getOneYearAgoDate() {
const currentDate = new Date();
- currentDate.setMonth(currentDate.getMonth() - 1);
+ currentDate.setFullYear(currentDate.getFullYear() - 1);
const year = currentDate.getFullYear();
const month = String(currentDate.getMonth() + 1).padStart(2, '0');
diff --git a/my-garden-fe/src/pages/boards/learn/LearnBoardList.vue b/my-garden-fe/src/pages/boards/learn/LearnBoardList.vue
index 15d10c3..9af4ebd 100644
--- a/my-garden-fe/src/pages/boards/learn/LearnBoardList.vue
+++ b/my-garden-fe/src/pages/boards/learn/LearnBoardList.vue
@@ -4,7 +4,7 @@ import TableContents from "@/components/boards/common/TableContents.vue";
import {onMounted, ref, watch} from "vue";
import {getLearnBoardCategoryApi, getLearnBoardListApi} from "@/components/boards/learn/api/api.js";
-import {getOneMonthAgoDate, getTodayDate} from "@/components/dailyRoutine/api/util.js";
+import {getOneYearAgoDate, getTodayDate} from "@/components/dailyRoutine/api/util.js";
import SearchForm from "@/components/boards/common/SearchForm.vue";
import {router} from "@/scripts/router.js";
import {useRoute} from "vue-router";
@@ -19,7 +19,7 @@ const learnPage = ref({});
const learnTotalCount = ref(0);
const categories = ref([]);
const queryParameter = ref({
- startDate: getOneMonthAgoDate(),
+ startDate: getOneYearAgoDate(),
endDate: getTodayDate(),
category: "",
searchText: "",
diff --git a/my-garden-fe/src/pages/boards/notice/NoticeBoardList.vue b/my-garden-fe/src/pages/boards/notice/NoticeBoardList.vue
index 45cc25b..340d6bd 100644
--- a/my-garden-fe/src/pages/boards/notice/NoticeBoardList.vue
+++ b/my-garden-fe/src/pages/boards/notice/NoticeBoardList.vue
@@ -8,7 +8,7 @@ import {
getNoticeBoardListApi,
getNoticeImportantBoardListApi
} from "@/components/boards/notice/api/api.js";
-import {getOneMonthAgoDate, getTodayDate} from "@/components/dailyRoutine/api/util.js";
+import {getOneYearAgoDate, getTodayDate} from "@/components/dailyRoutine/api/util.js";
import SearchForm from "@/components/boards/common/SearchForm.vue";
import {router} from "@/scripts/router.js";
import {useRoute} from "vue-router";
@@ -24,7 +24,7 @@ const noticeImportantPage = ref([]);
const noticeTotalCount = ref(0);
const categories = ref([]);
const queryParameter = ref({
- startDate: getOneMonthAgoDate(),
+ startDate: getOneYearAgoDate(),
endDate: getTodayDate(),
category: "",
searchText: "",