From cb5a56099a0b768302276ecd2f1297e8472863ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 13:58:41 +0900 Subject: [PATCH 01/40] =?UTF-8?q?ChildID=E6=8C=87=E5=AE=9A=E3=83=91?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=83=B3=E3=82=92=E3=82=A4=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E3=81=AB=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/TaskData.java | 7 +++++++ 1 file changed, 7 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 09420f5..aa9cc9f 100644 --- a/data/src/main/java/one/nem/kidshift/data/TaskData.java +++ b/data/src/main/java/one/nem/kidshift/data/TaskData.java @@ -14,6 +14,13 @@ public interface TaskData { */ List getTasks(); + /** + * アタッチされている全てのタスクを取得する + * @param childId 子ID + * @return List タスクリスト + */ + List getTasks(String childId); + /** * タスクを追加する * @param task タスク -- 2.45.1 From 38876c67d024106adebe67a66ad58fabd1164415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 13:59:10 +0900 Subject: [PATCH 02/40] =?UTF-8?q?Impl=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/data/impl/TaskDataImpl.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java new file mode 100644 index 0000000..b73311f --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java @@ -0,0 +1,43 @@ +package one.nem.kidshift.data.impl; + +import java.util.List; + +import one.nem.kidshift.data.TaskData; +import one.nem.kidshift.model.tasks.TaskItemModel; + +public class TaskDataImpl implements TaskData { + @Override + public List getTasks() { + return null; + } + + @Override + public List getTasks(String childId) { + return null; + } + + @Override + public void addTask(TaskItemModel task) { + + } + + @Override + public void removeTask(String taskId) { + + } + + @Override + public void updateTask(TaskItemModel task) { + + } + + @Override + public TaskItemModel getTask(String taskId) { + return null; + } + + @Override + public void recordTaskCompletion(String taskId, String childId) { + + } +} -- 2.45.1 From 1bc05a5576b7569137c450abc0a10ffa9c3c5006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 13:59:39 +0900 Subject: [PATCH 03/40] =?UTF-8?q?=E3=83=80=E3=83=9F=E3=83=BC=E5=81=B4?= =?UTF-8?q?=E5=AE=9F=E8=A3=85=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/data/impl/TaskDataDummyImpl.java | 78 ------------------- 1 file changed, 78 deletions(-) delete mode 100644 data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java 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 deleted file mode 100644 index 4c5af1b..0000000 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package one.nem.kidshift.data.impl; - -import com.github.javafaker.Faker; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import javax.inject.Inject; - -import one.nem.kidshift.data.TaskData; -import one.nem.kidshift.model.tasks.TaskItemModel; -import one.nem.kidshift.model.tasks.condition.TaskConditionBaseModel; -import one.nem.kidshift.model.tasks.condition.TaskConditionNoneModel; -import one.nem.kidshift.utils.KSLogger; - -public class TaskDataDummyImpl implements TaskData { - - private Faker faker; - - @Inject - KSLogger logger; - - @Inject - public TaskDataDummyImpl() { - faker = new Faker(); -// logger.setTag("TaskDataDummyImpl"); - } - - @Override - public List getTasks() { -// logger.info("getTotalReward called"); - List tasks = new ArrayList<>(); - int totalTasks = faker.number().numberBetween(1, 15); -// logger.info("Returning total tasks: " + totalTasks); - for (int i = 0; i < totalTasks; i++) { - tasks.add(new TaskItemModel( - UUID.randomUUID().toString(), - faker.lorem().sentence(), UUID.randomUUID().toString(), - new TaskConditionNoneModel(), - faker.number().numberBetween(1, 1000))); - } -// 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); - } -} -- 2.45.1 From deb66782a18ea7a920f73e24973163fd16a915de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:00:22 +0900 Subject: [PATCH 04/40] =?UTF-8?q?=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/data/modules/TaskDataModule.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/modules/TaskDataModule.java diff --git a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataModule.java b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataModule.java new file mode 100644 index 0000000..87f27e4 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataModule.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.TaskData; +import one.nem.kidshift.data.impl.TaskDataImpl; + +@Module +@InstallIn(FragmentComponent.class) +public abstract class TaskDataModule { + + @Binds + public abstract TaskData bindTaskData(TaskDataImpl taskDataImpl); +} -- 2.45.1 From 220ebb7477e735d76853b674aa35c872d78766c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:00:31 +0900 Subject: [PATCH 05/40] =?UTF-8?q?=E3=83=80=E3=83=9F=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=89=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/one/nem/kidshift/data/modules/TaskDataDummyModule.java | 1 - 1 file changed, 1 deletion(-) diff --git a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java index 764f040..b3eaaf9 100644 --- a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java +++ b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java @@ -5,7 +5,6 @@ import dagger.Module; import dagger.hilt.InstallIn; import dagger.hilt.android.components.FragmentComponent; import one.nem.kidshift.data.TaskData; -import one.nem.kidshift.data.impl.TaskDataDummyImpl; @Module @InstallIn(FragmentComponent.class) -- 2.45.1 From 2151fadac9a5871df74abc417a384df2a9b1fa23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:00:44 +0900 Subject: [PATCH 06/40] =?UTF-8?q?=E3=83=80=E3=83=9F=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=89=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/modules/TaskDataDummyModule.java | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java diff --git a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java deleted file mode 100644 index b3eaaf9..0000000 --- a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java +++ /dev/null @@ -1,15 +0,0 @@ -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.TaskData; - -@Module -@InstallIn(FragmentComponent.class) -abstract public class TaskDataDummyModule { - - @Binds - public abstract TaskData bindTaskData(TaskDataDummyImpl taskDataDummyImpl); -} -- 2.45.1 From 2cb31180e0ef32ff864f59a653781aec01064a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:05:01 +0900 Subject: [PATCH 07/40] TaskBaseItem --- .../retrofit/model/task/TaskBaseItem.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java new file mode 100644 index 0000000..046dfea --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java @@ -0,0 +1,51 @@ +package one.nem.kidshift.data.retrofit.model.task; + +// Base class for tasks +public class TaskBaseItem { + private String id; + private String name; + private String iconEmoji; // Optional + private String bgColor; // Optional + private int reward; + + // Getters and setters + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIconEmoji() { + return iconEmoji; + } + + public void setIconEmoji(String iconEmoji) { + this.iconEmoji = iconEmoji; + } + + public String getBgColor() { + return bgColor; + } + + public void setBgColor(String bgColor) { + this.bgColor = bgColor; + } + + public int getReward() { + return reward; + } + + public void setReward(int reward) { + this.reward = reward; + } +} -- 2.45.1 From bf403c4ab7f7759fae6a4a0d0657c6b510c124fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:13:03 +0900 Subject: [PATCH 08/40] =?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 --- .../retrofit/model/task/TaskBaseItem.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java index 046dfea..3427a45 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java @@ -8,6 +8,26 @@ public class TaskBaseItem { private String bgColor; // Optional private int reward; + // Full + public TaskBaseItem(String id, String name, String iconEmoji, String bgColor, int reward) { + this.id = id; + this.name = name; + this.iconEmoji = iconEmoji; + this.bgColor = bgColor; + this.reward = reward; + } + + // Required + public TaskBaseItem(String id, String name, int reward) { + this.id = id; + this.name = name; + this.reward = reward; + } + + // Empty + public TaskBaseItem() { + } + // Getters and setters public String getId() { return id; -- 2.45.1 From 1f023cdea81db0d556c3a7131e4fb9daa5d8bbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:16:18 +0900 Subject: [PATCH 09/40] =?UTF-8?q?TaskResponse=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/task/TaskResponse.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java new file mode 100644 index 0000000..9fbd076 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java @@ -0,0 +1,17 @@ +package one.nem.kidshift.data.retrofit.model.task; + +import java.util.List; + +// Response for a single task with attached children +public class TaskResponse extends TaskBaseItem { + private List attachedChildren; + + // Getters and setters + public List getAttachedChildren() { + return attachedChildren; + } + + public void setAttachedChildren(List attachedChildren) { + this.attachedChildren = attachedChildren; + } +} \ No newline at end of file -- 2.45.1 From 2fdf7a7af599d69b98e3f9c638b47dcca05810b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:17:21 +0900 Subject: [PATCH 10/40] =?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 --- .../retrofit/model/task/TaskResponse.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java index 9fbd076..1312d5d 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskResponse.java @@ -6,6 +6,28 @@ import java.util.List; public class TaskResponse extends TaskBaseItem { private List attachedChildren; + // Full + public TaskResponse(String id, String name, String iconEmoji, String bgColor, int reward, List attachedChildren) { + super(id, name, iconEmoji, bgColor, reward); + this.attachedChildren = attachedChildren; + } + + // Required + public TaskResponse(String id, String name, int reward, List attachedChildren) { + super(id, name, reward); + this.attachedChildren = attachedChildren; + } + + // Empty + public TaskResponse() { + } + + // Extend + public TaskResponse(TaskBaseItem taskBaseItem, List attachedChildren) { + super(taskBaseItem.getId(), taskBaseItem.getName(), taskBaseItem.getIconEmoji(), taskBaseItem.getBgColor(), taskBaseItem.getReward()); + this.attachedChildren = attachedChildren; + } + // Getters and setters public List getAttachedChildren() { return attachedChildren; -- 2.45.1 From d89b7d79d02a4418662a9a737a5cc149e79df7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:22:17 +0900 Subject: [PATCH 11/40] TaskListResponse --- .../retrofit/model/task/TaskListResponse.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java new file mode 100644 index 0000000..cf07e12 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java @@ -0,0 +1,17 @@ +package one.nem.kidshift.data.retrofit.model.task; + +import java.util.List; + +// Response for a list of tasks +public class TaskListResponse { + private List list; + + // Getters and setters + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} -- 2.45.1 From 1d05368da4bbcb17103eedf8bf34632c6f1b8b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:22:38 +0900 Subject: [PATCH 12/40] =?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 --- .../data/retrofit/model/task/TaskListResponse.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java index cf07e12..dd2c16a 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskListResponse.java @@ -6,6 +6,15 @@ import java.util.List; public class TaskListResponse { private List list; + // Full + public TaskListResponse(List list) { + this.list = list; + } + + // Empty + public TaskListResponse() { + } + // Getters and setters public List getList() { return list; -- 2.45.1 From e37b332dbc61a2f481231745737bc3b4ab621bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:23:09 +0900 Subject: [PATCH 13/40] TaskAddRequest --- .../retrofit/model/task/TaskAddRequest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java new file mode 100644 index 0000000..a666814 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java @@ -0,0 +1,17 @@ +package one.nem.kidshift.data.retrofit.model.task; + +import java.util.List; + +// Request to add a task, with optional attached children +public class TaskAddRequest extends TaskBaseItem { + private List attachedChildren; + + // Getters and setters + public List getAttachedChildren() { + return attachedChildren; + } + + public void setAttachedChildren(List attachedChildren) { + this.attachedChildren = attachedChildren; + } +} \ No newline at end of file -- 2.45.1 From 7e608e5a6082aa3e429a0416517c84b0f40972af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:24:13 +0900 Subject: [PATCH 14/40] =?UTF-8?q?Id=E3=81=AA=E3=81=97=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/data/retrofit/model/task/TaskBaseItem.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java index 3427a45..ae708b2 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java @@ -17,6 +17,14 @@ public class TaskBaseItem { this.reward = reward; } + // Without id + public TaskBaseItem(String name, String iconEmoji, String bgColor, int reward) { + this.name = name; + this.iconEmoji = iconEmoji; + this.bgColor = bgColor; + this.reward = reward; + } + // Required public TaskBaseItem(String id, String name, int reward) { this.id = id; -- 2.45.1 From 63a34accb158a0bb17b257efec1e70d53ead837a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:24:56 +0900 Subject: [PATCH 15/40] =?UTF-8?q?Id=E3=81=AA=E3=81=97=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=82=B9=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/data/retrofit/model/task/TaskBaseItem.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java index ae708b2..bbb5816 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskBaseItem.java @@ -32,6 +32,12 @@ public class TaskBaseItem { this.reward = reward; } + // Without id and optional fields + public TaskBaseItem(String name, int reward) { + this.name = name; + this.reward = reward; + } + // Empty public TaskBaseItem() { } -- 2.45.1 From 766c1bd564c7c9b30a6447a0f0c56f1dd4b9175a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:25:02 +0900 Subject: [PATCH 16/40] =?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 --- .../retrofit/model/task/TaskAddRequest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java index a666814..ba3b2b5 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java @@ -6,6 +6,28 @@ import java.util.List; public class TaskAddRequest extends TaskBaseItem { private List attachedChildren; + // Full + public TaskAddRequest(String name, String iconEmoji, String bgColor, int reward, List attachedChildren) { + super(name, iconEmoji, bgColor, reward); + this.attachedChildren = attachedChildren; + } + + // Required + public TaskAddRequest(String name, int reward, List attachedChildren) { + super(name, reward); + this.attachedChildren = attachedChildren; + } + + // Empty + public TaskAddRequest() { + } + + // Extend + public TaskAddRequest(TaskBaseItem taskBaseItem, List attachedChildren) { + super(taskBaseItem.getName(), taskBaseItem.getIconEmoji(), taskBaseItem.getBgColor(), taskBaseItem.getReward()); + this.attachedChildren = attachedChildren; + } + // Getters and setters public List getAttachedChildren() { return attachedChildren; -- 2.45.1 From 362594017694629a314f06c2c39e3ab991f4afd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:37:53 +0900 Subject: [PATCH 17/40] =?UTF-8?q?ChildBaseItem=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retrofit/model/child/ChildBaseItem.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java new file mode 100644 index 0000000..1175013 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java @@ -0,0 +1,24 @@ +package one.nem.kidshift.data.retrofit.model.child; + +// Base class for children +public class ChildBaseItem { + private String id; + private String name; + + // Getters and setters + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} -- 2.45.1 From fbbcc31e66273f61f6f66213e01563221bf7e835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:38:33 +0900 Subject: [PATCH 18/40] =?UTF-8?q?ChildDetailsResponse=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/child/ChildDetailsResponse.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java new file mode 100644 index 0000000..3279abf --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java @@ -0,0 +1,26 @@ +package one.nem.kidshift.data.retrofit.model.child; + +import java.util.Date; + +// Response for detailed information about a child +public class ChildDetailsResponse extends ChildBaseItem { + private Date createdAt; + private String homeGroupId; + + // Getters and setters + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public String getHomeGroupId() { + return homeGroupId; + } + + public void setHomeGroupId(String homeGroupId) { + this.homeGroupId = homeGroupId; + } +} -- 2.45.1 From 1062a075b8c664abf7adca5a1ace8aad66832c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:39:08 +0900 Subject: [PATCH 19/40] ChildListResponse WIP --- .../retrofit/model/child/ChildListResponse.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java new file mode 100644 index 0000000..85029a5 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java @@ -0,0 +1,15 @@ +package one.nem.kidshift.data.retrofit.model.child; + +// Response for a list of children +public class ChildListResponse { + private List list; + + // Getters and setters + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} -- 2.45.1 From 32b3df0c525c6da2f1ec0dca8138dc5f765c946a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:39:46 +0900 Subject: [PATCH 20/40] =?UTF-8?q?ChildListResponse=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/data/retrofit/model/child/ChildListResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java index 85029a5..2ba1e49 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java @@ -1,5 +1,7 @@ package one.nem.kidshift.data.retrofit.model.child; +import java.util.List; + // Response for a list of children public class ChildListResponse { private List list; -- 2.45.1 From 063c2ebaa9f83c6be746654c6432522511ca643a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:39:51 +0900 Subject: [PATCH 21/40] =?UTF-8?q?ChildResponse=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/data/retrofit/model/child/ChildResponse.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildResponse.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildResponse.java new file mode 100644 index 0000000..92fd685 --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildResponse.java @@ -0,0 +1,4 @@ +package one.nem.kidshift.data.retrofit.model.child; + +public class ChildResponse extends ChildBaseItem { +} -- 2.45.1 From 0cba90058a95831133e7203af7c5a02d7e537ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:40:16 +0900 Subject: [PATCH 22/40] =?UTF-8?q?ChildRequest=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nem/kidshift/data/retrofit/model/child/ChildRequest.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildRequest.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildRequest.java new file mode 100644 index 0000000..ab37e8a --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildRequest.java @@ -0,0 +1,4 @@ +package one.nem.kidshift.data.retrofit.model.child; + +public class ChildRequest extends ChildBaseItem { +} -- 2.45.1 From bc351fa664947e010b9514ccd4d0f9c7ae0f20d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:40:48 +0900 Subject: [PATCH 23/40] =?UTF-8?q?ChildAddRequest=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retrofit/model/child/ChildAddRequest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java new file mode 100644 index 0000000..9fead3c --- /dev/null +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java @@ -0,0 +1,15 @@ +package one.nem.kidshift.data.retrofit.model.child; + +// Request to add a child +public class ChildAddRequest { + private String name; + + // Getters and setters + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file -- 2.45.1 From a55e1cc2595b703722df92365f55e8a37d27a349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:41:12 +0900 Subject: [PATCH 24/40] =?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=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/child/ChildAddRequest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java index 9fead3c..e887ead 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildAddRequest.java @@ -4,6 +4,14 @@ package one.nem.kidshift.data.retrofit.model.child; public class ChildAddRequest { private String name; + // Constructor + public ChildAddRequest(String name) { + this.name = name; + } + + public ChildAddRequest() { + } + // Getters and setters public String getName() { return name; -- 2.45.1 From 939dac0abbd7cf732614c03bc38556098089945e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:41:37 +0900 Subject: [PATCH 25/40] =?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=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/child/ChildBaseItem.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java index 1175013..8177caa 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildBaseItem.java @@ -5,6 +5,15 @@ public class ChildBaseItem { private String id; private String name; + // Constructor + public ChildBaseItem(String id, String name) { + this.id = id; + this.name = name; + } + + public ChildBaseItem() { + } + // Getters and setters public String getId() { return id; -- 2.45.1 From e61aa0ea9399b2eb67e78311ddee3e0753b7f5fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:42:00 +0900 Subject: [PATCH 26/40] =?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=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retrofit/model/child/ChildDetailsResponse.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java index 3279abf..15db2ad 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildDetailsResponse.java @@ -7,6 +7,16 @@ public class ChildDetailsResponse extends ChildBaseItem { private Date createdAt; private String homeGroupId; + // Constructor + public ChildDetailsResponse(String id, String name, Date createdAt, String homeGroupId) { + super(id, name); + this.createdAt = createdAt; + this.homeGroupId = homeGroupId; + } + + public ChildDetailsResponse() { + } + // Getters and setters public Date getCreatedAt() { return createdAt; -- 2.45.1 From 175761f51b53652ab21d63a1430fe9fd3a5203fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:42:14 +0900 Subject: [PATCH 27/40] =?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=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/retrofit/model/child/ChildListResponse.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java index 2ba1e49..cada8b8 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/child/ChildListResponse.java @@ -6,6 +6,14 @@ import java.util.List; public class ChildListResponse { private List list; + // Constructor + public ChildListResponse(List list) { + this.list = list; + } + + public ChildListResponse() { + } + // Getters and setters public List getList() { return list; -- 2.45.1 From eb86154c7f7ca9c9982e322136d5dc954e852e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:49:26 +0900 Subject: [PATCH 28/40] =?UTF-8?q?GetTasks=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/data/retrofit/KidShiftApiService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java index c075559..261a32e 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java @@ -4,6 +4,7 @@ import one.nem.kidshift.data.retrofit.interceptor.AuthorizationInterceptor; import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginRequest; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentLoginResponse; +import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; @@ -20,4 +21,7 @@ public interface KidShiftApiService { @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) Call getParentInfo(); + @GET("/parent/task") + @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) + Call getTasks(); } -- 2.45.1 From 92d7e9edc80a00b8260def48c20aacba5192af18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:50:17 +0900 Subject: [PATCH 29/40] =?UTF-8?q?=E5=9E=8B=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/KSActions.java | 2 +- .../src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/KSActions.java b/data/src/main/java/one/nem/kidshift/data/KSActions.java index 732d810..b6be422 100644 --- a/data/src/main/java/one/nem/kidshift/data/KSActions.java +++ b/data/src/main/java/one/nem/kidshift/data/KSActions.java @@ -9,7 +9,7 @@ import one.nem.kidshift.model.ParentModel; */ public interface KSActions { - void syncTasks(); + CompletableFuture syncTasks(); void syncChildList(); diff --git a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java index 9cf9f7c..57d1b6d 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java @@ -28,7 +28,7 @@ public class KSActionsImpl implements KSActions { } @Override - public void syncTasks() { + public CompletableFuture syncTasks() { } -- 2.45.1 From 6039044b9a17f5da9799a7f9214952017463f214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:52:44 +0900 Subject: [PATCH 30/40] =?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 --- .../java/one/nem/kidshift/data/KSActions.java | 3 ++- .../nem/kidshift/data/impl/KSActionsImpl.java | 24 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/KSActions.java b/data/src/main/java/one/nem/kidshift/data/KSActions.java index b6be422..85c440f 100644 --- a/data/src/main/java/one/nem/kidshift/data/KSActions.java +++ b/data/src/main/java/one/nem/kidshift/data/KSActions.java @@ -2,6 +2,7 @@ package one.nem.kidshift.data; import java.util.concurrent.CompletableFuture; +import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.model.ParentModel; /** @@ -9,7 +10,7 @@ import one.nem.kidshift.model.ParentModel; */ public interface KSActions { - CompletableFuture syncTasks(); + CompletableFuture syncTasks(); void syncChildList(); diff --git a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java index 57d1b6d..6b2558c 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/KSActionsImpl.java @@ -8,6 +8,7 @@ import one.nem.kidshift.data.KSActions; import one.nem.kidshift.data.UserSettings; import one.nem.kidshift.data.retrofit.KidShiftApiService; import one.nem.kidshift.data.retrofit.model.parent.ParentInfoResponse; +import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.model.ParentModel; import one.nem.kidshift.utils.KSLogger; import retrofit2.Call; @@ -28,8 +29,27 @@ public class KSActionsImpl implements KSActions { } @Override - public CompletableFuture syncTasks() { - + public CompletableFuture syncTasks() { + return CompletableFuture.supplyAsync(() -> { + Call call = kidShiftApiService.getTasks(); + try { + Response response = call.execute(); + if (!response.isSuccessful()) { + logger.error("Error fetching tasks: " + response.errorBody().string()); + throw new RuntimeException("Error fetching tasks: " + response.errorBody().string()); + } + TaskListResponse responseBody = response.body(); + logger.info("Tasks fetched with status: " + response.code()); + logger.debug("Tasks: " + responseBody.getList()); +// // Save to cache +// userSettings.getCache().setTasks(responseBody.getList()); +// logger.info("Tasks saved to cache"); + return responseBody; + } catch (Exception e) { + logger.error("Error fetching tasks"); + throw new RuntimeException(e); + } + }); } @Override -- 2.45.1 From 6644ee4fe4ea761b51d7edb26d089c9032a79504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:55:00 +0900 Subject: [PATCH 31/40] =?UTF-8?q?=E5=9E=8B=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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 aa9cc9f..7e85cc4 100644 --- a/data/src/main/java/one/nem/kidshift/data/TaskData.java +++ b/data/src/main/java/one/nem/kidshift/data/TaskData.java @@ -1,6 +1,7 @@ package one.nem.kidshift.data; import java.util.List; +import java.util.concurrent.CompletableFuture; import one.nem.kidshift.model.tasks.TaskItemModel; @@ -10,16 +11,16 @@ public interface TaskData { /** * 存在する全てのタスクを取得する - * @return List タスクリスト + * @return CompletableFuture> タスクリスト */ - List getTasks(); + CompletableFuture> getTasks(); /** * アタッチされている全てのタスクを取得する * @param childId 子ID - * @return List タスクリスト + * @return CompletableFuture> タスクリスト */ - List getTasks(String childId); + CompletableFuture> getTasks(String childId); /** * タスクを追加する -- 2.45.1 From 9bf194a75570fd63faf7a867658ea51ab3aa06af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 14:58:26 +0900 Subject: [PATCH 32/40] =?UTF-8?q?=E7=A9=BA=E3=82=B3=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=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 --- .../main/java/one/nem/kidshift/model/tasks/TaskItemModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/model/src/main/java/one/nem/kidshift/model/tasks/TaskItemModel.java b/model/src/main/java/one/nem/kidshift/model/tasks/TaskItemModel.java index 107e8e8..3a6a1c3 100644 --- a/model/src/main/java/one/nem/kidshift/model/tasks/TaskItemModel.java +++ b/model/src/main/java/one/nem/kidshift/model/tasks/TaskItemModel.java @@ -44,6 +44,10 @@ public class TaskItemModel { this.reward = reward; } + public TaskItemModel() { + + } + // getter setter public String getInternalId() { -- 2.45.1 From d85240ccd9461c0e0a0c137a120e9a57e2a12f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:00:06 +0900 Subject: [PATCH 33/40] =?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 --- .../nem/kidshift/data/impl/TaskDataImpl.java | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java index b73311f..592f4ba 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java @@ -1,18 +1,43 @@ package one.nem.kidshift.data.impl; import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; +import javax.inject.Inject; + +import one.nem.kidshift.data.KSActions; import one.nem.kidshift.data.TaskData; +import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.model.tasks.TaskItemModel; public class TaskDataImpl implements TaskData { - @Override - public List getTasks() { - return null; + + KSActions ksActions; + + @Inject + public TaskDataImpl(KSActions ksActions) { + this.ksActions = ksActions; } @Override - public List getTasks(String childId) { + public CompletableFuture> getTasks() { + return CompletableFuture.supplyAsync(() -> { + TaskListResponse data = ksActions.syncTasks().join(); + return data.getList().stream().map(task -> { + // Convert TaskItemModel + TaskItemModel model = new TaskItemModel(); + model.setInternalId(task.getId()); + model.setDisplayName(task.getName()); + model.setReward(task.getReward()); + + return model; + }).collect(Collectors.toList()); + }); + } + + @Override + public CompletableFuture> getTasks(String childId) { return null; } -- 2.45.1 From a292c44342cd7a683929b74fcc8c1d8a967419b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:00:21 +0900 Subject: [PATCH 34/40] =?UTF-8?q?null=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java index 592f4ba..fd3dfe7 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java @@ -24,6 +24,9 @@ public class TaskDataImpl implements TaskData { public CompletableFuture> getTasks() { return CompletableFuture.supplyAsync(() -> { TaskListResponse data = ksActions.syncTasks().join(); + if (data == null) { + return null; + } return data.getList().stream().map(task -> { // Convert TaskItemModel TaskItemModel model = new TaskItemModel(); -- 2.45.1 From a8beaa6c80040916be91edac0702cd68b1d0c91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:00:32 +0900 Subject: [PATCH 35/40] =?UTF-8?q?Revert=20"null=E5=AF=BE=E7=AD=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a292c44342cd7a683929b74fcc8c1d8a967419b2. --- .../src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java index fd3dfe7..592f4ba 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java @@ -24,9 +24,6 @@ public class TaskDataImpl implements TaskData { public CompletableFuture> getTasks() { return CompletableFuture.supplyAsync(() -> { TaskListResponse data = ksActions.syncTasks().join(); - if (data == null) { - return null; - } return data.getList().stream().map(task -> { // Convert TaskItemModel TaskItemModel model = new TaskItemModel(); -- 2.45.1 From 6d557a62d75f002f26649bc5e8aa86b673c604d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:04:37 +0900 Subject: [PATCH 36/40] =?UTF-8?q?=E6=9A=AB=E5=AE=9Ajoin()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../one/nem/kidshift/feature/parent/ParentMainFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java index e08a9c7..d3596fe 100644 --- a/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java +++ b/feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java @@ -44,7 +44,7 @@ public class ParentMainFragment extends Fragment { RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext()); recyclerView.setLayoutManager(layoutManager); - List task = taskData.getTasks(); + List task = taskData.getTasks().join(); RecyclerView.Adapter mainAdapter = new ParentAdapter(task); recyclerView.setAdapter(mainAdapter); -- 2.45.1 From f4b33062e6441d3e0c73e0fefee643cc1b611665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:05:30 +0900 Subject: [PATCH 37/40] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=95?= =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/debug/DebugMockTestFragment.java | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMockTestFragment.java diff --git a/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMockTestFragment.java b/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMockTestFragment.java deleted file mode 100644 index 9fa62d4..0000000 --- a/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMockTestFragment.java +++ /dev/null @@ -1,62 +0,0 @@ -package one.nem.kidshift.feature.debug; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import javax.inject.Inject; - -import dagger.hilt.android.AndroidEntryPoint; -import one.nem.kidshift.data.RewardData; -import one.nem.kidshift.data.TaskData; - -@AndroidEntryPoint -public class DebugMockTestFragment extends Fragment { - - @Inject - TaskData taskData; - - @Inject - RewardData rewardData; - - public DebugMockTestFragment() { - // Required empty public constructor - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_debug_mock_test, container, false); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - // TaskData - TextView taskDataStatus = view.findViewById(R.id.taskData_mockedStatusTextView); - taskDataStatus.setText("isMocked: true"); // TODO: 固定値やめる - - TextView taskDataResult = view.findViewById(R.id.taskData_resultTextView); - - view.findViewById(R.id.taskData_getTasksButton).setOnClickListener(v -> { - taskDataResult.setText(taskData.getTasks().stream().map(Object::toString).reduce("", (a, b) -> a + b + "\n")); - }); - - // RewardData - TextView rewardDataStatus = view.findViewById(R.id.rewardData_mockedStatusTextView); - rewardDataStatus.setText("isMocked: true"); // TODO: 固定値やめる - - TextView rewardDataResult = view.findViewById(R.id.rewardData_resultTextView); - view.findViewById(R.id.rewardData_getTotalRewardButton).setOnClickListener(v -> { - rewardDataResult.setText(rewardData.getTotalReward().toString()); - }); - } - -} \ No newline at end of file -- 2.45.1 From 642001d6ec7ecf718d30b6b8385f8887c92580b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Wed, 26 Jun 2024 15:05:53 +0900 Subject: [PATCH 38/40] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=95?= =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/fragment_debug_mock_test.xml | 119 ------------------ 1 file changed, 119 deletions(-) delete mode 100644 feature/debug/src/main/res/layout/fragment_debug_mock_test.xml diff --git a/feature/debug/src/main/res/layout/fragment_debug_mock_test.xml b/feature/debug/src/main/res/layout/fragment_debug_mock_test.xml deleted file mode 100644 index 6420269..0000000 --- a/feature/debug/src/main/res/layout/fragment_debug_mock_test.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - -