From e7c1d4c03d170ce2db625d66de4cd19ac4142bd3 Mon Sep 17 00:00:00 2001
From: Pavel Piligrimov <p.piligrimov@iqdev.digital>
Date: Thu, 11 May 2023 11:53:09 +0500
Subject: [PATCH] readme, cli seeding

---
 phpunit.xml.dist                             |  4 ----
 readme.md                                    | 24 ++++++++++++++++++++
 src/ElasticSearch/Search/BoolQuery/Query.php |  1 +
 tests/CLI/DefaultSeed.php                    |  6 +++++
 tests/Config/ChangingStateConfiguration.php  |  2 +-
 tests/Seed/DefaultSeed.php                   |  2 +-
 6 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 readme.md
 create mode 100644 tests/CLI/DefaultSeed.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c4907e8..4f8a4c9 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -18,8 +18,4 @@
             <directory suffix=".php">src/ElasticSearch/</directory>
         </include>
     </coverage>
-    <php>
-        <env name="IQ_ES_PRODUCT_SEARCH_INDEX" value="product-test"/>
-        <env name="IQ_ES_PRODUCT_SEARCH_INDEX_CHANGING_STATE" value="product-test-changing-state"/>
-    </php>
 </phpunit>
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..9d32b38
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,24 @@
+# Проведение тестов
+Для работы корректности фильтрации и индексации данных в эластике необходимо подключение к elasticsearch
+
+## Индексация elasticsearch
+Эластик поднимается и настраивается отдельно.
+
+Настроить подключение к эластику в переменных окружения .env
+
+```dotenv
+IQ_ES_HOSTS=http://127.0.0.1:9200
+IQ_ES_USER=elastic
+IQ_ES_PASSWORD=passsword
+IQ_ES_PRODUCT_SEARCH_INDEX=product-test
+```
+
+Для наполнения эластика данными выполнить команду:
+
+`php tests/CLI/DefaultSeed.php`
+
+## Запуск тестов
+
+Для проведения тестов можно использовать команду
+
+`php composer tests`
\ No newline at end of file
diff --git a/src/ElasticSearch/Search/BoolQuery/Query.php b/src/ElasticSearch/Search/BoolQuery/Query.php
index 2e35ab0..e027710 100644
--- a/src/ElasticSearch/Search/BoolQuery/Query.php
+++ b/src/ElasticSearch/Search/BoolQuery/Query.php
@@ -11,6 +11,7 @@ final class Query implements Esable
     protected BoolQueryCollection $filter;
     protected BoolQueryCollection $should;
     protected BoolQueryCollection $mustNot;
+    protected BoolQueryCollection $match;
 
     protected string $type;
 
diff --git a/tests/CLI/DefaultSeed.php b/tests/CLI/DefaultSeed.php
new file mode 100644
index 0000000..7902cd8
--- /dev/null
+++ b/tests/CLI/DefaultSeed.php
@@ -0,0 +1,6 @@
+<?php
+
+include_once __DIR__ . '/../bootstrap.php';
+
+$oSeeder = new \IQDEV\ElasticSearchTests\Seed\DefaultSeed();
+$oSeeder->start();
\ No newline at end of file
diff --git a/tests/Config/ChangingStateConfiguration.php b/tests/Config/ChangingStateConfiguration.php
index 61166d0..b188381 100644
--- a/tests/Config/ChangingStateConfiguration.php
+++ b/tests/Config/ChangingStateConfiguration.php
@@ -8,6 +8,6 @@ class ChangingStateConfiguration extends BaseConfiguration
 {
     public function getIndexName(): string
     {
-        return $_ENV['IQ_ES_PRODUCT_SEARCH_INDEX_CHANGING_STATE'];
+        return $_ENV['IQ_ES_PRODUCT_SEARCH_INDEX'] . '_changing-state';
     }
 }
\ No newline at end of file
diff --git a/tests/Seed/DefaultSeed.php b/tests/Seed/DefaultSeed.php
index 2453c4a..8ab1eea 100644
--- a/tests/Seed/DefaultSeed.php
+++ b/tests/Seed/DefaultSeed.php
@@ -28,7 +28,7 @@ class DefaultSeed
 
     public function start()
     {
-        $provider = new TestIndexProvider([
+        $provider = new TestIndexProvider($this->configuration, [
             [
                 'id' => 's1',
                 'name' => 'Кроссовки NMD_R1 Boba Fett Spectoo',
-- 
GitLab