Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Minor refactoring

Browse Source 
MAILPOET-4986
This commit is contained in:
John Oleksowicz
2023-02-27 17:30:05 -06:00
committed by Aschepikov
parent c747b71829
commit fa43495d81
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mailpoet/lib/Segments/DynamicSegments/Filters/DateFilter.php
View File

@@ -8,7 +8,6 @@ use MailPoetVendor\Carbon\CarbonImmutable;
use MailPoetVendor\Doctrine\DBAL\Query\QueryBuilder; use MailPoetVendor\Doctrine\DBAL\Query\QueryBuilder;
abstract class DateFilter implements Filter { abstract class DateFilter implements Filter {
const BEFORE = 'before'; const BEFORE = 'before';
const AFTER = 'after'; const AFTER = 'after';
const ON = 'on'; const ON = 'on';
@@ -19,17 +18,13 @@ abstract class DateFilter implements Filter {
abstract public function apply(QueryBuilder $queryBuilder, DynamicSegmentFilterEntity $filter): QueryBuilder; abstract public function apply(QueryBuilder $queryBuilder, DynamicSegmentFilterEntity $filter): QueryBuilder;
protected function getValidOperators(): array { protected function getValidOperators(): array {
return [ return array_merge(
self::BEFORE, $this->getAbsoluteDateOperators(),
self::AFTER, $this->getRelativeDateOperators()
self::ON, );
self::NOT_ON,
self::IN_THE_LAST,
self::NOT_IN_THE_LAST,
];
} }
protected function getDateOperators() { protected function getAbsoluteDateOperators(): array {
return [ return [
self::BEFORE, self::BEFORE,
self::AFTER, self::AFTER,
@@ -38,15 +33,15 @@ abstract class DateFilter implements Filter {
]; ];
} }
protected function getRelativeDateOperators() { protected function getRelativeDateOperators(): array {
return [ return [
self::IN_THE_LAST, self::IN_THE_LAST,
self::NOT_IN_THE_LAST, self::NOT_IN_THE_LAST,
]; ];
} }
protected function getDateForOperator(string $operator, string $value): string { protected function getDateStringForOperator(string $operator, string $value): string {
if (in_array($operator, $this->getDateOperators())) { if (in_array($operator, $this->getAbsoluteDateOperators())) {
$carbon = CarbonImmutable::createFromFormat('Y-m-d', $value); $carbon = CarbonImmutable::createFromFormat('Y-m-d', $value);
if (!$carbon instanceof CarbonImmutable) { if (!$carbon instanceof CarbonImmutable) {
throw new InvalidFilterException('Invalid date value', InvalidFilterException::INVALID_DATE_VALUE); throw new InvalidFilterException('Invalid date value', InvalidFilterException::INVALID_DATE_VALUE);

2
mailpoet/lib/Segments/DynamicSegments/Filters/SubscriberSubscribedDate.php
View File

@@ -15,7 +15,7 @@ class SubscriberSubscribedDate extends DateFilter {
$value = $this->getDateValueFromFilter($filter); $value = $this->getDateValueFromFilter($filter);
$parameterSuffix = $filter->getId() ?: Security::generateRandomString(); $parameterSuffix = $filter->getId() ?: Security::generateRandomString();
$parameter = 'date' . $parameterSuffix; $parameter = 'date' . $parameterSuffix;
$date = $this->getDateForOperator($operator, $value); $date = $this->getDateStringForOperator($operator, $value);
if ($operator === self::BEFORE) { if ($operator === self::BEFORE) {
$queryBuilder->andWhere("DATE(last_subscribed_at) < :$parameter"); $queryBuilder->andWhere("DATE(last_subscribed_at) < :$parameter");

2
mailpoet/lib/Segments/DynamicSegments/Filters/WooCommercePurchaseDate.php
View File

@@ -29,7 +29,7 @@ class WooCommercePurchaseDate extends DateFilter {
public function apply(QueryBuilder $queryBuilder, DynamicSegmentFilterEntity $filter): QueryBuilder { public function apply(QueryBuilder $queryBuilder, DynamicSegmentFilterEntity $filter): QueryBuilder {
$operator = $this->getOperatorFromFilter($filter); $operator = $this->getOperatorFromFilter($filter);
$dateValue = $this->getDateValueFromFilter($filter); $dateValue = $this->getDateValueFromFilter($filter);
$date = $this->getDateForOperator($operator, $dateValue); $date = $this->getDateStringForOperator($operator, $dateValue);
$subQuery = $this->getSubQuery($operator, $date); $subQuery = $this->getSubQuery($operator, $date);
if (in_array($operator, [self::NOT_ON, self::NOT_IN_THE_LAST])) { if (in_array($operator, [self::NOT_ON, self::NOT_IN_THE_LAST])) {