diff --git a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java index a1c3cb9..af74a0b 100644 --- a/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java +++ b/app/src/main/java/com/example/cosmosclient/services/NotificationDone.java @@ -1,7 +1,5 @@ package com.example.cosmosclient.services; -import android.os.Handler; - import com.example.cosmosclient.entities.AddRequestsResponse; import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.entities.Request; @@ -24,6 +22,10 @@ //interfaceから実装を取得 final GroupsRest requestsService = retrofit.create(GroupsRest.class); + public NotificationDone(){ + + } + public void onClick(Notification notification){ Group group = notification.getGroup(); @@ -33,21 +35,36 @@ if (request.getDeadline() != null) { deadline = String.format("%d-%02d-%02d %02d:%02d:%02d", request.getDeadline().getYear(), request.getDeadline().getMonth() + 1, request.getDeadline().getDate() + 1, 23, 59, 59); } - + final Call updateRequestCall = requestsService.updateRequest(group.getgId(), request.getrId(), request.getIssuer().getuId(), request.getProduct(), deadline, request.getLocation(), true, "token"); + Response response; try { - final Call updateRequestCall = requestsService.updateRequest(group.getgId(), request.getrId(), request.getIssuer().getuId(), request.getProduct(), deadline, request.getLocation(), true, "token"); - Response response = updateRequestCall.execute(); - if (!response.isSuccessful()) { + response = updateRequestCall.execute(); + if (response.isSuccessful()) { + AddRequestsResponse result = response.body(); +// Toast.makeText(RequestListActivity.this, "RequestListを達成しました", Toast.LENGTH_SHORT).show(); +// requestList.removeRequests(selectedRequestList); +// handler.post(new Runnable() { +// @Override +// public void run() { +// ResetRequestListTable(); +// AddRequestListTable(requestList); +// } +// }); + } else { // onFailure try { System.out.println(response.errorBody().string()); } catch (IOException e) { e.printStackTrace(); } + + //onFailureでキャッチできないエラーの処理 +// Toast.makeText(RequestListActivity.this, "通信エラー", Toast.LENGTH_SHORT).show(); } } catch (IOException e) { e.printStackTrace(); +// Toast.makeText(RequestListActivity.this, "RequestListの達成失敗しました", Toast.LENGTH_SHORT).show(); + } } - } diff --git a/app/src/test/java/com/example/cosmosclient/NotificationDoneTestMain.java b/app/src/test/java/com/example/cosmosclient/NotificationDoneTestMain.java new file mode 100644 index 0000000..86871a5 --- /dev/null +++ b/app/src/test/java/com/example/cosmosclient/NotificationDoneTestMain.java @@ -0,0 +1,28 @@ +package com.example.cosmosclient; + +import com.example.cosmosclient.entities.Feature; +import com.example.cosmosclient.entities.Group; +import com.example.cosmosclient.entities.Request; +import com.example.cosmosclient.entities.UserJsonforRequests; +import com.example.cosmosclient.services.Notification; +import com.example.cosmosclient.services.NotificationDone; + +import java.util.Date; +import java.util.List; + +public class NotificationDoneTestMain { + public static void main(String[] args) { + NotificationDone notificationDone = new NotificationDone(); + //以下の変数だけは必要 + String rid = "432fde44-a965-4d1b-a83c-a28153925644"; + String rUri = "http://nitta-lab-www.is.konan-u.ac.jp/cosmos/rset/groups/c824b232-2ee3-448d-97b7-eabf8ce1ffca/requests/432fde44-a965-4d1b-a83c-a28153925644"; + String product = "notificaion!!!!"; + int location = 205002; + String gid = "c824b232-2ee3-448d-97b7-eabf8ce1ffca"; + String issuerUid = "5dc6ca32-8fb9-4e2e-a8bc-6ea062a27465"; + + Notification notification = new Notification(new Request(rid, rUri, product, new Date(), new Date(), location, "name", false), new Group(gid, "uri", "name", "uId"), null); + notification.getRequest().setIssuer(new UserJsonforRequests("name", issuerUid, "uri", "iconUri")); + notificationDone.onClick(notification); + } +} \ No newline at end of file