From 1ae8335a4aa8d886626402526feb5e8e2c0bfb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Tue, 23 Jul 2024 12:44:08 +0900 Subject: [PATCH] Revert "Rename" This reverts commit cbf7f843b2e99a54f332c4310008b35eac386ce9. --- .../nem/kidshift/data/retrofit/KidShiftApiService.java | 6 +++--- .../retrofit/model/converter/TaskModelConverter.java | 6 +++--- .../task/{TaskModRequest.java => TaskAddRequest.java} | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) rename data/src/main/java/one/nem/kidshift/data/retrofit/model/task/{TaskModRequest.java => TaskAddRequest.java} (85%) 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 a546393..3a9bd22 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 @@ -12,7 +12,7 @@ import one.nem.kidshift.data.retrofit.model.parent.ParentRenameRequest; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthRequest; import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse; import one.nem.kidshift.data.retrofit.model.task.HistoryListResponse; -import one.nem.kidshift.data.retrofit.model.task.TaskModRequest; +import one.nem.kidshift.data.retrofit.model.task.TaskAddRequest; import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.data.retrofit.model.task.TaskResponse; import retrofit2.Call; @@ -88,7 +88,7 @@ public interface KidShiftApiService { */ @POST("/task") @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) - Call addTask(@Body TaskModRequest request); + Call addTask(@Body TaskAddRequest request); /** * タスク更新 @@ -98,7 +98,7 @@ public interface KidShiftApiService { */ @PUT("/task/{id}") @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) - Call updateTask(@Body TaskModRequest request, @Path("id") String id); + Call updateTask(@Body TaskAddRequest request, @Path("id") String id); /** * タスク削除 diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/TaskModelConverter.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/TaskModelConverter.java index c19583a..9bd6a1e 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/TaskModelConverter.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/TaskModelConverter.java @@ -3,7 +3,7 @@ package one.nem.kidshift.data.retrofit.model.converter; import java.util.List; import java.util.stream.Collectors; -import one.nem.kidshift.data.retrofit.model.task.TaskModRequest; +import one.nem.kidshift.data.retrofit.model.task.TaskAddRequest; import one.nem.kidshift.data.retrofit.model.task.TaskListResponse; import one.nem.kidshift.data.retrofit.model.task.TaskResponse; import one.nem.kidshift.model.tasks.TaskItemModel; @@ -49,8 +49,8 @@ public class TaskModelConverter { return taskListResponse.getList().stream().map(TaskModelConverter::taskResponseToTaskItemModel).collect(Collectors.toList()); } - public static TaskModRequest taskItemModelToTaskAddRequest(TaskItemModel taskItemModel) { - TaskModRequest request = new TaskModRequest(); + public static TaskAddRequest taskItemModelToTaskAddRequest(TaskItemModel taskItemModel) { + TaskAddRequest request = new TaskAddRequest(); request.setName(taskItemModel.getName()); request.setReward(taskItemModel.getReward()); request.setBgColor(taskItemModel.getBgColor()); diff --git a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskModRequest.java b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java similarity index 85% rename from data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskModRequest.java rename to data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java index 60c5e8a..667f1bd 100644 --- a/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskModRequest.java +++ b/data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java @@ -2,7 +2,7 @@ package one.nem.kidshift.data.retrofit.model.task; import java.util.List; -public class TaskModRequest extends TaskBaseItem { +public class TaskAddRequest extends TaskBaseItem { private List attachedChildren; /** @@ -13,7 +13,7 @@ public class TaskModRequest extends TaskBaseItem { * @param reward 報酬 * @param attachedChildren アタッチされた子供IDリスト */ - public TaskModRequest(String name, String iconEmoji, String bgColor, int reward, List attachedChildren) { + public TaskAddRequest(String name, String iconEmoji, String bgColor, int reward, List attachedChildren) { super(name, iconEmoji, bgColor, reward); this.attachedChildren = attachedChildren; } @@ -24,7 +24,7 @@ public class TaskModRequest extends TaskBaseItem { * @param reward 報酬 * @param attachedChildren アタッチされた子供IDリスト */ - public TaskModRequest(String name, int reward, List attachedChildren) { + public TaskAddRequest(String name, int reward, List attachedChildren) { super(name, reward); this.attachedChildren = attachedChildren; } @@ -32,7 +32,7 @@ public class TaskModRequest extends TaskBaseItem { /** * コンストラクタ (空) */ - public TaskModRequest() { + public TaskAddRequest() { } /** @@ -40,7 +40,7 @@ public class TaskModRequest extends TaskBaseItem { * @param taskBaseItem タスクベースアイテム * @param attachedChildren アタッチされた子供IDリスト */ - public TaskModRequest(TaskBaseItem taskBaseItem, List attachedChildren) { + public TaskAddRequest(TaskBaseItem taskBaseItem, List attachedChildren) { super(taskBaseItem.getName(), taskBaseItem.getIconEmoji(), taskBaseItem.getBgColor(), taskBaseItem.getReward()); this.attachedChildren = attachedChildren; }