kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

Revert "Rename"

Browse Source 
This reverts commit cbf7f843b2.
This commit is contained in:
ろむねこ 2024-07-23 12:44:08 +09:00
parent cbf7f843b2
commit 1ae8335a4a
Signed by: Fujimatsu
GPG Key ID: FA1F39A1BA37D168
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/src/main/java/one/nem/kidshift/data/retrofit/KidShiftApiService.java
View File

@ -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.ParentAuthRequest;
import one.nem.kidshift.data.retrofit.model.parent.auth.ParentAuthResponse; 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.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.TaskListResponse;
import one.nem.kidshift.data.retrofit.model.task.TaskResponse; import one.nem.kidshift.data.retrofit.model.task.TaskResponse;
import retrofit2.Call; import retrofit2.Call;
@ -88,7 +88,7 @@ public interface KidShiftApiService {
*/ */
@POST("/task") @POST("/task")
@Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
Call<TaskResponse> addTask(@Body TaskModRequest request); Call<TaskResponse> addTask(@Body TaskAddRequest request);
/** /**
* タスク更新 * タスク更新
@ -98,7 +98,7 @@ public interface KidShiftApiService {
*/ */
@PUT("/task/{id}") @PUT("/task/{id}")
@Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER) @Headers(AuthorizationInterceptor.HEADER_PLACEHOLDER)
Call<TaskResponse> updateTask(@Body TaskModRequest request, @Path("id") String id); Call<TaskResponse> updateTask(@Body TaskAddRequest request, @Path("id") String id);
/** /**
* タスク削除 * タスク削除

6
data/src/main/java/one/nem/kidshift/data/retrofit/model/converter/TaskModelConverter.java
View File

@ -3,7 +3,7 @@ package one.nem.kidshift.data.retrofit.model.converter;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; 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.TaskListResponse;
import one.nem.kidshift.data.retrofit.model.task.TaskResponse; import one.nem.kidshift.data.retrofit.model.task.TaskResponse;
import one.nem.kidshift.model.tasks.TaskItemModel; import one.nem.kidshift.model.tasks.TaskItemModel;
@ -49,8 +49,8 @@ public class TaskModelConverter {
return taskListResponse.getList().stream().map(TaskModelConverter::taskResponseToTaskItemModel).collect(Collectors.toList()); return taskListResponse.getList().stream().map(TaskModelConverter::taskResponseToTaskItemModel).collect(Collectors.toList());
} }
public static TaskModRequest taskItemModelToTaskAddRequest(TaskItemModel taskItemModel) { public static TaskAddRequest taskItemModelToTaskAddRequest(TaskItemModel taskItemModel) {
TaskModRequest request = new TaskModRequest(); TaskAddRequest request = new TaskAddRequest();
request.setName(taskItemModel.getName()); request.setName(taskItemModel.getName());
request.setReward(taskItemModel.getReward()); request.setReward(taskItemModel.getReward());
request.setBgColor(taskItemModel.getBgColor()); request.setBgColor(taskItemModel.getBgColor());

10
data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskModRequest.java → data/src/main/java/one/nem/kidshift/data/retrofit/model/task/TaskAddRequest.java
View File

@ -2,7 +2,7 @@ package one.nem.kidshift.data.retrofit.model.task;
import java.util.List; import java.util.List;
public class TaskModRequest extends TaskBaseItem { public class TaskAddRequest extends TaskBaseItem {
private List<String> attachedChildren; private List<String> attachedChildren;
/** /**
@ -13,7 +13,7 @@ public class TaskModRequest extends TaskBaseItem {
* @param reward 報酬 * @param reward 報酬
* @param attachedChildren アタッチされた子供IDリスト * @param attachedChildren アタッチされた子供IDリスト
*/ */
public TaskModRequest(String name, String iconEmoji, String bgColor, int reward, List<String> attachedChildren) { public TaskAddRequest(String name, String iconEmoji, String bgColor, int reward, List<String> attachedChildren) {
super(name, iconEmoji, bgColor, reward); super(name, iconEmoji, bgColor, reward);
this.attachedChildren = attachedChildren; this.attachedChildren = attachedChildren;
} }
@ -24,7 +24,7 @@ public class TaskModRequest extends TaskBaseItem {
* @param reward 報酬 * @param reward 報酬
* @param attachedChildren アタッチされた子供IDリスト * @param attachedChildren アタッチされた子供IDリスト
*/ */
public TaskModRequest(String name, int reward, List<String> attachedChildren) { public TaskAddRequest(String name, int reward, List<String> attachedChildren) {
super(name, reward); super(name, reward);
this.attachedChildren = attachedChildren; 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 taskBaseItem タスクベースアイテム
* @param attachedChildren アタッチされた子供IDリスト * @param attachedChildren アタッチされた子供IDリスト
*/ */
public TaskModRequest(TaskBaseItem taskBaseItem, List<String> attachedChildren) { public TaskAddRequest(TaskBaseItem taskBaseItem, List<String> attachedChildren) {
super(taskBaseItem.getName(), taskBaseItem.getIconEmoji(), taskBaseItem.getBgColor(), taskBaseItem.getReward()); super(taskBaseItem.getName(), taskBaseItem.getIconEmoji(), taskBaseItem.getBgColor(), taskBaseItem.getReward());
this.attachedChildren = attachedChildren; this.attachedChildren = attachedChildren;
} }