feat: #81 #102 Move NonStandardDictionaryType to kg-common and co…

…nvert it to Kotlin.
kghackers · Nov 25, 2024 · 8239c58 · 8239c58
1 parent 607cd33
commit 8239c58
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 44 deletions.
diff --git a/kgCommon/src/main/kotlin/ru/klavogonki/common/DictionaryMode.kt b/kgCommon/src/main/kotlin/ru/klavogonki/common/DictionaryMode.kt
@@ -7,7 +7,7 @@ enum class DictionaryMode(
     /**
      * Имя в API клавогонок. Все буквы в нижнем регистре.
      */
-    @JvmField val klavogonkiName: String,
+    @JvmField val klavogonkiName: String
 ) {
     normal("normal"),
 

diff --git a/kgCommon/src/main/kotlin/ru/klavogonki/common/NonStandardDictionaryType.kt b/kgCommon/src/main/kotlin/ru/klavogonki/common/NonStandardDictionaryType.kt
@@ -0,0 +1,41 @@
+package ru.klavogonki.common
+
+/**
+ * Тип нестандартного словаря.
+ */
+enum class NonStandardDictionaryType(
+    /**
+     * Имя в API клавогонок. Все буквы в нижнем регистре.
+     */
+    @JvmField val klavogonkiName: String
+) {
+    /**
+     * Слова.
+     */
+    words("words"),
+
+    /**
+     * Фразы.
+     */
+    phrases("phrases"),
+
+    /**
+     * Тексты.
+     */
+    texts("texts"),
+
+    /**
+     * URL.
+     */
+    url("url"),
+
+    /**
+     * Книга.
+     */
+    book("book"),
+
+    /**
+     * Генератор.
+     */
+    generator("generator"),
+}
diff --git a/kgparserSrv/src/main/java/ru/klavogonki/kgparser/NonStandardDictionaryType.java b/kgparserSrv/src/main/java/ru/klavogonki/kgparser/NonStandardDictionaryType.java
diff --git a/kgstatsSrv/src/main/java/ru/klavogonki/statistics/entity/PlayerVocabularyStatsEntity.java b/kgstatsSrv/src/main/java/ru/klavogonki/statistics/entity/PlayerVocabularyStatsEntity.java
@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import ru.klavogonki.common.DictionaryMode;
-import ru.klavogonki.kgparser.NonStandardDictionaryType;
+import ru.klavogonki.common.NonStandardDictionaryType;
 
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -49,7 +49,7 @@ public class PlayerVocabularyStatsEntity implements Serializable {
 
     private String vocabularyName;
 
-    @Enumerated(EnumType.STRING)
+    @Enumerated(EnumType.STRING) // todo: save using the klavogonikiName field, NOT the enum itself (to save compatibility with the old databases)
     private NonStandardDictionaryType vocabularyType;
 
     private Integer vocabularySymbols; // for non-standard dictionaries only
@@ -67,7 +67,7 @@ public class PlayerVocabularyStatsEntity implements Serializable {
      *
      * @see DictionaryMode#getDictionaryMode
      */
-    @Enumerated(EnumType.STRING) // todo: save using the klavogonikiName field, NOT the enum itself
+    @Enumerated(EnumType.STRING) // todo: save using the klavogonikiName field, NOT the enum itself (to save compatibility with the old databases)
     private DictionaryMode vocabularyMode;
 
     /**

diff --git a/kgstatsSrv/src/main/java/ru/klavogonki/statistics/mapper/PlayerVocabularyStatsMapper.java b/kgstatsSrv/src/main/java/ru/klavogonki/statistics/mapper/PlayerVocabularyStatsMapper.java
@@ -8,7 +8,7 @@
 import org.mapstruct.ValueMapping;
 import org.mapstruct.ValueMappings;
 import ru.klavogonki.common.DictionaryMode;
-import ru.klavogonki.kgparser.NonStandardDictionaryType;
+import ru.klavogonki.common.NonStandardDictionaryType;
 import ru.klavogonki.openapi.model.GetStatsOverviewGameType;
 import ru.klavogonki.openapi.model.GetStatsOverviewResponse;
 import ru.klavogonki.openapi.model.NonStandardVocabularyType;