From c0ee1f8ffe14df59ad67438560c5af8042266a24 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Sun, 29 Sep 2024 19:33:20 +0200
Subject: [PATCH] Encapsulate account creation in AccountService

---
 .../handlers/login/LoginPasswordHandler.java  | 33 +------------------
 src/main/java/service/AccountService.java     | 25 +++++++++++++-
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
index dc43953a5e..fe4bfa41dc 100644
--- a/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
+++ b/src/main/java/net/server/handlers/login/LoginPasswordHandler.java
@@ -23,7 +23,6 @@ package net.server.handlers.login;
 
 import client.Character;
 import client.Client;
-import client.DefaultDates;
 import client.LoginState;
 import config.YamlConfig;
 import constants.game.GameConstants;
@@ -39,15 +38,9 @@ import org.slf4j.LoggerFactory;
 import service.AccountService;
 import service.TransitionService;
 import tools.BCrypt;
-import tools.DatabaseConnection;
 import tools.HexTool;
 import tools.PacketCreator;
 
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -91,7 +84,7 @@ public final class LoginPasswordHandler implements PacketHandler {
         Optional<Account> foundAccount = accountService.getAccount(login);
         if (foundAccount.isEmpty()) {
             if (YamlConfig.config.server.AUTOMATIC_REGISTER) {
-                Account newAccount = createAccount(login, pwd);
+                Account newAccount = accountService.createAccount(login, pwd);
                 foundAccount = Optional.of(newAccount);
             } else {
                 c.sendPacket(PacketCreator.getLoginFailed(5));
@@ -149,30 +142,6 @@ public final class LoginPasswordHandler implements PacketHandler {
         Server.getInstance().registerLoginState(c);
     }
 
-    private Account createAccount(String name, String password) {
-        Account account = createAccountPostgres(name, password);
-        createAccountMysql(account.id(), name, password);
-        return account;
-    }
-
-    private Account createAccountPostgres(String name, String password) {
-        return accountService.createNew(name, password);
-    }
-
-    private void createAccountMysql(int id, String name, String password) {
-        try (Connection con = DatabaseConnection.getConnection();
-             PreparedStatement ps = con.prepareStatement("INSERT INTO accounts (id, name, password, birthday, tempban) VALUES (?, ?, ?, ?, ?);")) {
-            ps.setInt(1, id);
-            ps.setString(2, name);
-            ps.setString(3, BCrypt.hashpw(password, BCrypt.gensalt()));
-            ps.setDate(4, Date.valueOf(DefaultDates.getBirthday()));
-            ps.setTimestamp(5, Timestamp.valueOf(DefaultDates.getTempban()));
-            ps.executeUpdate();
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     private boolean correctPassword(String input, Account account) {
         return BCrypt.checkpw(input, account.password());
     }
diff --git a/src/main/java/service/AccountService.java b/src/main/java/service/AccountService.java
index c73c5ac74f..732cc7db00 100644
--- a/src/main/java/service/AccountService.java
+++ b/src/main/java/service/AccountService.java
@@ -1,6 +1,7 @@
 package service;
 
 import client.Client;
+import client.DefaultDates;
 import client.LoginState;
 import database.account.Account;
 import database.account.AccountRepository;
@@ -11,9 +12,11 @@ import tools.BCrypt;
 import tools.DatabaseConnection;
 
 import java.sql.Connection;
+import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -33,7 +36,13 @@ public class AccountService {
         this.accountRepository = accountRepository;
     }
 
-    public Account createNew(String name, String password) {
+    public Account createAccount(String name, String password) {
+        Account account = createAccountPostgres(name, password);
+        createAccountMysql(account.id(), name, password);
+        return account;
+    }
+
+    private Account createAccountPostgres(String name, String password) {
         Account newAccount = Account.builder()
                 .name(name)
                 .password(hashPassword(password))
@@ -55,6 +64,20 @@ public class AccountService {
                 .orElseThrow(() -> new RuntimeException("Failed to get account after insert, id: " + accountId));
     }
 
+    private void createAccountMysql(int id, String name, String password) {
+        try (Connection con = DatabaseConnection.getConnection();
+             PreparedStatement ps = con.prepareStatement("INSERT INTO accounts (id, name, password, birthday, tempban) VALUES (?, ?, ?, ?, ?);")) {
+            ps.setInt(1, id);
+            ps.setString(2, name);
+            ps.setString(3, BCrypt.hashpw(password, BCrypt.gensalt()));
+            ps.setDate(4, Date.valueOf(DefaultDates.getBirthday()));
+            ps.setTimestamp(5, Timestamp.valueOf(DefaultDates.getTempban()));
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private String hashPassword(String password) {
         return BCrypt.hashpw(password, BCrypt.gensalt());
     }