[TASK] Implementing search fields filter for queue

Classes/Domain/Repository/MailRepository.php

@@ -26,6 +26,7 @@ namespace SGalinski\SgMail\Domain\Repository;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use SGalinski\SgMail\Service\BackendService;
 use TYPO3\CMS\Extbase\Persistence\Generic\Query;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
@@ -70,18 +71,6 @@ class MailRepository extends AbstractRepository {
 			$query->setLimit($limit);
 		}
 
-		if ($filters['from']) {
-			$constraintsAnd[] = $query->like('from_address', '%' . trim($filters['from'] . '%'));
-		}
-
-		if ($filters['to']) {
-			$constraintsAnd[] = $query->like('to_address', '%' . trim($filters['to'] . '%'));
-		}
-
-		if ($filters['subject']) {
-			$constraintsAnd[] = $query->like('mail_subject', '%' . trim($filters['subject']) . '%');
-		}
-
 		if ($filters['filterTemplate'] && $filters['filterTemplate'] !== 0
 			&& $filters['filterTemplate'] !== '0' && $filters['filterTemplate'] !== ''
 		) {
@@ -94,6 +83,34 @@ class MailRepository extends AbstractRepository {
 			$constraintsAnd[] = $query->equals('language', $filters['filterLanguage']);
 		}
 
+		$constraintsOr = [];
+		if ($filters['filterFields'] && trim($filters['filterFields'] !== '')) {
+			$search = '%' . $filters['filterSearch'] . '%';
+			foreach ($filters['filterFields'] as $field) {
+				switch ($field) {
+					case BackendService::SENDER_FILTER_OPTION :
+						$constraintsOr[] = $query->like('from_address', $search);
+						break;
+					case BackendService::RECIPIENT_FILTER_OPTION :
+						$constraintsOr[] = $query->like('to_address', $search);
+						break;
+					case BackendService::SUBJECT_FILTER_OPTION :
+						$constraintsOr[] = $query->like('mail_subject', $search);
+						break;
+					case BackendService::MAILTEXT_FILTER_OPTION :
+						$constraintsOr[] = $query->like('mail_body', $search);
+						break;
+					case BackendService::CC_FILTER_OPTION :
+						$constraintsOr[] = $query->like('cc_addresses', $search);
+						break;
+					case BackendService::BCC_FILTER_OPTION :
+						$constraintsOr[] = $query->like('bcc_addresses', $search);
+						break;
+				}
+			}
+			$constraintsAnd[] = $query->logicalOr($constraintsOr);
+		}
+
 		if ($filters['sent']) {
 			switch ($filters['sent']) {
 				case self::SENT: