diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index 5be7d51..467956d 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -26,7 +26,7 @@ public Account createAcount(String userID, String userName, String userPass) { System.out.println(userName); - if(!idSet.add(userID)) { + if (!idSet.add(userID)) { return null; } Account newAccount = new Account(userName, userPass); @@ -36,39 +36,49 @@ return newAccount; } - public Account getAccount(String userID) { - if(idSet.contains(userID)) { - Account editAccount = accounts.get(userID); - return editAccount; - }else { + public Account updateAccount(String userID, String userName, String userPass) { + if (idSet.contains(userID)) { + Accounts.getInstance().getAccount(userID).setName(userName); + Accounts.getInstance().getAccount(userID).setPass(userPass); + return Accounts.getInstance().getAccount(userID); + } else { return null; } } - public Account loginAccount(String userID,String userPass) { - if(idSet.contains(userID) && getAccount(userID).getPass().equals(userPass)) { - Accounts.getInstance().getAccount(userID).setLogin(true); - return getAccount(userID); - }else { + public Account getAccount(String userID) { + if (idSet.contains(userID)) { + Account editAccount = accounts.get(userID); + return editAccount; + } else { return null; } } - + + public Account loginAccount(String userID, String userPass) { + if (idSet.contains(userID) && getAccount(userID).getPass().equals(userPass)) { + Accounts.getInstance().getAccount(userID).setLogin(true); + return getAccount(userID); + } else { + return null; + } + } + public String logoutAccount(String userID) { - if(idSet.contains(userID)) { + if (idSet.contains(userID)) { Accounts.getInstance().getAccount(userID).setLogin(false); return "success"; - }else { + } else { return "null"; } } - + public String deleteAccount(String userID) { - if(idSet.contains(userID)) { + if (idSet.contains(userID)) { accounts.remove(userID); idSet.remove(userID); return "complated remove account"; - }else { + } else { return "not exist"; } } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 901f752..e3b5d2b 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -14,7 +14,7 @@ public Account loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) { return Accounts.getInstance().loginAccount(userID, userPass); } - + @POST @Path("/logout") @Produces(MediaType.TEXT_PLAIN) @@ -29,12 +29,22 @@ @FormParam("userPass") String userPass) { return Accounts.getInstance().createAcount(userID, userName, userPass); } + + @PUT + @Path("/updateAccount") + @Produces(MediaType.APPLICATION_JSON) + public Account updateAccount(@FormParam("userID") String userID, @FormParam("userName") String userName, + @FormParam("userPass") String userPass) { + return Accounts.getInstance().updateAccount(userID, userName, userPass); + } + @GET @Path("/{userID}") @Produces(MediaType.APPLICATION_JSON) public Account getAccount(@PathParam("userID") String userID) { return Accounts.getInstance().getAccount(userID); } + @DELETE @Path("/deleteAccount") @Produces(MediaType.TEXT_PLAIN)