From 73438fedd41b5e0718ad3a2f7a884538f1199e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 08:53:29 +0900 Subject: [PATCH 01/18] =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=AF=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=95=E3=82=A7=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/TaskData.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/TaskData.java b/data/src/main/java/one/nem/kidshift/data/TaskData.java index 13ce438..3a990f1 100644 --- a/data/src/main/java/one/nem/kidshift/data/TaskData.java +++ b/data/src/main/java/one/nem/kidshift/data/TaskData.java @@ -5,9 +5,46 @@ import java.util.List; import one.nem.kidshift.model.tasks.TaskItemModel; public interface TaskData { + + // 親側 + /** * 存在する全てのタスクを取得する * @return List タスクリスト */ List getTasks(); + + /** + * タスクを追加する + * @param task タスク + */ + void addTask(TaskItemModel task); + + /** + * タスクを削除する + * @param task タスク + */ + void removeTask(TaskItemModel task); + + /** + * タスクを更新する + * @param task タスク + */ + void updateTask(TaskItemModel task); + + // 子側 + +/** + * タスクの詳細を取得する + * @param taskId タスクID + * @return TaskItemModel タスク + */ + TaskItemModel getTask(String taskId); + + /** + * タスクの完了を記録する + * @param taskId タスクID + * @param childId 子ID + */ + void recordTaskCompletion(String taskId, String childId); } From b8ac6539caca0f009d8572b8c33e2c64339d231d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:00:50 +0900 Subject: [PATCH 02/18] =?UTF-8?q?=E3=82=BF=E3=82=B9=E3=82=AF=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=82=B9=E3=82=BF=E3=83=96=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/TaskData.java | 4 +-- .../kidshift/data/impl/TaskDataDummyImpl.java | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/TaskData.java b/data/src/main/java/one/nem/kidshift/data/TaskData.java index 3a990f1..b67ed02 100644 --- a/data/src/main/java/one/nem/kidshift/data/TaskData.java +++ b/data/src/main/java/one/nem/kidshift/data/TaskData.java @@ -22,9 +22,9 @@ public interface TaskData { /** * タスクを削除する - * @param task タスク + * @param taskId タスクID */ - void removeTask(TaskItemModel task); + void removeTask(String taskId); /** * タスクを更新する diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java index 6f8f874..4c5af1b 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java @@ -43,4 +43,36 @@ public class TaskDataDummyImpl implements TaskData { // logger.info("Returning tasks: " + tasks); return tasks; } + + @Override + public void addTask(TaskItemModel task) { + logger.info("addTask called"); + logger.info("Task: " + task); + } + + @Override + public void removeTask(String taskId) { + logger.info("removeTask called"); + logger.info("Task ID: " + taskId); + } + + @Override + public void updateTask(TaskItemModel task) { + logger.info("updateTask called"); + logger.info("Task: " + task); + } + + @Override + public TaskItemModel getTask(String taskId) { + List tasks = getTasks(); + // return random task + return tasks.get(faker.number().numberBetween(0, tasks.size())); + } + + @Override + public void recordTaskCompletion(String taskId, String childId) { + logger.info("recordTaskCompletion called"); + logger.info("Task ID: " + taskId); + logger.info("Child ID: " + childId); + } } From 37a705fc526e37e0a3bd67e7e33d06afa0507ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:01:43 +0900 Subject: [PATCH 03/18] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?= =?UTF-8?q?=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/kidshift/data/TaskData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/one/nem/kidshift/data/TaskData.java b/data/src/main/java/one/nem/kidshift/data/TaskData.java index b67ed02..09420f5 100644 --- a/data/src/main/java/one/nem/kidshift/data/TaskData.java +++ b/data/src/main/java/one/nem/kidshift/data/TaskData.java @@ -34,7 +34,7 @@ public interface TaskData { // 子側 -/** + /** * タスクの詳細を取得する * @param taskId タスクID * @return TaskItemModel タスク From d8595d2ba1201c6bd86c4d12c626cbd137ea47ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:06:13 +0900 Subject: [PATCH 04/18] =?UTF-8?q?ChildModel=E4=BD=9C=E6=88=90,=20=E6=9A=AB?= =?UTF-8?q?=E5=AE=9A=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/childModel.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 model/src/main/java/one/nem/kidshift/model/childModel.java diff --git a/model/src/main/java/one/nem/kidshift/model/childModel.java b/model/src/main/java/one/nem/kidshift/model/childModel.java new file mode 100644 index 0000000..897c2c1 --- /dev/null +++ b/model/src/main/java/one/nem/kidshift/model/childModel.java @@ -0,0 +1,49 @@ +package one.nem.kidshift.model; + +public class childModel { + String internalId; + String displayName; + String homeGroupId; + + public childModel(String internalId, String displayName, String homeGroupId) { + this.internalId = internalId; + this.displayName = displayName; + this.homeGroupId = homeGroupId; + } + + public childModel(String internalId, String displayName) { + this.internalId = internalId; + this.displayName = displayName; + } + + public childModel(String internalId) { + this.internalId = internalId; + } + + public childModel() { + } + + public String getInternalId() { + return internalId; + } + + public void setInternalId(String internalId) { + this.internalId = internalId; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getHomeGroupId() { + return homeGroupId; + } + + public void setHomeGroupId(String homeGroupId) { + this.homeGroupId = homeGroupId; + } +} From 076deade5f7100fc6925c81bdbbc174fdf6560ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:06:20 +0900 Subject: [PATCH 05/18] =?UTF-8?q?parentModel=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/src/main/java/one/nem/kidshift/model/parentModel.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 model/src/main/java/one/nem/kidshift/model/parentModel.java diff --git a/model/src/main/java/one/nem/kidshift/model/parentModel.java b/model/src/main/java/one/nem/kidshift/model/parentModel.java new file mode 100644 index 0000000..af54758 --- /dev/null +++ b/model/src/main/java/one/nem/kidshift/model/parentModel.java @@ -0,0 +1,4 @@ +package one.nem.kidshift.model; + +public class parentModel { +} From f7e0e8570f8b54f2db72b2d78affc02fea39d75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:07:43 +0900 Subject: [PATCH 06/18] =?UTF-8?q?parentModel=E6=9A=AB=E5=AE=9A=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/parentModel.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/model/src/main/java/one/nem/kidshift/model/parentModel.java b/model/src/main/java/one/nem/kidshift/model/parentModel.java index af54758..97d01a7 100644 --- a/model/src/main/java/one/nem/kidshift/model/parentModel.java +++ b/model/src/main/java/one/nem/kidshift/model/parentModel.java @@ -1,4 +1,62 @@ package one.nem.kidshift.model; public class parentModel { + String internalId; + String displayName; + String homeGroupId; + String email; + + public parentModel(String internalId, String displayName, String homeGroupId, String email) { + this.internalId = internalId; + this.displayName = displayName; + this.homeGroupId = homeGroupId; + this.email = email; + } + + public parentModel(String internalId, String displayName, String homeGroupId) { + this.internalId = internalId; + this.displayName = displayName; + this.homeGroupId = homeGroupId; + } + + public parentModel(String internalId, String displayName) { + this.internalId = internalId; + this.displayName = displayName; + } + + // Getter + + public String getInternalId() { + return internalId; + } + + public String getDisplayName() { + return displayName; + } + + public String getHomeGroupId() { + return homeGroupId; + } + + public String getEmail() { + return email; + } + + // Setter + + public void setInternalId(String internalId) { + this.internalId = internalId; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public void setHomeGroupId(String homeGroupId) { + this.homeGroupId = homeGroupId; + } + + public void setEmail(String email) { + this.email = email; + } } From 4ab928b68883a479de2be43219fb1d5086f071bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:08:51 +0900 Subject: [PATCH 07/18] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/src/main/java/one/nem/kidshift/model/childModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/model/src/main/java/one/nem/kidshift/model/childModel.java b/model/src/main/java/one/nem/kidshift/model/childModel.java index 897c2c1..306446f 100644 --- a/model/src/main/java/one/nem/kidshift/model/childModel.java +++ b/model/src/main/java/one/nem/kidshift/model/childModel.java @@ -1,5 +1,6 @@ package one.nem.kidshift.model; +// TODO: parent, childを共通クラスから継承させる public class childModel { String internalId; String displayName; From 6def64a38b07bc10508a49034504e6e4a9dfbdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:08:57 +0900 Subject: [PATCH 08/18] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/src/main/java/one/nem/kidshift/model/parentModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/model/src/main/java/one/nem/kidshift/model/parentModel.java b/model/src/main/java/one/nem/kidshift/model/parentModel.java index 97d01a7..e8f429d 100644 --- a/model/src/main/java/one/nem/kidshift/model/parentModel.java +++ b/model/src/main/java/one/nem/kidshift/model/parentModel.java @@ -1,5 +1,6 @@ package one.nem.kidshift.model; +// TODO: parent, childを共通クラスから継承させる public class parentModel { String internalId; String displayName; From a66f7edb235b25addb56f3c596627e027d74b1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:09:54 +0900 Subject: [PATCH 09/18] =?UTF-8?q?=E5=91=BD=E5=90=8D=E3=83=9F=E3=82=B9?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/{childModel.java => ChildModel.java} | 10 +++++----- .../model/{parentModel.java => ParentModel.java} | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) rename model/src/main/java/one/nem/kidshift/model/{childModel.java => ChildModel.java} (81%) rename model/src/main/java/one/nem/kidshift/model/{parentModel.java => ParentModel.java} (85%) diff --git a/model/src/main/java/one/nem/kidshift/model/childModel.java b/model/src/main/java/one/nem/kidshift/model/ChildModel.java similarity index 81% rename from model/src/main/java/one/nem/kidshift/model/childModel.java rename to model/src/main/java/one/nem/kidshift/model/ChildModel.java index 306446f..3dd8c38 100644 --- a/model/src/main/java/one/nem/kidshift/model/childModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ChildModel.java @@ -1,27 +1,27 @@ package one.nem.kidshift.model; // TODO: parent, childを共通クラスから継承させる -public class childModel { +public class ChildModel { String internalId; String displayName; String homeGroupId; - public childModel(String internalId, String displayName, String homeGroupId) { + public ChildModel(String internalId, String displayName, String homeGroupId) { this.internalId = internalId; this.displayName = displayName; this.homeGroupId = homeGroupId; } - public childModel(String internalId, String displayName) { + public ChildModel(String internalId, String displayName) { this.internalId = internalId; this.displayName = displayName; } - public childModel(String internalId) { + public ChildModel(String internalId) { this.internalId = internalId; } - public childModel() { + public ChildModel() { } public String getInternalId() { diff --git a/model/src/main/java/one/nem/kidshift/model/parentModel.java b/model/src/main/java/one/nem/kidshift/model/ParentModel.java similarity index 85% rename from model/src/main/java/one/nem/kidshift/model/parentModel.java rename to model/src/main/java/one/nem/kidshift/model/ParentModel.java index e8f429d..d329881 100644 --- a/model/src/main/java/one/nem/kidshift/model/parentModel.java +++ b/model/src/main/java/one/nem/kidshift/model/ParentModel.java @@ -1,26 +1,26 @@ package one.nem.kidshift.model; // TODO: parent, childを共通クラスから継承させる -public class parentModel { +public class ParentModel { String internalId; String displayName; String homeGroupId; String email; - public parentModel(String internalId, String displayName, String homeGroupId, String email) { + public ParentModel(String internalId, String displayName, String homeGroupId, String email) { this.internalId = internalId; this.displayName = displayName; this.homeGroupId = homeGroupId; this.email = email; } - public parentModel(String internalId, String displayName, String homeGroupId) { + public ParentModel(String internalId, String displayName, String homeGroupId) { this.internalId = internalId; this.displayName = displayName; this.homeGroupId = homeGroupId; } - public parentModel(String internalId, String displayName) { + public ParentModel(String internalId, String displayName) { this.internalId = internalId; this.displayName = displayName; } From b097cb72c78638b9b63d218e20caff3d5f3a79bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:10:43 +0900 Subject: [PATCH 10/18] =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/model/tasks/RewardItemModel.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java diff --git a/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java b/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java new file mode 100644 index 0000000..36aada9 --- /dev/null +++ b/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java @@ -0,0 +1,49 @@ +package one.nem.kidshift.model.tasks; + +import one.nem.kidshift.model.ChildModel; + +public class RewardItemModel { + String internalId; + String displayName; + Integer rewardAmount; + ChildModel assignedChild; + + public RewardItemModel(String internalId, String displayName, Integer rewardAmount, ChildModel assignedChild) { + this.internalId = internalId; + this.displayName = displayName; + this.rewardAmount = rewardAmount; + this.assignedChild = assignedChild; + } + + public String getInternalId() { + return internalId; + } + + public void setInternalId(String internalId) { + this.internalId = internalId; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public Integer getRewardAmount() { + return rewardAmount; + } + + public void setRewardAmount(Integer rewardAmount) { + this.rewardAmount = rewardAmount; + } + + public ChildModel getAssignedChild() { + return assignedChild; + } + + public void setAssignedChild(ChildModel assignedChild) { + this.assignedChild = assignedChild; + } +} From 937251a962a23058a9c49d2d76d414fbe96cbc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:12:36 +0900 Subject: [PATCH 11/18] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=A9=E3=82=AF=E3=82=BF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/model/tasks/RewardItemModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java b/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java index 36aada9..6a5485d 100644 --- a/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java +++ b/model/src/main/java/one/nem/kidshift/model/tasks/RewardItemModel.java @@ -15,6 +15,14 @@ public class RewardItemModel { this.assignedChild = assignedChild; } + public RewardItemModel(String internalId, String displayName, Integer rewardAmount) { + this.internalId = internalId; + this.displayName = displayName; + this.rewardAmount = rewardAmount; + } + + // TODO: ChildIdからChildModelを取得できる方法を実装する + public String getInternalId() { return internalId; } From a20fa448a69273f8e81b76c04b0842d7dfeaa9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:13:23 +0900 Subject: [PATCH 12/18] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/kidshift/data/ChildData.java | 4 ++++ data/src/main/java/one/nem/kidshift/data/ParentData.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/ChildData.java create mode 100644 data/src/main/java/one/nem/kidshift/data/ParentData.java diff --git a/data/src/main/java/one/nem/kidshift/data/ChildData.java b/data/src/main/java/one/nem/kidshift/data/ChildData.java new file mode 100644 index 0000000..f6e8863 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/ChildData.java @@ -0,0 +1,4 @@ +package one.nem.kidshift.data; + +public interface ChildData { +} diff --git a/data/src/main/java/one/nem/kidshift/data/ParentData.java b/data/src/main/java/one/nem/kidshift/data/ParentData.java new file mode 100644 index 0000000..f44a4ec --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/ParentData.java @@ -0,0 +1,4 @@ +package one.nem.kidshift.data; + +public interface ParentData { +} From b1fe3c7eea7bf6fbf8d9d4daefc831c6f86b1af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:14:38 +0900 Subject: [PATCH 13/18] =?UTF-8?q?parentData=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/ParentData.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/ParentData.java b/data/src/main/java/one/nem/kidshift/data/ParentData.java index f44a4ec..e1653cf 100644 --- a/data/src/main/java/one/nem/kidshift/data/ParentData.java +++ b/data/src/main/java/one/nem/kidshift/data/ParentData.java @@ -1,4 +1,20 @@ package one.nem.kidshift.data; +import one.nem.kidshift.model.ParentModel; + public interface ParentData { + + /** + * 親ユーザー情報取得 + * @param parentId 親ID + * @return ParentModel 親ユーザー情報 + */ + ParentModel getParent(String parentId); + + /** + * 親ユーザー情報更新 + * @param parent 親ユーザー情報 + */ + void updateParent(ParentModel parent); + } From 55517d59aa47062cfdb0e7ef204892faf3d6bd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:15:28 +0900 Subject: [PATCH 14/18] =?UTF-8?q?childData=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/ChildData.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/ChildData.java b/data/src/main/java/one/nem/kidshift/data/ChildData.java index f6e8863..c96873f 100644 --- a/data/src/main/java/one/nem/kidshift/data/ChildData.java +++ b/data/src/main/java/one/nem/kidshift/data/ChildData.java @@ -1,4 +1,25 @@ package one.nem.kidshift.data; +import one.nem.kidshift.model.ChildModel; + public interface ChildData { + + /** + * 子ユーザー情報取得 + * @param childId 子ID + * @return ChildModel 子ユーザー情報 + */ + ChildModel getChild(String childId); + + /** + * 子ユーザー情報更新 + * @param child 子ユーザー情報 + */ + void updateChild(ChildModel child); + + /** + * 子ユーザー追加 + * @param child 子ユーザー情報 + */ + void addChild(ChildModel child); } From c1fd60ac78461580891cc65e5b482c0306c3ec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:21:03 +0900 Subject: [PATCH 15/18] =?UTF-8?q?=E5=89=8A=E9=99=A4=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/one/nem/kidshift/data/ChildData.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/ChildData.java b/data/src/main/java/one/nem/kidshift/data/ChildData.java index c96873f..f422e4a 100644 --- a/data/src/main/java/one/nem/kidshift/data/ChildData.java +++ b/data/src/main/java/one/nem/kidshift/data/ChildData.java @@ -22,4 +22,10 @@ public interface ChildData { * @param child 子ユーザー情報 */ void addChild(ChildModel child); + + /** + * 子ユーザー削除 + * @param childId 子ID + */ + void removeChild(String childId); } From 145681f517cf01162b75b01695e8293aeda03094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:53:51 +0900 Subject: [PATCH 16/18] =?UTF-8?q?Dummy=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/impl/ChildDataDummyImpl.java | 26 +++++++++++++++++++ .../data/impl/ParentDataDummyImpl.java | 16 ++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/impl/ChildDataDummyImpl.java create mode 100644 data/src/main/java/one/nem/kidshift/data/impl/ParentDataDummyImpl.java diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ChildDataDummyImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ChildDataDummyImpl.java new file mode 100644 index 0000000..2eb83af --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/impl/ChildDataDummyImpl.java @@ -0,0 +1,26 @@ +package one.nem.kidshift.data.impl; + +import one.nem.kidshift.data.ChildData; +import one.nem.kidshift.model.ChildModel; + +public class ChildDataDummyImpl implements ChildData { + @Override + public ChildModel getChild(String childId) { + return null; + } + + @Override + public void updateChild(ChildModel child) { + + } + + @Override + public void addChild(ChildModel child) { + + } + + @Override + public void removeChild(String childId) { + + } +} diff --git a/data/src/main/java/one/nem/kidshift/data/impl/ParentDataDummyImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataDummyImpl.java new file mode 100644 index 0000000..b627bd6 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/impl/ParentDataDummyImpl.java @@ -0,0 +1,16 @@ +package one.nem.kidshift.data.impl; + +import one.nem.kidshift.data.ParentData; +import one.nem.kidshift.model.ParentModel; + +public class ParentDataDummyImpl implements ParentData { + @Override + public ParentModel getParent(String parentId) { + return null; + } + + @Override + public void updateParent(ParentModel parent) { + + } +} From 639542282b52bc3c056a5e32421378907097b2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:56:27 +0900 Subject: [PATCH 17/18] =?UTF-8?q?ChildData=E3=82=92=E3=83=90=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/modules/ChildDataDummyModule.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/modules/ChildDataDummyModule.java diff --git a/data/src/main/java/one/nem/kidshift/data/modules/ChildDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/ChildDataDummyModule.java new file mode 100644 index 0000000..5365ecc --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/modules/ChildDataDummyModule.java @@ -0,0 +1,16 @@ +package one.nem.kidshift.data.modules; + +import dagger.Binds; +import dagger.Module; +import dagger.hilt.InstallIn; +import dagger.hilt.android.components.FragmentComponent; +import one.nem.kidshift.data.ChildData; +import one.nem.kidshift.data.impl.ChildDataDummyImpl; + +@Module +@InstallIn(FragmentComponent.class) +abstract public class ChildDataDummyModule { + + @Binds + public abstract ChildData bindChildData(ChildDataDummyImpl childDataDummyImpl); +} From 7be94ca833a9225257ea582b807aef5ab315a82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 21 Jun 2024 09:57:28 +0900 Subject: [PATCH 18/18] =?UTF-8?q?ParentData=E3=82=92=E3=83=90=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/modules/ParentDataDummyModule.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/modules/ParentDataDummyModule.java diff --git a/data/src/main/java/one/nem/kidshift/data/modules/ParentDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/ParentDataDummyModule.java new file mode 100644 index 0000000..149e7fe --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/modules/ParentDataDummyModule.java @@ -0,0 +1,16 @@ +package one.nem.kidshift.data.modules; + +import dagger.Binds; +import dagger.Module; +import dagger.hilt.InstallIn; +import dagger.hilt.android.components.FragmentComponent; +import one.nem.kidshift.data.ParentData; +import one.nem.kidshift.data.impl.ParentDataDummyImpl; + +@Module +@InstallIn(FragmentComponent.class) +abstract public class ParentDataDummyModule { + + @Binds + public abstract ParentData bindParentData(ParentDataDummyImpl parentDataDummyImpl); +}