diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java index a640ab3..b73d929 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -50,11 +50,10 @@ } public static User createUser(String name, String pw, String iconImage) { - String uId = "1234"; + String uId = getInstance().createUId(); String uri = baseURI + AppName +"/users/" +uId; - Session session = sessionFactory.openSession(); - session.beginTransaction(); + Session session = SessionManager.getInstance().getSession(); createToken(uId); User testUser = new User(name, uId, uri, iconImage);//名前、uId、ユーザーuri、パスワード、アイコンイメージを保存 session.save(testUser); @@ -64,15 +63,11 @@ for ( User user : (List) userResult ) { System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName()); }*/ - session.getTransaction().commit(); - session.close(); - return testUser; } public static User setUser(String uId, String name, String pw, String iconImage) { - Session session = sessionFactory.openSession(); - session.beginTransaction(); + Session session = SessionManager.getInstance().getSession(); List usersList = session.createQuery( "from User" ).list(); for ( User user : (List) usersList ) { if (user.getuId().equals(uId)) { @@ -85,15 +80,12 @@ } } User findUser = (User) session.load(User.class, uId); - session.getTransaction().commit(); - session.close(); return findUser; } public static User getUserById(String uId) { //与えられたuIdのUser情報を返す - Session session = sessionFactory.openSession(); - session.beginTransaction(); + Session session = SessionManager.getInstance().getSession(); List usersList = session.createQuery( "from User" ).list(); //uIdを比較し、一致した場合はNameとiconUriを返す。一致しない場合はbreak for ( User user : (List) usersList ) { @@ -105,8 +97,6 @@ break; } } - session.getTransaction().commit(); - session.close(); //一致しない場合は返す必要がないのでnull return null; } @@ -118,16 +108,12 @@ } public static DeleteResult deleteUser(String uId) { - Session session = sessionFactory.openSession(); - session = sessionFactory.openSession(); - session.beginTransaction(); + Session session = SessionManager.getInstance().getSession(); Request deleteRequest = (Request) session.load(Request.class, uId); if(deleteRequest != null){ session.delete(deleteRequest); System.out.println("massage: Already Deleted"); } - session.getTransaction().commit(); - session.close(); return DeleteResult.SUCCESS; } @@ -135,7 +121,6 @@ if(checkPassword(uId,pw)) { Token testtoken = getInstance().createToken(uId); //tokenを作成後値を返す -// System.out.println("true"); return testtoken;//testToken }else{ return null; @@ -143,8 +128,7 @@ } public static DeleteResult logout(String uId,String token) { - Session session = sessionFactory.openSession(); - session.beginTransaction(); + Session session = SessionManager.getInstance().getSession(); List usersList = session.createQuery( "from logout" ).list(); for ( User user : (List) usersList ) { if (user.getuId().equals(uId)) {