From 3ec4ce92b354579303d91f18455d005aa6e5bdc6 Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Wed, 13 Mar 2024 15:21:48 +0900
Subject: [PATCH 1/6] =?UTF-8?q?[fe]=20feat:=20vue3-calendar-heatmap=20?=
 =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my-garden-fe/package-lock.json | 22 ++++++++++++++++++++++
 my-garden-fe/package.json      |  1 +
 2 files changed, 23 insertions(+)

diff --git a/my-garden-fe/package-lock.json b/my-garden-fe/package-lock.json
index 32920092..5f876829 100644
--- a/my-garden-fe/package-lock.json
+++ b/my-garden-fe/package-lock.json
@@ -17,6 +17,7 @@
         "v-calendar": "^3.1.2",
         "vue": "^3.3.10",
         "vue-router": "^4.2.5",
+        "vue3-calendar-heatmap": "^2.0.5",
         "vuex": "^4.1.0"
       },
       "devDependencies": {
@@ -3979,6 +3980,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/tippy.js": {
+      "version": "6.3.7",
+      "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
+      "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
+      "peer": true,
+      "dependencies": {
+        "@popperjs/core": "^2.9.0"
+      }
+    },
     "node_modules/to-object-path": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -4320,6 +4330,18 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/vue3-calendar-heatmap": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vue3-calendar-heatmap/-/vue3-calendar-heatmap-2.0.5.tgz",
+      "integrity": "sha512-qvveNQlTS5Aw7AvRLs0zOyu3uP5iGJlXJAnkrkG2ElDdyQ8H1TJhQ8rL702CROjAg16ezIveUY10nCO7lqZ25w==",
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "tippy.js": "^6.3.7",
+        "vue": "^3.2.29"
+      }
+    },
     "node_modules/vuex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
diff --git a/my-garden-fe/package.json b/my-garden-fe/package.json
index daf8afca..42148ec3 100644
--- a/my-garden-fe/package.json
+++ b/my-garden-fe/package.json
@@ -18,6 +18,7 @@
     "v-calendar": "^3.1.2",
     "vue": "^3.3.10",
     "vue-router": "^4.2.5",
+    "vue3-calendar-heatmap": "^2.0.5",
     "vuex": "^4.1.0"
   },
   "devDependencies": {

From d2c6a02cfc41d375214b7bacd7a77da9eded96c4 Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Wed, 13 Mar 2024 16:31:20 +0900
Subject: [PATCH 2/6] =?UTF-8?q?[fe]=20feat:=20=EC=A1=B0=ED=9A=8C=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=ED=8C=9D=EC=97=85=EC=97=90=20=EC=9E=94=EB=94=94=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dailyRoutine/popup/SelectDatePopUp.vue    | 20 +++++++++++++++----
 my-garden-fe/src/main.js                      |  5 ++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
index f86d4344..dc35dda9 100644
--- a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
+++ b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
@@ -1,8 +1,10 @@
 <script setup>
 import {ref} from "vue";
-import {convertDateFormat} from "@/components/dailyRoutine/api/util.js";
+import {convertDateFormat, getTodayDate} from "@/components/dailyRoutine/api/util.js";
 import {store} from "@/scripts/store.js";
 import {router} from "@/scripts/router.js";
+import {CalendarHeatmap} from "vue3-calendar-heatmap";
+import 'vue3-calendar-heatmap/dist/style.css';
 
 /**
  * 모달을 보여줄지 여부
@@ -13,6 +15,7 @@ const showModal = ref(false);
  * 조회 날짜
  */
 const inputDate = ref(new Date());
+const studyHours = ref([]);
 
 /**
  * 모달 열기
@@ -79,9 +82,13 @@ function handleClickOutside(event) {
       <h4>조회 날짜 선택</h4>
       <button class="btn btn-success today-button" @click="updateDate(new Date())">오늘</button>
       <div>
-        <VDatePicker v-model="inputDate" class="date-picker" mode="date" style="width: 65%"
+        <VDatePicker v-model="inputDate" class="date-picker" mode="date" style="width: 35%"
                      @update:modelValue="updateDate"/>
       </div>
+      <div class="heatmapBox">
+        <h4>공부 시간</h4>
+        <CalendarHeatmap :end-date="getTodayDate()" :values="studyHours" tooltip-unit="Hours"/>
+      </div>
       <span class="close" @click="closeModal">close</span>
     </div>
   </div>
@@ -155,10 +162,11 @@ function handleClickOutside(event) {
 
 .modal-content {
   background-color: #fefefe;
-  margin: 15% auto;
+  margin: 6% auto;
   padding: 20px;
   border: 1px solid #888;
-  width: 500px;
+  width: 1200px;
+  height: 750px;
 
   position: relative;
 }
@@ -184,4 +192,8 @@ function handleClickOutside(event) {
   text-decoration: none;
   cursor: pointer;
 }
+
+.heatmapBox {
+  margin: 30px 20px;
+}
 </style>
diff --git a/my-garden-fe/src/main.js b/my-garden-fe/src/main.js
index d1c64319..c8424e4a 100644
--- a/my-garden-fe/src/main.js
+++ b/my-garden-fe/src/main.js
@@ -13,6 +13,9 @@ import '@kangc/v-md-editor/lib/theme/style/vuepress.css';
 import VCalendar from 'v-calendar';
 import 'v-calendar/style.css';
 
+// VueCalendarHeatmap (GitHub 잔디)
+import VueCalendarHeatmap from 'vue3-calendar-heatmap'
+
 // Prism
 import Prism from 'prismjs';
 // highlight code
@@ -40,4 +43,4 @@ VMdEditor.use(vuepressTheme, {
 // Router 이동 전에 실행되는 함수
 routerBeforeEach(router);
 
-createApp(App).use(store).use(router).use(VMdEditor).use(VCalendar, {}).mount('#app')
+createApp(App).use(store).use(router).use(VMdEditor).use(VueCalendarHeatmap).use(VCalendar, {}).mount('#app')

From 6b38e4612f3c05ed59a946dd9881290d11f0d9e4 Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Wed, 13 Mar 2024 17:06:41 +0900
Subject: [PATCH 3/6] =?UTF-8?q?[fe]=20feat:=20=EC=9E=94=EB=94=94=20?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=84=20=ED=98=B8=EC=B6=9C=EC=8B=9C=20vue?=
 =?UTF-8?q?x=EC=97=90=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dailyRoutine/popup/SelectDatePopUp.vue         | 14 ++++++++++++++
 my-garden-fe/src/scripts/store.js                  |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
index dc35dda9..a3346d1c 100644
--- a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
+++ b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
@@ -17,6 +17,20 @@ const showModal = ref(false);
 const inputDate = ref(new Date());
 const studyHours = ref([]);
 
+function getStudyHoursApi() {
+  const studyHours = store.getters.getStudyHours;
+  if (studyHours === null) {
+    //TODO: getStudyHours API 호출 추가
+
+    //getStudyHours API 호출
+
+    store.commit("setStudyHours", studyHours);
+    return studyHours;
+  }
+
+  return studyHours;
+}
+
 /**
  * 모달 열기
  */
diff --git a/my-garden-fe/src/scripts/store.js b/my-garden-fe/src/scripts/store.js
index 1602c18b..712af5f2 100644
--- a/my-garden-fe/src/scripts/store.js
+++ b/my-garden-fe/src/scripts/store.js
@@ -22,7 +22,8 @@ export const store = createStore({
                 '게임': '#e76c0c',
                 '기타': '#cd4dff',
             },
-            timeBlockArray: []
+            timeBlockArray: [],
+            studyHours: [],
         }
     },
     mutations: {
@@ -48,6 +49,9 @@ export const store = createStore({
         },
         setTimeBlockArray(state, payload) {
             state.timeBlockArray = payload;
+        },
+        setStudyHours(state, payload) {
+            state.studyHours = payload;
         }
     },
     actions: {
@@ -101,5 +105,8 @@ export const store = createStore({
         getTimeBlockArray(state) {
             return state.timeBlockArray;
         },
+        getStudyHours(state) {
+            return state.studyHours;
+        }
     }
 });

From 8b8ccd66879a2fe40ed6759cb564fd9ab173163a Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Fri, 22 Mar 2024 20:53:52 +0900
Subject: [PATCH 4/6] =?UTF-8?q?[fe]=20feat:=20=EA=B3=B5=EB=B6=80=20?=
 =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=9E=94=EB=94=94=20=ED=98=B8=EC=B6=9C=20?=
 =?UTF-8?q?API=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dailyRoutine/api/api.js    | 15 ++++++
 .../dailyRoutine/draw/DrawStatisticsChart.vue |  9 ++++
 .../dailyRoutine/popup/SelectDatePopUp.vue    | 46 ++++++++++++++-----
 my-garden-fe/src/scripts/store.js             | 19 ++++++--
 4 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/my-garden-fe/src/components/dailyRoutine/api/api.js b/my-garden-fe/src/components/dailyRoutine/api/api.js
index 53f20336..63431abc 100644
--- a/my-garden-fe/src/components/dailyRoutine/api/api.js
+++ b/my-garden-fe/src/components/dailyRoutine/api/api.js
@@ -100,3 +100,18 @@ export function deleteDailyRoutineApi(id) {
             alert("삭제에 실패했습니다.");
         });
 }
+
+/**
+ * 공부 시간 목록 조회 API
+ *
+ * @returns {Promise<[] | void>} 성공 시 공부 시간 목록, 실패 시 alert
+ */
+export function getStudyHoursExceptTodayApi() {
+    return axios.get(`/api/daily-routine/study-hours`)
+        .then(({data}) => {
+            return data.data;
+        })
+        .catch(error => {
+            alert('공부 시간을 불러오는데 실패했습니다.')
+        });
+}
diff --git a/my-garden-fe/src/components/dailyRoutine/draw/DrawStatisticsChart.vue b/my-garden-fe/src/components/dailyRoutine/draw/DrawStatisticsChart.vue
index 3a5203f9..c1c327ca 100644
--- a/my-garden-fe/src/components/dailyRoutine/draw/DrawStatisticsChart.vue
+++ b/my-garden-fe/src/components/dailyRoutine/draw/DrawStatisticsChart.vue
@@ -132,10 +132,19 @@ function updateDataSetFrom(statisticData) {
         myChart.data.datasets[0].backgroundColor.push(timeBlock.routineColor);
       });
 
+  saveTodayStudyHours(statisticData['공부']);
+
   // Chart의 Title을 업데이트
   myChart.options.plugins.title.text = `일과 통계 [${viewDate}]`;
 }
 
+/**
+ * 오늘 공부한 시간을 저장
+ */
+function saveTodayStudyHours(todayStudyHours) {
+  store.commit("setStudyHoursToday", todayStudyHours / 60);
+}
+
 /**
  * 시간 블록 배열에서 통계 데이터를 계산
  *
diff --git a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
index a3346d1c..81d9ddb3 100644
--- a/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
+++ b/my-garden-fe/src/components/dailyRoutine/popup/SelectDatePopUp.vue
@@ -1,34 +1,52 @@
 <script setup>
-import {ref} from "vue";
+import {onMounted, ref} from "vue";
 import {convertDateFormat, getTodayDate} from "@/components/dailyRoutine/api/util.js";
 import {store} from "@/scripts/store.js";
 import {router} from "@/scripts/router.js";
 import {CalendarHeatmap} from "vue3-calendar-heatmap";
 import 'vue3-calendar-heatmap/dist/style.css';
+import {getStudyHoursExceptTodayApi} from "@/components/dailyRoutine/api/api.js";
 
 /**
  * 모달을 보여줄지 여부
  */
 const showModal = ref(false);
+/**
+ * 공부 시간을 저장한 배열
+ */
+const studyHours = ref([]);
 
 /**
  * 조회 날짜
  */
 const inputDate = ref(new Date());
-const studyHours = ref([]);
-
-function getStudyHoursApi() {
-  const studyHours = store.getters.getStudyHours;
-  if (studyHours === null) {
-    //TODO: getStudyHours API 호출 추가
 
-    //getStudyHours API 호출
+/**
+ * 오늘 공부 시간 추가
+ */
+function addTodayStudyHour() {
+  studyHours.value.push({
+    date: getTodayDate(),
+    count: Math.floor(store.getters.getStudyHoursToday),
+  });
+}
 
-    store.commit("setStudyHours", studyHours);
-    return studyHours;
+/**
+ * 오늘을 제외한 공부 시간 조회
+ */
+function getStudyHours() {
+  let studyHoursArrExceptToday = store.getters.getStudyHoursArrExceptToday;
+  if (studyHoursArrExceptToday.length === 0) {
+    getStudyHoursExceptTodayApi()
+        .then(data => {
+          store.commit("setStudyHoursArrExceptToday", data);
+          studyHours.value = data;
+          addTodayStudyHour();
+        })
+  } else {
+    studyHours.value = studyHoursArrExceptToday;
+    addTodayStudyHour();
   }
-
-  return studyHours;
 }
 
 /**
@@ -74,6 +92,10 @@ function handleClickOutside(event) {
     closeModal();
   }
 }
+
+onMounted(() => {
+  getStudyHours();
+});
 </script>
 <template>
   <div class="date-wrapper">
diff --git a/my-garden-fe/src/scripts/store.js b/my-garden-fe/src/scripts/store.js
index 712af5f2..bb5080b0 100644
--- a/my-garden-fe/src/scripts/store.js
+++ b/my-garden-fe/src/scripts/store.js
@@ -23,7 +23,10 @@ export const store = createStore({
                 '기타': '#cd4dff',
             },
             timeBlockArray: [],
-            studyHours: [],
+            studyHours: {
+                today: 0,
+                arrExceptToday: [],
+            }
         }
     },
     mutations: {
@@ -50,8 +53,11 @@ export const store = createStore({
         setTimeBlockArray(state, payload) {
             state.timeBlockArray = payload;
         },
-        setStudyHours(state, payload) {
-            state.studyHours = payload;
+        setStudyHoursToday(state, payload) {
+            state.studyHours.today = payload;
+        },
+        setStudyHoursArrExceptToday(state, payload) {
+            state.studyHours.arrExceptToday = payload;
         }
     },
     actions: {
@@ -105,8 +111,11 @@ export const store = createStore({
         getTimeBlockArray(state) {
             return state.timeBlockArray;
         },
-        getStudyHours(state) {
-            return state.studyHours;
+        getStudyHoursToday(state) {
+            return state.studyHours.today;
+        },
+        getStudyHoursArrExceptToday(state) {
+            return state.studyHours.arrExceptToday;
         }
     }
 });

From fcb4a316422a18360db2bf3b420cacfb39decc27 Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Fri, 22 Mar 2024 22:09:11 +0900
Subject: [PATCH 5/6] =?UTF-8?q?[be]=20test:=20=EA=B3=B5=EB=B6=80=20?=
 =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DailyRoutineController.java    |  7 +++
 .../service/DailyRoutineService.java          | 32 ++++++++++
 .../response/DailyRoutineResponse.java        | 37 +++++++++++
 .../DailyRoutineStudyHourResponse.java        | 30 +++++++++
 .../DailyRoutineControllerTest.java           | 25 ++++++++
 .../service/DailyRoutineServiceTest.java      | 48 ++++++++++++++-
 .../response/DailyRoutineResponseTest.java    | 61 +++++++++++++++++++
 .../DailyRoutineStudyHourResponseTest.java    | 57 +++++++++++++++++
 8 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponse.java
 create mode 100644 my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponseTest.java

diff --git a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineController.java b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineController.java
index 7b56e8f8..ecca9929 100644
--- a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineController.java
+++ b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineController.java
@@ -11,9 +11,11 @@
 import org.hyunggi.mygardenbe.dailyroutine.domain.TimeSplitter;
 import org.hyunggi.mygardenbe.dailyroutine.service.DailyRoutineService;
 import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineResponse;
+import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineStudyHourResponse;
 import org.hyunggi.mygardenbe.member.entity.MemberEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -97,4 +99,9 @@ public ApiResponse<Long> deleteDailyRoutine(@PathVariable final Long timeBlockId
 
         return ApiResponse.ok(deletedId);
     }
+
+    @GetMapping("/study-hours")
+    public ApiResponse<List<DailyRoutineStudyHourResponse>> getStudyHours(@WithLoginUserEntity MemberEntity member) {
+        return ApiResponse.ok(dailyRoutineService.getStudyHours(LocalDate.now(), member));
+    }
 }
diff --git a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineService.java b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineService.java
index bf636fa4..481eb4c4 100644
--- a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineService.java
+++ b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineService.java
@@ -9,11 +9,14 @@
 import org.hyunggi.mygardenbe.dailyroutine.entity.DailyRoutineEntity;
 import org.hyunggi.mygardenbe.dailyroutine.repository.DailyRoutineRepository;
 import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineResponse;
+import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineStudyHourResponse;
 import org.hyunggi.mygardenbe.member.entity.MemberEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -165,4 +168,33 @@ public Long deleteDailyRoutine(final Long timeBlockId, final MemberEntity member
         dailyRoutineRepository.deleteById(dailyRoutineEntity.getId());
         return timeBlockId;
     }
+
+    /**
+     * 1년전에서 어제까지의 공부 시간 조회 (오늘 공부 시간은 미포함)
+     *
+     * @param today  오늘 날짜
+     * @param member 유저 Entity
+     * @return 공부 시간 목록
+     */
+    public List<DailyRoutineStudyHourResponse> getStudyHours(final LocalDate today, final MemberEntity member) {
+        final LocalDateTime startDateTime = today.atStartOfDay().minusYears(1);
+        final LocalDateTime endDateTime = today.atTime(LocalTime.MAX).minusDays(1);
+
+        return getDailyRoutine(startDateTime, endDateTime, member).stream()
+                .filter(routine -> routine.isEqualType(RoutineType.STUDY))
+                .collect(Collectors.groupingBy(DailyRoutineResponse::getStartDate, Collectors.summingInt(DailyRoutineResponse::calculateMinutesBetweenStartAndEnd)))
+                .entrySet().stream()
+                .map(entry -> new DailyRoutineStudyHourResponse(entry.getKey(), convertMinToHour(entry.getValue())))
+                .toList();
+    }
+
+    /**
+     * 분을 시간으로 변환
+     *
+     * @param min 분
+     * @return 시간
+     */
+    private int convertMinToHour(final int min) {
+        return min / 60;
+    }
 }
diff --git a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponse.java b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponse.java
index fd0051dd..20550e8f 100644
--- a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponse.java
+++ b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponse.java
@@ -1,7 +1,12 @@
 package org.hyunggi.mygardenbe.dailyroutine.service.response;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
 import org.hyunggi.mygardenbe.dailyroutine.domain.DailyRoutine;
+import org.hyunggi.mygardenbe.dailyroutine.domain.RoutineType;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 
 /**
  * 데일리 루틴 조회 응답
@@ -51,4 +56,36 @@ public static DailyRoutineResponse of(final Long id, final DailyRoutine dailyRou
                 .routineDescription(dailyRoutine.getRoutineDescription())
                 .build();
     }
+
+    /**
+     * 루틴 시작 날짜 조회
+     *
+     * @return 루틴 시작 날짜
+     */
+    @JsonIgnore
+    public String getStartDate() {
+        return startDateTime.split("T")[0];
+    }
+
+    /**
+     * 루틴 타입 비교
+     *
+     * @param type 루틴 타입
+     * @return 루틴 타입이 같은지 여부
+     */
+    public boolean isEqualType(final RoutineType type) {
+        return routineType.equals(type.getDescription());
+    }
+
+    /**
+     * 루틴의 시작 시간과 종료 시간의 차이를 분으로 조회
+     *
+     * @return 루틴의 시작 시간과 종료 시간의 차이 (분)
+     */
+    public int calculateMinutesBetweenStartAndEnd() {
+        final LocalDateTime start = LocalDateTime.parse(startDateTime);
+        final LocalDateTime end = LocalDateTime.parse(endDateTime);
+
+        return (int) start.until(end, ChronoUnit.MINUTES);
+    }
 }
diff --git a/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponse.java b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponse.java
new file mode 100644
index 00000000..d56457b4
--- /dev/null
+++ b/my-garden-be/src/main/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponse.java
@@ -0,0 +1,30 @@
+package org.hyunggi.mygardenbe.dailyroutine.service.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 루틴의 공부 시간 조회 응답
+ *
+ * @param date      날짜
+ * @param studyHour 해당 날짜의 공부 시간
+ */
+public record DailyRoutineStudyHourResponse(
+        String date,
+        @JsonProperty("count")
+        Integer studyHour) {
+    public DailyRoutineStudyHourResponse {
+        validate(date, studyHour);
+    }
+
+    /**
+     * 루틴의 공부 시간 조회 응답 유효성 검증
+     */
+    private static void validate(String date, Integer studyHour) {
+        if (date == null) {
+            throw new IllegalArgumentException("날짜는 null이 될 수 없습니다.");
+        }
+        if (studyHour == null || studyHour < 0) {
+            throw new IllegalArgumentException("공부 시간은 null이 될 수 없고 0보다 커야 합니다.");
+        }
+    }
+}
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineControllerTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineControllerTest.java
index 82ff1ec9..04bba647 100644
--- a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineControllerTest.java
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/controller/DailyRoutineControllerTest.java
@@ -3,6 +3,7 @@
 import org.hyunggi.mygardenbe.ControllerTestSupportWithMockUser;
 import org.hyunggi.mygardenbe.dailyroutine.controller.request.PostRequest;
 import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineResponse;
+import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineStudyHourResponse;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -197,4 +198,28 @@ void deleteDailyRoutine() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.data").value(1L));
     }
+
+    @Test
+    @DisplayName("공부 시간 목록을 조회한다.")
+    void getStudyHours() throws Exception {
+        //given
+        BDDMockito.given(dailyRoutineService.getStudyHours(any(), any()))
+                .willReturn(
+                        List.of(
+                                new DailyRoutineStudyHourResponse("2024-03-21", 3),
+                                new DailyRoutineStudyHourResponse("2024-03-22", 4)
+                        )
+                );
+
+        //when, then
+        mockMvc.perform(
+                        get("/api/daily-routine/study-hours")
+                )
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data").isArray())
+                .andExpect(jsonPath("$.data[0].date").value("2024-03-21"))
+                .andExpect(jsonPath("$.data[0].count").value(3))
+                .andExpect(jsonPath("$.data[1].date").value("2024-03-22"))
+                .andExpect(jsonPath("$.data[1].count").value(4));
+    }
 }
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineServiceTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineServiceTest.java
index 71ea4673..6852df83 100644
--- a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineServiceTest.java
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/DailyRoutineServiceTest.java
@@ -9,6 +9,7 @@
 import org.hyunggi.mygardenbe.dailyroutine.entity.DailyRoutineEntity;
 import org.hyunggi.mygardenbe.dailyroutine.repository.DailyRoutineRepository;
 import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineResponse;
+import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineStudyHourResponse;
 import org.hyunggi.mygardenbe.member.domain.Member;
 import org.hyunggi.mygardenbe.member.entity.MemberEntity;
 import org.hyunggi.mygardenbe.member.repository.MemberRepository;
@@ -19,6 +20,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -95,7 +97,7 @@ void getDailyRoutine() {
         final List<RoutineTime> routineTimes = List.of(routineTimeSample1, routineTimeSample2);
         final RoutineType routineType = RoutineType.STUDY;
         final String routineDescription = "자바 스터디";
-        dailyRoutineService.postDailyRoutine(routineTimes, routineType, routineDescription, member);
+        postRoutine(routineTimes, routineType, routineDescription);
 
         //when
         final List<DailyRoutineResponse> dailyRoutineResponses = dailyRoutineService.getDailyRoutine(
@@ -127,7 +129,7 @@ void getDailyRoutine_OnlyMine() {
         final List<RoutineTime> routineTimes = List.of(routineTimeSample1, routineTimeSample2);
         final RoutineType routineType = RoutineType.STUDY;
         final String routineDescription = "자바 스터디";
-        dailyRoutineService.postDailyRoutine(routineTimes, routineType, routineDescription, member);
+        postRoutine(routineTimes, routineType, routineDescription);
 
         //when
         final List<DailyRoutineResponse> dailyRoutineResponses = dailyRoutineService.getDailyRoutine(
@@ -292,4 +294,46 @@ void deleteDailyRoutine_OnlyMine() {
                 .isInstanceOf(BusinessException.class)
                 .hasMessageContaining("본인의 DailyRoutine만 수정 및 삭제할 수 있습니다.");
     }
+
+    @Test
+    @DisplayName("1년전에서 어제까지의 공부 시간 조회 (STUDY 타입만 조회, 오늘 공부 시간은 포함하지 않으며 1시간 단위로 계산)")
+    void getStudyHours() {
+        //given
+        final LocalDate today = LocalDate.of(2024, 3, 3);
+
+        final RoutineTime routineTimeSample1 = RoutineTime.of(
+                LocalDateTime.of(2024, 3, 1, 20, 0, 0),
+                LocalDateTime.of(2024, 3, 1, 22, 0, 0)
+        );
+        final RoutineType routineTypeExercise = RoutineType.EXERCISE;
+        final String routineDescriptionExercise = "운동";
+        postRoutine(List.of(routineTimeSample1), routineTypeExercise, routineDescriptionExercise);
+
+        final RoutineTime routineTimeSample2 = RoutineTime.of(
+                LocalDateTime.of(2024, 3, 1, 22, 0, 0),
+                LocalDateTime.of(2024, 3, 1, 23, 59, 59)
+        );
+        final RoutineTime routineTimeSample3 = RoutineTime.of(
+                LocalDateTime.of(2024, 3, 2, 0, 0, 0),
+                LocalDateTime.of(2024, 3, 2, 1, 13, 0)
+        );
+        final RoutineType routineType = RoutineType.STUDY;
+        final String routineDescription = "자바 스터디";
+        postRoutine(List.of(routineTimeSample2, routineTimeSample3), routineType, routineDescription);
+
+        //when
+        final List<DailyRoutineStudyHourResponse> studyHours = dailyRoutineService.getStudyHours(today, member);
+
+        //then
+        assertThat(studyHours).hasSize(2)
+                .extracting("date", "studyHour")
+                .containsExactlyInAnyOrder(
+                        Tuple.tuple("2024-03-01", 1),
+                        Tuple.tuple("2024-03-02", 1)
+                );
+    }
+
+    private void postRoutine(final List<RoutineTime> routineTimeSample3, final RoutineType routineTypeExercise, final String routineDescriptionExercise) {
+        dailyRoutineService.postDailyRoutine(routineTimeSample3, routineTypeExercise, routineDescriptionExercise, member);
+    }
 }
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponseTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponseTest.java
index fd044ff6..6694dac1 100644
--- a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponseTest.java
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineResponseTest.java
@@ -2,6 +2,7 @@
 
 import org.hyunggi.mygardenbe.dailyroutine.domain.DailyRoutine;
 import org.hyunggi.mygardenbe.dailyroutine.domain.RoutineTime;
+import org.hyunggi.mygardenbe.dailyroutine.domain.RoutineType;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -59,4 +60,64 @@ void of_withId() {
         assertThat(dailyRoutineResponse.routineType()).isEqualTo("수면");
         assertThat(dailyRoutineResponse.routineDescription()).isEqualTo("잠을 잔다");
     }
+
+    @Test
+    @DisplayName("getStartDate()를 호출하면 DailyRoutine의 시작 날짜를 반환한다")
+    void getStartDate() {
+        //given
+        DailyRoutine dailyRoutine = DailyRoutine.of(
+                RoutineTime.of(
+                        LocalDateTime.of(2021, 8, 1, 0, 0, 0),
+                        LocalDateTime.of(2021, 8, 1, 1, 0, 0)
+                ),
+                "SLEEP",
+                "잠을 잔다"
+        );
+
+        //when
+        DailyRoutineResponse dailyRoutineResponse = DailyRoutineResponse.of(dailyRoutine);
+
+        //then
+        assertThat(dailyRoutineResponse.getStartDate()).isEqualTo("2021-08-01");
+    }
+
+    @Test
+    @DisplayName("isEqualType()를 호출하면 DailyRoutine의 루틴 타입이 같은지 여부를 반환한다")
+    void isEqualType() {
+        //given
+        DailyRoutine dailyRoutine = DailyRoutine.of(
+                RoutineTime.of(
+                        LocalDateTime.of(2021, 8, 1, 0, 0, 0),
+                        LocalDateTime.of(2021, 8, 1, 1, 0, 0)
+                ),
+                "SLEEP",
+                "잠을 잔다"
+        );
+
+        //when
+        DailyRoutineResponse dailyRoutineResponse = DailyRoutineResponse.of(dailyRoutine);
+
+        //then
+        assertThat(dailyRoutineResponse.isEqualType(RoutineType.SLEEP)).isTrue();
+    }
+
+    @Test
+    @DisplayName("calculateMinutesBetweenStartAndEnd()를 호출하면 DailyRoutine의 시작 시간과 종료 시간의 차이를 분으로 반환한다")
+    void calculateMinutesBetweenStartAndEnd() {
+        //given
+        DailyRoutine dailyRoutine = DailyRoutine.of(
+                RoutineTime.of(
+                        LocalDateTime.of(2021, 8, 1, 0, 1, 0),
+                        LocalDateTime.of(2021, 8, 1, 1, 12, 0)
+                ),
+                "SLEEP",
+                "잠을 잔다"
+        );
+
+        //when
+        DailyRoutineResponse dailyRoutineResponse = DailyRoutineResponse.of(dailyRoutine);
+
+        //then
+        assertThat(dailyRoutineResponse.calculateMinutesBetweenStartAndEnd()).isEqualTo(71);
+    }
 }
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponseTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponseTest.java
new file mode 100644
index 00000000..1995cba9
--- /dev/null
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/dailyroutine/service/response/DailyRoutineStudyHourResponseTest.java
@@ -0,0 +1,57 @@
+package org.hyunggi.mygardenbe.dailyroutine.service.response;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.NullSource;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class DailyRoutineStudyHourResponseTest {
+    @Test
+    @DisplayName("DailyRoutineStudyHourResponse 생성 테스트")
+    void createDailyRoutineStudyHourResponse() {
+        // given
+        final String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        final int studyHour = 3;
+
+        // when
+        final DailyRoutineStudyHourResponse response = new DailyRoutineStudyHourResponse(date, studyHour);
+
+        // then
+        assertThat(response).isNotNull();
+        assertThat(response.date()).isEqualTo(date);
+        assertThat(response.studyHour()).isEqualTo(studyHour);
+    }
+
+    @ParameterizedTest
+    @NullSource
+    @DisplayName("DailyRoutineStudyHourResponse 생성 테스트 - date가 null인 경우")
+    void createDailyRoutineStudyHourResponseWithNullDate(String date) {
+        // given
+        final int studyHour = 3;
+
+        // when, then
+        assertThatThrownBy(() -> new DailyRoutineStudyHourResponse(date, studyHour))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("날짜는 null이 될 수 없습니다.");
+    }
+
+    @ParameterizedTest
+    @CsvSource({"-1", ","})
+    @DisplayName("DailyRoutineStudyHourResponse 생성 테스트 - studyHour가 0보다 작거나 null인 경우")
+    void createDailyRoutineStudyHourResponseWithInvalidStudyHour(Integer studyHour) {
+        // given
+        final String date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
+        // when, then
+        assertThatThrownBy(() -> new DailyRoutineStudyHourResponse(date, studyHour))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("공부 시간은 null이 될 수 없고 0보다 커야 합니다.");
+    }
+}

From c59c933d4595e3de549906641968333af6f98f17 Mon Sep 17 00:00:00 2001
From: HyunggiPark <phg9587@naver.com>
Date: Fri, 22 Mar 2024 22:17:49 +0900
Subject: [PATCH 6/6] =?UTF-8?q?[be]=20docs:=20=EA=B3=B5=EB=B6=80=20?=
 =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=A1=B0=ED=9A=8C=20API=20=EB=AC=B8?=
 =?UTF-8?q?=EC=84=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asciidoc/dailyroutine/getStudyHours.adoc  | 12 +++++
 my-garden-be/src/docs/asciidoc/index.adoc     |  1 +
 .../DailyRoutineControllerDocsTest.java       | 45 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 my-garden-be/src/docs/asciidoc/dailyroutine/getStudyHours.adoc

diff --git a/my-garden-be/src/docs/asciidoc/dailyroutine/getStudyHours.adoc b/my-garden-be/src/docs/asciidoc/dailyroutine/getStudyHours.adoc
new file mode 100644
index 00000000..109fbf77
--- /dev/null
+++ b/my-garden-be/src/docs/asciidoc/dailyroutine/getStudyHours.adoc
@@ -0,0 +1,12 @@
+[[get-study-hours]]
+=== GET [공부 시간 조회]
+
+==== HTTP Request
+
+include::{snippets}/daily-routine/get-study-hours/http-request.adoc[]
+include::{snippets}/daily-routine/get-study-hours/request-headers.adoc[]
+
+==== HTTP Response
+
+include::{snippets}/daily-routine/get-study-hours/http-response.adoc[]
+include::{snippets}/daily-routine/get-study-hours/response-fields.adoc[]
diff --git a/my-garden-be/src/docs/asciidoc/index.adoc b/my-garden-be/src/docs/asciidoc/index.adoc
index 2fe82fd8..609ee385 100644
--- a/my-garden-be/src/docs/asciidoc/index.adoc
+++ b/my-garden-be/src/docs/asciidoc/index.adoc
@@ -24,6 +24,7 @@ include::dailyroutine/get.adoc[]
 include::dailyroutine/post.adoc[]
 include::dailyroutine/put.adoc[]
 include::dailyroutine/delete.adoc[]
+include::dailyroutine/getStudyHours.adoc[]
 
 [[board-category]]
 == Board Category [게시판 분류]
diff --git a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/docs/dailyroutine/DailyRoutineControllerDocsTest.java b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/docs/dailyroutine/DailyRoutineControllerDocsTest.java
index 3fbacbab..d80f4d37 100644
--- a/my-garden-be/src/test/java/org/hyunggi/mygardenbe/docs/dailyroutine/DailyRoutineControllerDocsTest.java
+++ b/my-garden-be/src/test/java/org/hyunggi/mygardenbe/docs/dailyroutine/DailyRoutineControllerDocsTest.java
@@ -5,6 +5,7 @@
 import org.hyunggi.mygardenbe.dailyroutine.domain.RoutineType;
 import org.hyunggi.mygardenbe.dailyroutine.service.DailyRoutineService;
 import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineResponse;
+import org.hyunggi.mygardenbe.dailyroutine.service.response.DailyRoutineStudyHourResponse;
 import org.hyunggi.mygardenbe.docs.RestDocsSupport;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -210,7 +211,7 @@ void putDailyRoutine() throws Exception {
     void deleteDailyRoutine() throws Exception {
         //given
         String accessToken = "accessToken";
-        
+
         BDDMockito.given(dailyRoutineService.deleteDailyRoutine(any(), any()))
                 .willReturn(
                         1L
@@ -241,4 +242,46 @@ void deleteDailyRoutine() throws Exception {
                         )
                 ));
     }
+
+    @Test
+    @DisplayName("공부 시간을 조회한다.")
+    void getStudyHours() throws Exception {
+        //given
+        String accessToken = "accessToken";
+
+        BDDMockito.given(dailyRoutineService.getStudyHours(any(), any()))
+                .willReturn(
+                        List.of(
+                                new DailyRoutineStudyHourResponse("2024-03-19", 5),
+                                new DailyRoutineStudyHourResponse("2024-03-21", 1),
+                                new DailyRoutineStudyHourResponse("2024-03-22", 2)
+                        )
+                );
+
+        //when, then
+        mockMvc.perform(
+                        get("/api/daily-routine/study-hours")
+                                .header("Authorization", "Bearer " + accessToken)
+                )
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data").isArray())
+                .andDo(document("daily-routine/get-study-hours"
+                        , preprocessRequest(prettyPrint())
+                        , preprocessResponse(prettyPrint())
+                        , requestHeaders(
+                                headerWithName("Authorization").description("access token")
+                                        .attributes(field("constraints", "Bearer {accessToken}"))
+                        )
+                        , responseFields(
+                                fieldWithPath("code").type(JsonFieldType.NUMBER).description("HTTP 상태 코드"),
+                                fieldWithPath("status").type(JsonFieldType.STRING).description("HTTP 상태"),
+                                fieldWithPath("message").type(JsonFieldType.STRING).description("메시지"),
+                                fieldWithPath("data").type(JsonFieldType.ARRAY).description("데이터 (DailyRoutineStudyHourResponse 목록)"),
+                                fieldWithPath("data[].date").type(JsonFieldType.STRING).description("날짜")
+                                        .attributes(field("constraints", "yyyy-MM-dd")),
+                                fieldWithPath("data[].count").type(JsonFieldType.NUMBER).description("공부 시간")
+                                        .attributes(field("constraints", "0 이상의 정수 (시간 단위)"))
+                        )
+                ));
+    }
 }