Классы сортировки, заполнения коллекций и пользовательский интерфейс соединены между собой

paledmi-java · paledmi-java · commit 864b23e147df · 2025-12-23T20:05:43.000+04:00
diff --git a/src/main/java/input/Strategy/FileReaderStrategy.java b/src/main/java/input/Strategy/FileReaderStrategy.java
@@ -133,4 +133,8 @@ public Optional<Client.ClientBuilder> parseToClient(String line) {
             return Optional.empty();
         }
     }
+
+    public String getFilePath() {
+        return filePath;
+    }
 }
diff --git a/src/main/java/input/Strategy/RandomDataGeneratorStrategy.java b/src/main/java/input/Strategy/RandomDataGeneratorStrategy.java
@@ -123,4 +123,8 @@ private int generateUniqueId() {
         userIds.add(id);
         return id;
     }
+
+    public int getCount() {
+        return count;
+    }
 }
diff --git a/src/main/java/sorting/AbstractMergeSortStrategy.java b/src/main/java/sorting/AbstractMergeSortStrategy.java
@@ -1,26 +1,28 @@
 package sorting;
 
 import dto.Client;
-import java.util.ArrayList;
+import input.CustomCollection;
+
 import java.util.Comparator;
-import java.util.List;
 
 public abstract class AbstractMergeSortStrategy implements SortingStrategy {
 
-    public void sortWithComparator(List<Client> clients, Comparator<Client> comparator) {
+    public void sortWithComparator(CustomCollection<Client> clients, Comparator<Client> comparator) {
         if (clients == null || clients.size() <= 1) {
             return;
         }
 
         mergeSort(clients, 0, clients.size() - 1, comparator);
     }
 
+    protected abstract Comparator<Client> getComparator();
+
     @Override
     public String getStrategyName() {
         return "Abstract Merge Sort (сортировка слиянием)";
     }
 
-    private void mergeSort(List<Client> clients, int left, int right,
+    private void mergeSort(CustomCollection<Client> clients, int left, int right,
                            Comparator<Client> comparator) {
 
         if (left < right) {
@@ -35,10 +37,10 @@ private void mergeSort(List<Client> clients, int left, int right,
     }
 
 
-    private void merge(List<Client> clients, int left, int mid, int right,
+    private void merge(CustomCollection<Client> clients, int left, int mid, int right,
                        Comparator<Client> comparator) {
 
-        List<Client> temp = new ArrayList<>();
+        CustomCollection<Client> temp = new CustomCollection<>();
 
         int i = left;
         int j = mid + 1;
@@ -76,14 +78,18 @@ private void merge(List<Client> clients, int left, int mid, int right,
         }
     }
 
-    public void sortEvenValuesOnly(List<Client> clients, Comparator<Client> comparator) {
+    public void sortEvenValuesOnly(CustomCollection<Client> clients) {
+        sortEvenValuesOnly(clients, getComparator());
+    }
+
+    public void sortEvenValuesOnly(CustomCollection<Client> clients, Comparator<Client> comparator) {
         if (clients == null || clients.isEmpty()) {
             return;
         }
 
         // Создаем список для хранения элементов с четными idNumber и их индексов
-        List<Client> evenClients = new ArrayList<>();
-        List<Integer> evenIndices = new ArrayList<>();
+        CustomCollection<Client> evenClients = new CustomCollection<>();
+        CustomCollection<Integer> evenIndices = new CustomCollection<>();
 
         // Собираем все элементы с четными idNumber и запоминаем их индексы
         for (int i = 0; i < clients.size(); i++) {
diff --git a/src/main/java/sorting/MergeSortDefaultStrategy.java b/src/main/java/sorting/MergeSortDefaultStrategy.java
@@ -1,35 +1,28 @@
 package sorting;
 
 import dto.Client;
+import input.CustomCollection;
 
 import java.util.Comparator;
-import java.util.List;
 
-public class MergeSortDefaultStrategy extends AbstractMergeSortStrategy{
+public class MergeSortDefaultStrategy extends AbstractMergeSortStrategy {
 
     @Override
-    public void sort(List<Client> clients) {
-        Comparator<Client> comparator = createDefaultComparator();
-        sortWithComparator(clients, comparator);
+    public void sort(CustomCollection<Client> clients) {
+        sortWithComparator(clients, getComparator());
     }
 
-    private Comparator<Client> createDefaultComparator() {
-        return new Comparator<Client>() {
-            @Override
-            public int compare(Client client1, Client client2) {
-                int nameComparison = client1.getName().compareTo(client2.getName());
-                if (nameComparison != 0) {
-                    return nameComparison;
-                }
-
-                int idComparison = Integer.compare(client1.getIdNumber(), client2.getIdNumber());
-                if (idComparison != 0) {
-                    return idComparison;
-                }
-
-                return client1.getPhoneNumber().compareTo(client2.getPhoneNumber());
-            }
+    protected Comparator<Client> getComparator() {
+        return (c1, c2) -> {
+            int nameComparison = c1.getName().compareTo(c2.getName());
+            if (nameComparison != 0) return nameComparison;
+
+            int idComparison = Integer.compare(c1.getIdNumber(), c2.getIdNumber());
+            if (idComparison != 0) return idComparison;
+
+            return c1.getPhoneNumber().compareTo(c2.getPhoneNumber());
         };
+
     }
 
     @Override
diff --git a/src/main/java/sorting/MergeSortDynamicStrategy.java b/src/main/java/sorting/MergeSortDynamicStrategy.java
@@ -2,9 +2,9 @@
 
 import dto.Client;
 import enums.Field;
+import input.CustomCollection;
 
 import java.util.Comparator;
-import java.util.List;
 
 public class MergeSortDynamicStrategy extends AbstractMergeSortStrategy{
     private final Field field;
@@ -16,21 +16,23 @@ public MergeSortDynamicStrategy(Field field, boolean ascending) {
     }
 
     @Override
-    public void sort(List<Client> clients) {
-        Comparator<Client> comparator = createComparatorForField();
-        if (!ascending) {
-            comparator = comparator.reversed();
-        }
-        sortWithComparator(clients, comparator);
+    public void sort(CustomCollection<Client> clients) {
+        sortWithComparator(clients, getComparator());
     }
 
-    public Comparator<Client> createComparatorForField(){
-        return switch (field){
+    public Comparator<Client> getComparator(){
+        Comparator<Client> comparator = switch (field){
             case NAME -> Comparator.comparing(Client :: getName);
             case ID_NUMBER -> Comparator.comparing(Client :: getIdNumber);
             case PHONE_NUMBER -> Comparator.comparing(Client :: getPhoneNumber);
             default -> throw new IllegalArgumentException("Неизвестное поле: " + field);
         };
+
+        if (ascending) {
+            return comparator;
+        } else {
+            return comparator.reversed();
+        }
     }
 
     @Override
diff --git a/src/main/java/sorting/SortingManager.java b/src/main/java/sorting/SortingManager.java
@@ -0,0 +1,25 @@
+package sorting;
+
+public class SortingManager {
+    private SortingStrategy currentStrategy;
+
+    public SortingManager(){}
+
+    public SortingManager(SortingStrategy initialStrategy) {
+        if (initialStrategy == null) {
+            throw new IllegalArgumentException("Стратегия не может быть null");
+        }
+        currentStrategy = initialStrategy;
+    }
+
+    public void setStrategy(SortingStrategy strategy) {
+        if (strategy == null) {
+            throw new IllegalArgumentException("Стратегия не может быть null");
+        }
+        this.currentStrategy = strategy;
+    }
+
+    public SortingStrategy getCurrentStrategy() {
+        return currentStrategy;
+    }
+}
diff --git a/src/main/java/sorting/SortingStrategy.java b/src/main/java/sorting/SortingStrategy.java
@@ -1,12 +1,12 @@
 package sorting;
 
 import dto.Client;
-import java.util.Comparator;
-import java.util.List;
+import input.CustomCollection;
 
 public interface SortingStrategy {
 
 
-    void sort(List<Client> clients);
+    void sort(CustomCollection<Client> clients);
     String getStrategyName();
+    void sortEvenValuesOnly(CustomCollection<Client> clients);
 }
diff --git a/src/main/java/userInterface/AppController.java b/src/main/java/userInterface/AppController.java
@@ -1,31 +1,51 @@
 package userInterface;
 
 import dto.Client;
+import enums.Field;
 import input.CustomCollection;
 import input.InputManager;
-import input.Strategy.FileReaderStrategy;
-import input.Strategy.ManualInputReaderStrategy;
-import input.Strategy.RandomDataGeneratorStrategy;
+import sorting.MergeSortDefaultStrategy;
+import sorting.MergeSortDynamicStrategy;
+import sorting.SortingManager;
 
 import java.io.IOException;
 
 public class AppController {
 
     private final InputManager inputManager = new InputManager();
     private final CustomCollection<Client> fullList = new CustomCollection<>();
+    private final SortingManager sortingManager = new SortingManager();
+
+    public void startDefaultSorting(){
+        sortingManager.setStrategy(new MergeSortDefaultStrategy());
+        sortingManager.getCurrentStrategy().sort(fullList);
+        showAllClients();
+    }
+
+    public void startEvenIdsSorting(){
+        sortingManager.setStrategy(new MergeSortDefaultStrategy());
+        sortingManager.getCurrentStrategy().sortEvenValuesOnly(fullList);
+        showAllClients();
+    }
+
+    public void startDynamicSorting(Field field){
+        sortingManager.setStrategy(new MergeSortDynamicStrategy(field, true));
+        sortingManager.getCurrentStrategy().sort(fullList);
+        showAllClients();
+    }
 
     public CustomCollection<Client> getFullList() {
         return fullList;
     }
 
-    public void showAllClientsInDefaultOrder(){
+    public void showAllClients(){
         for(Client client : fullList){
             System.out.println(client);
         }
     }
 
     public void startFileReaderStrategy(String path){
-        inputManager.setStrategy(new FileReaderStrategy(path));
+        inputManager.setStrategy(inputManager.createFileStrategy(path));
         try {
             CustomCollection<Client> fromFileList = inputManager.loadData();
             fullList.addAll(fromFileList);
@@ -38,7 +58,7 @@ public void startFileReaderStrategy(String path){
     }
 
     public void startManualInputStrategy(){
-        inputManager.setStrategy(new ManualInputReaderStrategy());
+        inputManager.setStrategy(inputManager.createManualStrategy());
         try {
             CustomCollection<Client> manualList = inputManager.loadData();
             fullList.addAll(manualList);
@@ -51,9 +71,10 @@ public void startManualInputStrategy(){
     }
 
     public void startRandomDataStrategy(int count){
-        inputManager.setStrategy(new RandomDataGeneratorStrategy(count));
+        inputManager.setStrategy(inputManager.createRandomStrategy(count));
         try {
             CustomCollection<Client> randomList = inputManager.loadData();
+            fullList.addAll(randomList);
             for(Client client : randomList){
                 System.out.println(client);
             }
diff --git a/src/main/java/userInterface/MenuManager.java b/src/main/java/userInterface/MenuManager.java
@@ -1,5 +1,7 @@
 package userInterface;
 
+import enums.Field;
+
 import java.util.Scanner;
 
 public class MenuManager implements Printable {
@@ -130,6 +132,7 @@ public void printIdSortingOptions() {
 
     @Override
     public void printNameSortingOptions() {
+        appController.startDynamicSorting(Field.NAME);
         boolean backToMain = false;
         while (!backToMain && running) {
             Printable.super.printNameSortingOptions();
@@ -139,6 +142,7 @@ public void printNameSortingOptions() {
 
     @Override
     public void printPhoneSortingOptions() {
+        appController.startDynamicSorting(Field.PHONE_NUMBER);
         boolean backToMain = false;
         while (!backToMain && running) {
             Printable.super.printPhoneSortingOptions();
@@ -147,10 +151,12 @@ public void printPhoneSortingOptions() {
     }
 
     private void sortIDByAscending() {
+        appController.startDynamicSorting(Field.ID_NUMBER);
         System.out.println("Клиенты отсортированы по возрастанию ID");
     }
 
     private void sortIDbyEven() {
+        appController.startEvenIdsSorting();
         System.out.println("Клиенты отсортированы по четным ID");
     }
 
@@ -180,7 +186,7 @@ private void fillRandom() {
 
     private void printDefaultOrder() {
         System.out.println("Список клиентов");
-        appController.showAllClientsInDefaultOrder();
+        appController.startDefaultSorting();
     }
 
     private void exitByChoice() {
diff --git a/src/main/java/userInterface/Printable.java b/src/main/java/userInterface/Printable.java
@@ -16,18 +16,18 @@ default void printFillingDatabaseMenu(){
                 Заполнить базу данных:
                 1) Ручной ввод
                 2) Файлом
-                3) Случайный набор\
+                3) Случайный набор
                 0) Возврат в главное меню"""
         );
     }
 
     default void printSortingMenu(){
         System.out.println("""
                 Выберите вариант:
-                1) Отображать клиентов в порядке по умолчанию
-                2) Сортировать по имени
-                3) Сортировать по ID
-                4) Сортировать по номеру телефона
+                1) Базовая сортировка клиентов
+                2) Сортировать клиентов по имени
+                3) Сортировать клиентов по ID
+                4) Сортировать клиентов по номеру телефона
                 0) Возврат в главное меню"""
         );
     }
diff --git a/src/test/java/input/CustomCollectionTest.java b/src/test/java/input/CustomCollectionTest.java

Original file line number	Diff line number	Diff line change
`@@ -133,4 +133,8 @@ public Optional<Client.ClientBuilder> parseToClient(String line) {`
`133`	`133`	`return Optional.empty();`
`134`	`134`	`}`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+ public String getFilePath() {`
	`138`	`+ return filePath;`
	`139`	`+ }`
`136`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,8 @@ private int generateUniqueId() {`
`123`	`123`	`userIds.add(id);`
`124`	`124`	`return id;`
`125`	`125`	`}`
	`126`	`+`
	`127`	`+ public int getCount() {`
	`128`	`+ return count;`
	`129`	`+ }`
`126`	`130`	`}`