create github-actions.yml

.github/workflows/github-actions.yml

@@ -0,0 +1,27 @@
+name: Build project
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - *
+jobs:
+
+  Explore-GitHub-Actions:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Set up JDK 17 for x64
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'corretto'
+        architecture: x64
+
+
+    - name: Build & Test
+      run:
+        mvn -B clean package

Makefile

@@ -0,0 +1,6 @@
+mBuild:
+	mvn clean -Dmaven.test.skip  package -e
+run:
+	java -jar target/knowBot-1.0-SNAPSHOT-jar-with-dependencies.jar
+doc:
+	docker-compose up -d --build

docker-compose.yml

@@ -6,10 +6,10 @@ services:
       - SPRING_DATA_MONGODB_DATABASE=${SPRING_DATA_MONGODB_DATABASE}
       - SPRING_DATA_MONGODB_URI=${SPRING_DATA_MONGODB_URI}
 
-
   grafana:
     image: "grafana/grafana-enterprise:10.4.2"
     ports:
       - "3000:3000"
     depends_on:
-      - bot
+      - bot
+      - prometheus

src/main/java/org/example/QuizBotListener.java

@@ -38,18 +38,14 @@ public class QuizBotListener implements UpdatesListener {
   public QuizBotListener(TelegramBot bot, QuizService quizService) {
     this.bot = bot;
     this.quizService = quizService;
-    this.sessionCache = Cache2kBuilder.of(Long.class, QuizBotSession.class).expireAfterWrite(120, TimeUnit.SECONDS).addListener((CacheEntryExpiredListener<Long, QuizBotSession>) (cache, entry) -> {
-      clearLastMessageKeyboard(cache.get(entry.getKey()), entry.getKey());
-      sendMessage(entry.getKey(), "You've been thinking too long, so you'll have to start over." + " Write /start or /choice.");
-    }).addListener((CacheEntryCreatedListener<Long, QuizBotSession>) (cache, entry) -> sendMessage(entry.getKey(), UserBotConstants.STARTING_MESSAGE)).build();
-  }
-
-  private static String getQuizStatText(int quizAmount, int rightAnswerCounter) {
-    return String.format("❓ <b>Question number:</b> %d" + "\n\n" + "✅ <b>Right answers:</b> %d\\%d" + "\n\n" + "Input " + UserBotConstants.START_QUIZ_COMMAND + " to start quiz or chose quiz another quiz " + UserBotConstants.CHOOSE_TOPIC_COMMAND, quizAmount, rightAnswerCounter, quizAmount);
-  }
-
-  private static String getCanceledQuizStatText(int questionCount, int rightAnswerCounter) {
-    return String.format("❓<b>You canceled quiz</b>\n" + "\n" + "<b>The questions were:</b> %d\n\n" + "✅ <b>Right answers:</b> %d\\%d\n" + "\n" + "Input " + UserBotConstants.START_QUIZ_COMMAND + " to start quiz or chose quiz another quiz " + UserBotConstants.CHOOSE_TOPIC_COMMAND, questionCount, rightAnswerCounter, questionCount);
+    this.sessionCache = Cache2kBuilder.of(Long.class, QuizBotSession.class)
+            .expireAfterWrite(120, TimeUnit.SECONDS)
+            .addListener((CacheEntryExpiredListener<Long, QuizBotSession>) (cache, entry) -> {
+              clearLastMessageKeyboard(cache.get(entry.getKey()), entry.getKey());
+              sendMessage(entry.getKey(), "You've been thinking too long, so you'll have " +
+                                          "to start over." + " Write /start or /choice.");
+            })
+            .build();
   }
 
   @Override
@@ -101,6 +97,7 @@ public int process(List<Update> updates) throws NullPointerException {
       switch (messageText) {
         case UserBotConstants.START_BOT_COMMAND -> {
           clearLastMessageKeyboard(quizBotSession, userId);
+          sendMessage(userId, UserBotConstants.STARTING_MESSAGE);
           sessionCache.remove(userId);
           sessionCache.put(userId, new QuizBotSession(QuizBotSessionMode.SESSION_CREATED));
           return UpdatesListener.CONFIRMED_UPDATES_ALL;
@@ -129,6 +126,14 @@ public int process(List<Update> updates) throws NullPointerException {
     return UpdatesListener.CONFIRMED_UPDATES_ALL;
   }
 
+  private static String getQuizStatText(int quizAmount, int rightAnswerCounter) {
+    return String.format("❓ <b>Question number:</b> %d" + "\n\n" + "✅ <b>Right answers:</b> %d\\%d" + "\n\n" + "Input " + UserBotConstants.START_QUIZ_COMMAND + " to start quiz or chose quiz another quiz " + UserBotConstants.CHOOSE_TOPIC_COMMAND, quizAmount, rightAnswerCounter, quizAmount);
+  }
+
+  private static String getCanceledQuizStatText(int questionCount, int rightAnswerCounter) {
+    return String.format("❓<b>You canceled quiz</b>\n" + "\n" + "<b>The questions were:</b> %d\n\n" + "✅ <b>Right answers:</b> %d\\%d\n" + "\n" + "Input " + UserBotConstants.START_QUIZ_COMMAND + " to start quiz or chose quiz another quiz " + UserBotConstants.CHOOSE_TOPIC_COMMAND, questionCount, rightAnswerCounter, questionCount);
+  }
+
   private void setCountOfQuiz(String messageText, Long userId, QuizBotSession quizBotSession) {
     if (!messageText.matches("^[1-9][0-9]*$")) {
       sendMessage(userId, "Input a number or input " + UserBotConstants.CANCEL_COMMAND + " for cancel count of question choice");

src/main/java/org/example/configs/MongoDBConfig.java

@@ -71,7 +71,6 @@ public ChangeStreamIterable<Document> runEventListener(MongoTemplate mongoTempla
         }
         case "delete" -> quizService.updateTopics();
       }
-
     });
     return changeStream;
   }

src/main/java/org/example/model/PermanentUserInfo.java

@@ -8,9 +8,9 @@
 public class PermanentUserInfo {
   @Id
   @Field(name = "userId")
-  private Long userId;
+  private Long userId = 0L;
   @Field(name = "userName")
-  private String userName;
+  private String userName = "";
 
   public PermanentUserInfo() {
   }

src/main/java/org/example/model/Question.java

@@ -12,7 +12,7 @@
 public class Question {
   @Id
   @JsonIgnore
-  private ObjectId id;
+  private ObjectId id = new ObjectId();
   private String question = "";
   private String answerDescription = "";
   private List<QuestionOption> optionList = new ArrayList<>();

src/main/java/org/example/model/QuizBotSession.java

@@ -8,7 +8,7 @@ public class QuizBotSession {
   private UserQuizSession userQuizSession;
   private String currentTopicName = "";
   private int lastKeyboardBotMessageId = 0;
-  private String lastKeyboardBotMessageText;
+  private String lastKeyboardBotMessageText ="";
   private int countOfQuestion = 0;
 
   public QuizBotSession(QuizBotSessionMode botSessionMode) {

src/main/java/org/example/services/QuizService.java

@@ -33,7 +33,7 @@ public List<String> getTopics() {
     return topicsCache.get("topics");
   }
 
-  public synchronized void addTopic(String topicName){
+  public void addTopic(String topicName){
     lock.lock();
     try {
       List<String> topics = new ArrayList<>(topicsCache.get("topics"));

src/main/resources/log4j2.xml

@@ -8,7 +8,7 @@
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger - %msg%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="125 MB"/>
+                <SizeBasedTriggeringPolicy size="50 MB"/>
             </Policies>
         </RollingFile>
     </Appenders>
@@ -17,6 +17,5 @@
             <AppenderRef ref="RollingFile"/>
             <AppenderRef ref="console"/>
         </Root>
-        <Logger name="org.springframework.data.redis.core.RedisConnectionUtils" level="ERROR"/>
     </Loggers>
 </Configuration>

src/test/java/services/QuizServiceTest.java

@@ -0,0 +1,5 @@
+package services;
+
+public class QuizServiceTest {
+
+}

src/test/java/services/UsersService.java

@@ -0,0 +1,4 @@
+package services;
+
+public class UsersService {
+}