diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java index fc90081..8e9a2fd 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java @@ -108,7 +108,7 @@ private String confirmDate() { Date date = new Date(); - SimpleDateFormat f = new SimpleDateFormat("yy/MM/dd"); + SimpleDateFormat f = new SimpleDateFormat("yyyy/MM/dd"); String time = f.format(date); return time; diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java index 3345ac4..5f259a5 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java @@ -9,6 +9,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.Collection; @Component @@ -53,15 +54,12 @@ AccountManager am = AccountManager.getInstance(); Account account = am.getAccount(uid); - /* - (対象のアカウントインスタンスが) - 存在する場合:全投稿の情報を取得し、それらを返す - 存在しない場合:何も返さない - */ if (account != null) { return account.getPosts(); + } else { + var response = Response.status(Response.Status.NO_CONTENT); + response.status(404).entity("アカウントが存在しません"); + throw new WebApplicationException(response.build()); } - - return null; } } diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java index 8f06844..11f0628 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java @@ -6,6 +6,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; @Component @Path("/accounts") @@ -20,10 +21,12 @@ if (ac.getPw().equals(pw)) { ac = am.updateAccount(uid); + return ac; } else { System.out.println("Error : Miss match pw"); + var response = Response.status(Response.Status.NO_CONTENT); + response.status(401).entity("pwが違います"); + throw new WebApplicationException(response.build()); } - - return ac; } } diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/RequestedRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/RequestedRest.java index a4e5e80..4438b22 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/RequestedRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/RequestedRest.java @@ -51,7 +51,7 @@ fm.removeRequested(acFrom); fmFrom.removeRequesting(ac); fmFrom.removeRequested(ac); - }else{ + } else { var response = Response.status(Response.Status.NO_CONTENT); response.status(401).entity("認証に失敗しました"); throw new WebApplicationException(response.build()); diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java index cbea99a..d8dfb44 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java @@ -92,7 +92,7 @@ if(token.equals(acToken)) { fm.removeRequesting(acTo); fmTo.removeRequested(ac); - }else{ + } else { var response = Response.status(Response.Status.NO_CONTENT); response.status(401).entity("認証に失敗しました"); throw new WebApplicationException(response.build());