Добавил новые классы для работы с геокодированием, обновил конфигурацию и улучшил обработку состояний в регистрации

Author: AlexanderBazarov

.gitignore

@@ -35,4 +35,6 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+dev.env

pom.xml

@@ -83,14 +83,14 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-sync</artifactId>
-            <version>3.9.1</version>
+            <version>4.11.2</version>
         </dependency>
         <dependency>
             <groupId>dev.morphia.morphia</groupId>
             <artifactId>morphia-core</artifactId>
-            <version>2.4.14</version>
+            <version>2.5.0</version>
         </dependency>
     </dependencies>
 
 
-</project>
+</project>

src/main/java/ru/untitled_devs/bot/Main.java

@@ -1,27 +1,44 @@
 package ru.untitled_devs.bot;
 
 
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
 import ru.untitled_devs.bot.config.Config;
+import ru.untitled_devs.bot.features.registration.RegistrationRouter;
+import ru.untitled_devs.bot.features.registration.middlewares.LoginMiddleware;
 import ru.untitled_devs.bot.features.start.StartRouter;
-import ru.untitled_devs.core.client.Bot;
+import ru.untitled_devs.bot.shared.geocoder.Geocoder;
+import ru.untitled_devs.bot.shared.geocoder.yandex.YandexGeocoder;
+import ru.untitled_devs.core.client.PollingClient;
 import ru.untitled_devs.core.fsm.storage.InMemoryStorage;
 
 public class Main {
-    static Config config = new Config();
     static InMemoryStorage storage = new InMemoryStorage();
     protected static final Logger logger = LogManager.getLogger();
+	private static final Geocoder geocoder =
+		new YandexGeocoder(Config.getGeocodingConfig().getApiUrl(),
+			Config.getGeocodingConfig().getApiKey());
 
 
     public static void main(String[] args) {
         try {
+			MongoClient client = MongoClients.create(Config.getMongoConfig().getMongoString());
+			Datastore datastore = Morphia.createDatastore(client, Config.getMongoConfig().getMongoDBName());
+
             TelegramBotsApi botsApi = new TelegramBotsApi(DefaultBotSession.class);
-            Bot bot = new Bot(config.getBotToken(), config.getBotName(), storage,logger);
+            PollingClient bot = new PollingClient(Config.getBotConfig().getBotToken(),
+				Config.getBotConfig().getBotName(), storage,logger);
+
+			bot.addMiddleware(new LoginMiddleware());
 
             bot.addRouter(new StartRouter(bot));
+			bot.addRouter(new RegistrationRouter(bot, datastore, geocoder));
 
             botsApi.registerBot(bot);
         } catch (Exception e) {

src/main/java/ru/untitled_devs/bot/config/BotConfig.java

@@ -0,0 +1,21 @@
+package ru.untitled_devs.bot.config;
+
+public final class BotConfig {
+	private String botToken;
+	private String botName;
+
+	public BotConfig (){loadVariables();}
+
+	private void loadVariables() {
+		botToken = System.getenv("BOT_TOKEN");
+		botName = System.getenv("BOT_NAME");
+	}
+
+	public String getBotToken() {
+		return botToken;
+	}
+
+	public String getBotName() {
+		return botName;
+	}
+}

src/main/java/ru/untitled_devs/bot/config/Config.java

@@ -1,23 +1,21 @@
 package ru.untitled_devs.bot.config;
 
-public final class Config {
-    private String botToken;
-    private String botName;
+import java.util.Objects;
 
-    public Config() {
-        loadVariables();
-    }
+public final class Config {
+	private static BotConfig botConfig = new BotConfig();
+	private static MongoConfig mongoConfig = new MongoConfig();
+	private static GeocodingConfig geocodingConfig = new GeocodingConfig();
 
-    private void loadVariables() {
-        this.botToken = System.getenv("BOT_TOKEN");
-        this.botName = System.getenv("BOT_NAME");
-    }
+	public static BotConfig getBotConfig() {
+		return botConfig;
+	}
 
-    public String getBotToken() {
-        return this.botToken;
-    }
+	public static MongoConfig getMongoConfig() {
+		return mongoConfig;
+	}
 
-    public String getBotName() {
-        return this.botName;
-    }
+	public static GeocodingConfig getGeocodingConfig() {
+		return geocodingConfig;
+	}
 }

src/main/java/ru/untitled_devs/bot/config/GeocodingConfig.java

@@ -0,0 +1,23 @@
+package ru.untitled_devs.bot.config;
+
+public final class GeocodingConfig {
+	private String apiUrl;
+	private String apiKey;
+
+	public GeocodingConfig() {
+		loadVariables();
+	}
+
+	private void loadVariables() {
+		apiUrl = System.getenv("YANDEX_API_URL");
+		apiKey = System.getenv("YANDEX_API_KEY");
+	}
+
+	public String getApiUrl() {
+		return apiUrl;
+	}
+
+	public String getApiKey() {
+		return apiKey;
+	}
+}

src/main/java/ru/untitled_devs/bot/config/MongoConfig.java

@@ -0,0 +1,50 @@
+package ru.untitled_devs.bot.config;
+
+import java.util.Objects;
+
+public final class MongoConfig {
+	private String mongoHost;
+	private int mongoPort;
+	private String mongoUser;
+	private String mongoPass;
+	private String mongoDBName;
+	private boolean mongoDirectConnection;
+
+	public MongoConfig() {
+		loadVariables();
+	}
+
+	private void loadVariables() {
+		mongoHost = System.getenv("MONGO_HOST");
+		mongoPort = Integer.parseInt(System.getenv("MONGO_PORT"));
+		mongoUser = System.getenv("MONGO_USER");
+		mongoPass = System.getenv("MONGO_PASS");
+		mongoDBName = System.getenv("MONGO_DBNAME");
+		mongoDirectConnection = Objects.equals(System.getenv("MONGO_DIRECT_CONNECTION"), "true");
+	}
+
+	public String getMongoHost() {
+		return mongoHost;
+	}
+
+	public int getMongoPort() {
+		return mongoPort;
+	}
+
+	public String getMongoUser() {
+		return mongoUser;
+	}
+
+	public String getMongoPass() {
+		return mongoPass;
+	}
+
+	public String getMongoDBName() {
+		return mongoDBName;
+	}
+
+	public String getMongoString() {
+		return String.format("mongodb://%s:%s@%s:%d/?directConnection=%s",
+			mongoUser, mongoPass, mongoHost, mongoPort, mongoDirectConnection ? "true" : "false");
+	}
+}