From 477152e40e82598d750e5d70c3c7ffc56916ed94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= <nem@nem.x0.to>
Date: Mon, 8 Jul 2024 11:08:48 +0900
Subject: [PATCH] =?UTF-8?q?Dao=E8=BF=BD=E5=8A=A0,=20=E3=83=A2=E3=83=87?=
 =?UTF-8?q?=E3=83=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/room/dao/HistoryCacheDao.java         | 10 ++++++++++
 .../data/room/model/HistoryWithTask.java       | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 data/src/main/java/one/nem/kidshift/data/room/model/HistoryWithTask.java

diff --git a/data/src/main/java/one/nem/kidshift/data/room/dao/HistoryCacheDao.java b/data/src/main/java/one/nem/kidshift/data/room/dao/HistoryCacheDao.java
index 9247bbf..4c8a92e 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/dao/HistoryCacheDao.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/dao/HistoryCacheDao.java
@@ -4,10 +4,12 @@ import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
+import androidx.room.Transaction;
 
 import java.util.List;
 
 import one.nem.kidshift.data.room.entity.HistoryCacheEntity;
+import one.nem.kidshift.data.room.model.HistoryWithTask;
 
 @Dao
 public interface HistoryCacheDao {
@@ -27,6 +29,14 @@ public interface HistoryCacheDao {
     @Query("SELECT * FROM history_cache WHERE child_id = :childId")
     List<HistoryCacheEntity> getHistoryListByChildId(String childId);
 
+    @Transaction
+    @Query("SELECT * FROM history_cache")
+    List<HistoryWithTask> getHistoryWithTasks();
+
+    @Transaction
+    @Query("SELECT * FROM history_cache WHERE child_id = :childId")
+    List<HistoryWithTask> getHistoryWithTasksByChildId(String childId);
+
     @Query("SELECT * FROM history_cache WHERE task_id = :taskId")
     List<HistoryCacheEntity> getHistoryListByTaskId(String taskId);
 
diff --git a/data/src/main/java/one/nem/kidshift/data/room/model/HistoryWithTask.java b/data/src/main/java/one/nem/kidshift/data/room/model/HistoryWithTask.java
new file mode 100644
index 0000000..6e5a3c2
--- /dev/null
+++ b/data/src/main/java/one/nem/kidshift/data/room/model/HistoryWithTask.java
@@ -0,0 +1,18 @@
+package one.nem.kidshift.data.room.model;
+
+import androidx.room.Embedded;
+import androidx.room.Relation;
+
+import one.nem.kidshift.data.room.entity.HistoryCacheEntity;
+import one.nem.kidshift.data.room.entity.TaskCacheEntity;
+
+public class HistoryWithTask {
+    @Embedded
+    public HistoryCacheEntity history;
+
+    @Relation(
+            parentColumn = "task_id",
+            entityColumn = "id"
+    )
+    public TaskCacheEntity task;
+}
\ No newline at end of file