рефакторинг файлов, добавление тестов к LocalisationService.java

AlexanderBazarov · AlexanderBazarov · commit 601b97fcb42c · 2025-06-14T14:05:28.000+05:00
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/src/main/java/ru/untitled_devs/bot/Main.java b/src/main/java/ru/untitled_devs/bot/Main.java
@@ -5,7 +5,8 @@
 import org.apache.logging.log4j.Logger;
 import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
-import ru.untitled_devs.bot.start.StartRouter;
+import ru.untitled_devs.bot.config.Config;
+import ru.untitled_devs.bot.features.start.StartRouter;
 import ru.untitled_devs.core.client.Bot;
 import ru.untitled_devs.core.fsm.storage.InMemoryStorage;
 
diff --git a/src/main/java/ru/untitled_devs/bot/config/Config.java b/src/main/java/ru/untitled_devs/bot/config/Config.java
@@ -1,6 +1,6 @@
-package ru.untitled_devs.bot;
+package ru.untitled_devs.bot.config;
 
-public class Config {
+public final class Config {
     private String botToken;
     private String botName;
 
diff --git a/src/main/java/ru/untitled_devs/bot/features/registration/RegistraitonRouter.java b/src/main/java/ru/untitled_devs/bot/features/registration/RegistraitonRouter.java
@@ -1,13 +1,16 @@
-package ru.untitled_devs.bot.registration.routes;
+package ru.untitled_devs.bot.features.registration;
 import org.telegram.telegrambots.meta.api.objects.Message;
-import ru.untitled_devs.bot.registration.fsm.RegistrationStates;
+import ru.untitled_devs.bot.shared.localisation.LocalisationService;
+import ru.untitled_devs.bot.shared.localisation.MessageKey;
 import ru.untitled_devs.core.client.Bot;
 import ru.untitled_devs.core.fsm.context.FSMContext;
 import ru.untitled_devs.core.routers.Router;
 import ru.untitled_devs.core.routers.filters.Command;
 import ru.untitled_devs.core.routers.handlers.MessageHandler;
 
-public class RegistraitonRouter extends Router {
+import java.util.Locale;
+
+public final class RegistraitonRouter extends Router {
     private final Bot bot;
 
     public RegistraitonRouter(Bot bot) {
@@ -18,7 +21,10 @@ private void registerHandlers() {
         this.addHandler(RegistrationStates.START, new MessageHandler(this::startRegistration, new Command("start")));
     }
 
-    private void startRegistration(Message message, FSMContext ctx) {
+	Locale loc = Locale.forLanguageTag("ru-RU");
 
+    private void startRegistration(Message message, FSMContext ctx) {
+		bot.sendMessage(message.getChatId(),
+			LocalisationService.getMessage(MessageKey.WHATS_YOUR_NAME, loc));
     }
 }
diff --git a/src/main/java/ru/untitled_devs/bot/features/registration/RegistrationService.java b/src/main/java/ru/untitled_devs/bot/features/registration/RegistrationService.java
@@ -0,0 +1,16 @@
+package ru.untitled_devs.bot.features.registration;
+
+import dev.morphia.Datastore;
+
+public final class RegistrationService {
+	private final Datastore datastore;
+
+	public RegistrationService(Datastore datastore) {
+		this.datastore = datastore;
+	}
+
+	void registerUser() {
+		//TODO
+	}
+
+}
diff --git a/src/main/java/ru/untitled_devs/bot/features/registration/RegistrationStates.java b/src/main/java/ru/untitled_devs/bot/features/registration/RegistrationStates.java
@@ -1,9 +1,9 @@
-package ru.untitled_devs.bot.registration.fsm;
+package ru.untitled_devs.bot.features.registration;
 
 import ru.untitled_devs.core.fsm.states.State;
 import ru.untitled_devs.core.fsm.states.StatesGroup;
 
-public class RegistrationStates extends StatesGroup {
+public final class RegistrationStates extends StatesGroup {
     public static final State START = state();
     public static final State NAME = state();
     public static final State AGE = state();
diff --git a/src/main/java/ru/untitled_devs/bot/features/start/StartRouter.java b/src/main/java/ru/untitled_devs/bot/features/start/StartRouter.java
@@ -1,14 +1,18 @@
-package ru.untitled_devs.bot.start;
+package ru.untitled_devs.bot.features.start;
 
 import org.telegram.telegrambots.meta.api.objects.Message;
+import ru.untitled_devs.bot.shared.localisation.LocalisationService;
+import ru.untitled_devs.bot.shared.localisation.MessageKey;
 import ru.untitled_devs.core.client.Bot;
 import ru.untitled_devs.core.fsm.states.DefaultStates;
 import ru.untitled_devs.core.fsm.context.FSMContext;
 import ru.untitled_devs.core.routers.Router;
 import ru.untitled_devs.core.routers.filters.CommandStart;
 import ru.untitled_devs.core.routers.handlers.MessageHandler;
 
-public class StartRouter extends Router {
+import java.util.Locale;
+
+public final class StartRouter extends Router {
     private final Bot bot;
     public StartRouter(Bot bot) {
         this.bot = bot;
@@ -21,7 +25,11 @@ private void registerHandlers() {
                                     new CommandStart()));
     }
 
+	Locale loc = Locale.forLanguageTag("ru-RU");
     private void start(Message message, FSMContext ctx) {
         this.bot.sendMessage(message.getChatId(), "Привет! Это стратовое сообщение, лол!!!!");
+
+		bot.sendMessage(message.getChatId(),
+			LocalisationService.getMessage(MessageKey.NOT_REGISTERED, loc));
     }
 }
diff --git a/src/main/java/ru/untitled_devs/bot/features/start/StartStates.java b/src/main/java/ru/untitled_devs/bot/features/start/StartStates.java
@@ -0,0 +1,7 @@
+package ru.untitled_devs.bot.features.start;
+
+import ru.untitled_devs.core.fsm.states.StatesGroup;
+
+public final class StartStates extends StatesGroup {
+
+}
diff --git a/src/main/java/ru/untitled_devs/bot/models/Model.java b/src/main/java/ru/untitled_devs/bot/models/Model.java
diff --git a/src/main/java/ru/untitled_devs/bot/repositories/UserRepo.java b/src/main/java/ru/untitled_devs/bot/repositories/UserRepo.java
diff --git a/src/main/java/ru/untitled_devs/bot/shared/localisation/LocalisationService.java b/src/main/java/ru/untitled_devs/bot/shared/localisation/LocalisationService.java
@@ -0,0 +1,22 @@
+package ru.untitled_devs.bot.shared.localisation;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public  class LocalisationService {
+	private static final String BUNDLE_BASE = "messages.messages";
+
+	public static ResourceBundle bundle(Locale locale) {
+		return ResourceBundle.getBundle(BUNDLE_BASE, locale);
+	}
+
+	public static String getMessage(MessageKey key, Locale locale, Object... args) {
+		String pattern = bundle(locale).getString(key.key());
+		return pattern != null ? MessageFormat.format(pattern, args) : "???";
+	}
+
+	public static String getMessage(MessageKey key, Locale locale) {
+		return getMessage(key, locale, (Object[]) null);
+	}
+}
diff --git a/src/main/java/ru/untitled_devs/bot/shared/localisation/MessageKey.java b/src/main/java/ru/untitled_devs/bot/shared/localisation/MessageKey.java
@@ -0,0 +1,103 @@
+package ru.untitled_devs.bot.shared.localisation;
+
+
+public enum MessageKey {
+	NO_USERNAME("no_username"),
+	BANNED("banned"),
+	NOT_REGISTERED("not_registered"),
+	WHATS_YOUR_NAME("whats_your_name"),
+	LOW_AGE("low_age"),
+	AGE_ERROR("age_error"),
+	ASK_LOCATION("ask_location"),
+	ASK_DESCRIPTION("ask_description"),
+	ASK_PHOTO("ask_photo"),
+	PHOTO_REJECT("photo_reject"),
+	THANKS_FOR_PHOTO("thanks_for_photo"),
+	THANKS_FOR_VIDEO("thanks_for_video"),
+	TOO_BIG_PHOTO("too_big_photo"),
+
+	CREATE_PROFILE("create_profile"),
+	SUCCESSFUL_REGISTRATION("successful_registration"),
+	SUCCESSFUL_EDITED_PROFILE("successful_edited_profile"),
+	CREATE_ACCOUNT_AGAIN("create_account_again"),
+
+	MAIN_MENU("main_menu"),
+
+	FORMS_NOT_FOUND("forms_not_found"),
+	NO_FORMS("no_forms"),
+
+	LIKED("liked"),
+	YOU_HAVE_BEEN_LIKED("you_have_been_liked"),
+
+	GO_TO_PROFILE("go_to_profile"),
+	CANT_FIND_USER("cant_find_user"),
+
+	SEND_REPORT_TEXT("send_report_text"),
+	REPORT_SENT("report_sent"),
+
+	INCORRECT_INPUT("incorrect_input"),
+
+	CANT_SHOW_LIKE("cant_show_like"),
+	LIKE_LIST_CLEAN("like_list_clean"),
+
+	ENTER_NEW_NAME("enter_new_name"),
+	NAME_CHANGED("name_changed"),
+
+	ENTER_NEW_DESCRIPTION("enter_new_description"),
+	DESCRIPTION_CHANGED("description_changed"),
+
+	ENTER_NEW_AGE("enter_new_age"),
+	AGE_CHANGED("age_changed"),
+
+	ENTER_NEW_LOCATION("enter_new_location"),
+	LOCATION_CHANGED("location_changed"),
+
+	SEND_NEW_PHOTO("send_new_photo"),
+	REMOVED_PHOTO("removed_photo"),
+
+	ACCOUNT_REMOVED("account_removed"),
+	PRESS_START_FOR_REGISTRATION("press_start_for_registration"),
+
+	CHANGE_LANGUAGE("change_language"),
+
+	ADMIN_MESSAGE("admin_message"),
+	ADMIN_MODE_LEFT("admin_mode_left"),
+	NO_REPORTS("no_reports"),
+	CANT_SHOW_REPORT("cant_show_report"),
+	REPORT_LIST_CLEAR("report_list_clear"),
+
+	USER_REGISTERED_AS_ADMINISTRATOR("user_registered_as_administrator"),
+	ADMIN_REMOVED("admin_removed"),
+
+	USER_UNBANNED("user_unbanned"),
+	USER_BANNED("user_banned"),
+
+	USER_SHOWED("user_showed"),
+
+	MESSAGE_SENT_TO_ALL_USERS("message_sent_to_all_users"),
+
+	EDITING_CANCELED("editing_canceled"),
+
+	NO_LIKES("no_likes"),
+	LIKE_LIST("like_list"),
+
+	DISLIKE("dislike"),
+
+	CANT_UPDATE_PROFILE("cant_update_profile"),
+	UPDATE_DONE("update_done"),
+
+	YOUR_PROFILE("your_profile"),
+
+	TOO_BIG_DESCRIPTION("too_big_description"),
+	TOO_BIG_AGE("too_big_age"),
+
+	REPORT_SEND_CANCELLED("report_send_cancelled"),
+	INCORRECT_LOCATION_MESSAGE("incorrect_location_message"),
+
+	NICE_TO_MEET_YOU("nice_to_meet_you"),
+	SELECT_LANGUAGE("select_language");
+
+	private final String key;
+	MessageKey(String key) { this.key = key; }
+	public String key() { return key; }
+}
diff --git a/src/main/java/ru/untitled_devs/bot/shared/models/Model.java b/src/main/java/ru/untitled_devs/bot/shared/models/Model.java
@@ -0,0 +1,4 @@
+package ru.untitled_devs.bot.shared.models;
+
+public interface Model {
+}
diff --git a/src/main/java/ru/untitled_devs/bot/shared/models/Profile.java b/src/main/java/ru/untitled_devs/bot/shared/models/Profile.java
@@ -1,12 +1,12 @@
-package ru.untitled_devs.bot.models;
+package ru.untitled_devs.bot.shared.models;
 
 import com.mongodb.client.model.geojson.Point;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import org.bson.types.ObjectId;
 
 @Entity("Profiles")
-public class Profile implements Model {
+public final class Profile implements Model {
     @Id
     private ObjectId id;
 
diff --git a/src/main/java/ru/untitled_devs/bot/shared/models/User.java b/src/main/java/ru/untitled_devs/bot/shared/models/User.java
@@ -1,12 +1,12 @@
-package ru.untitled_devs.bot.models;
+package ru.untitled_devs.bot.shared.models;
 
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import dev.morphia.annotations.Reference;
 import org.bson.types.ObjectId;
 
 @Entity("Accounts")
-public class User implements Model{
+public final class User implements Model{
     @Id
     private ObjectId id;
 
diff --git a/src/main/java/ru/untitled_devs/bot/shared/repositories/BaseRepo.java b/src/main/java/ru/untitled_devs/bot/shared/repositories/BaseRepo.java
@@ -1,4 +1,4 @@
-package ru.untitled_devs.bot.repositories;
+package ru.untitled_devs.bot.shared.repositories;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/ru/untitled_devs/bot/shared/repositories/MongoRepo.java b/src/main/java/ru/untitled_devs/bot/shared/repositories/MongoRepo.java
@@ -1,4 +1,4 @@
-package ru.untitled_devs.bot.repositories;
+package ru.untitled_devs.bot.shared.repositories;
 
 import dev.morphia.Datastore;
 import dev.morphia.query.MorphiaCursor;
diff --git a/src/main/java/ru/untitled_devs/bot/shared/repositories/UserRepo.java b/src/main/java/ru/untitled_devs/bot/shared/repositories/UserRepo.java
@@ -0,0 +1,14 @@
+package ru.untitled_devs.bot.shared.repositories;
+
+import dev.morphia.Datastore;
+import ru.untitled_devs.bot.shared.models.User;
+
+public final class UserRepo extends MongoRepo<User>{
+    private final Datastore datastore;
+
+    public UserRepo(Datastore datastore) {
+		super(datastore, User.class);
+		this.datastore = datastore;
+    }
+
+}
diff --git a/src/main/java/ru/untitled_devs/bot/start/StartStates.java b/src/main/java/ru/untitled_devs/bot/start/StartStates.java
diff --git a/src/main/java/ru/untitled_devs/resources/messages/messages_en_US.properties b/src/main/java/ru/untitled_devs/resources/messages/messages_en_US.properties
diff --git a/src/main/java/ru/untitled_devs/resources/messages/messages_ru_RU.properties b/src/main/java/ru/untitled_devs/resources/messages/messages_ru_RU.properties
diff --git a/src/test/java/ru/untitleddevs/bot/shared/LocalisationServiceTest.java b/src/test/java/ru/untitleddevs/bot/shared/LocalisationServiceTest.java
