From 33957252653cf1f3ea24c869a49ab004ba0a9dde Mon Sep 17 00:00:00 2001
From: ScarletRedMan <terentev.andrey.2002@gmail.com>
Date: Sat, 16 Mar 2024 20:35:09 +0700
Subject: [PATCH] Fixed all tests

---
 .../picker/repository/impl/container/NodeContainer.java       | 1 +
 .../java/ru/dragonestia/picker/picker/LeastPickedTests.java   | 4 +++-
 .../ru/dragonestia/picker/picker/SequentialFillingTests.java  | 4 +++-
 settings.gradle                                               | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java
index e436b90..76716a2 100644
--- a/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java
+++ b/server/src/main/java/ru/dragonestia/picker/repository/impl/container/NodeContainer.java
@@ -95,6 +95,7 @@ public class NodeContainer {
     public @NotNull Room pick(@NotNull Set<User> users) {
         synchronized (picker) {
             var room = picker.pick(users);
+            room.addUsers(users, false);
             transactionListener.accept(new UserTransaction(room.getRoom(), users));
             return room.getRoom();
         }
diff --git a/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java b/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
index 3256668..bbdbca6 100644
--- a/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
+++ b/server/src/test/java/ru/dragonestia/picker/picker/LeastPickedTests.java
@@ -41,12 +41,14 @@ public class LeastPickedTests {
     @ParameterizedTest
     @ArgumentsSource(PickingArgumentProvider.class)
     void testPicking(String expectedRoomId, int usersAmount) {
+        var expectedRoomUsers = userRepository.usersOf(roomRepository.find(node, expectedRoomId).orElseThrow()).size();
+
         var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount));
         var slots = room.getMaxSlots();
         var users = userRepository.usersOf(room);
         Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation
 
-        System.out.printf("Room(%s) has %s/%s users. Expected: %s, added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, usersAmount);
+        System.out.printf("Room(%s) has %s/%s users. Expected: %s(%s), added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, expectedRoomUsers, usersAmount);
         Assertions.assertEquals(expectedRoomId, room.getIdentifier());
     }
 
diff --git a/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java b/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
index 9ece42d..4dde327 100644
--- a/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
+++ b/server/src/test/java/ru/dragonestia/picker/picker/SequentialFillingTests.java
@@ -41,12 +41,14 @@ public class SequentialFillingTests {
     @ParameterizedTest
     @ArgumentsSource(PickingArgumentProvider.class)
     void testPicking(String expectedRoomId, int usersAmount) {
+        var expectedRoomUsers = userRepository.usersOf(roomRepository.find(node, expectedRoomId).orElseThrow()).size();
+
         var room = roomRepository.pick(node, userFiller.createRandomUsers(usersAmount));
         var slots = room.getMaxSlots();
         var users = userRepository.usersOf(room);
         Assertions.assertTrue(slots == -1 || slots >= users.size()); // check slots limitation
 
-        System.out.printf("Room(%s) has %s/%s users. Expected: %s, added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, usersAmount);
+        System.out.printf("Room(%s) has %s/%s users. Expected: %s(%s), added: %s%n", room.getIdentifier(), users.size(), slots, expectedRoomId, expectedRoomUsers, usersAmount);
         Assertions.assertEquals(expectedRoomId, room.getIdentifier());
     }
 
diff --git a/settings.gradle b/settings.gradle
index 0762c33..0c75b03 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,4 +4,5 @@ include 'server'
 include 'control-panel'
 include 'client-api'
 include 'client-impl'
+include 'noiser'