From 7d6c3edcdd2730a46d59c186048e76fa72e364c7 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 22 Aug 2015 15:35:28 +0200 Subject: [PATCH 1/2] Fix date filter on same day Fix #1379 --- app/config/services.yml | 1 + .../CustomDoctrineORMSubscriber.php | 38 +++++++++++++++++++ .../CoreBundle/Filter/EntryFilterType.php | 5 ++- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php diff --git a/app/config/services.yml b/app/config/services.yml index af22d3818..b3ec7c513 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -4,6 +4,7 @@ parameters: security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator + lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber services: # used for tests diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php new file mode 100644 index 000000000..20ced679c --- /dev/null +++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php @@ -0,0 +1,38 @@ +getFilterQuery()->getExpressionBuilder(); + $values = $event->getValues(); + $value = $values['value']; + + // left date should start at midnight + if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) { + $value['left_date'][0]->setTime(0, 0, 0); + } + + // right adte should end one second before midnight + if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) { + $value['right_date'][0]->setTime(23, 59, 59); + } + + if (isset($value['left_date'][0]) || isset($value['right_date'][0])) { + $event->setCondition($expr->dateTimeInRange($event->getField(), $value['left_date'][0], $value['right_date'][0])); + } + } +} diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php index ff51785b8..85d1a0610 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php @@ -27,8 +27,9 @@ class EntryFilterType extends AbstractType ), 'format' => 'dd/MM/yyyy', 'widget' => 'single_text', - ), - )) + ), + ) + ) ->add('domainName', 'filter_text', array( 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { $value = $values['value']; From f90af145caa040d17f2fb01e78b645c4157c3781 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 23 Aug 2015 22:06:27 +0200 Subject: [PATCH 2/2] Add test for same day filter --- .../Event/Subscriber/CustomDoctrineORMSubscriber.php | 10 +++++----- .../Tests/Controller/EntryControllerTest.php | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php index 20ced679c..cfdbfe973 100644 --- a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php +++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php @@ -8,7 +8,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * This custom class override the default behavior of LexikFilterBundle on `filter_date_range` - * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59) + * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59). */ class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface { @@ -17,17 +17,17 @@ class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements Event */ public function filterDateRange(GetFilterConditionEvent $event) { - $expr = $event->getFilterQuery()->getExpressionBuilder(); + $expr = $event->getFilterQuery()->getExpressionBuilder(); $values = $event->getValues(); - $value = $values['value']; + $value = $values['value']; // left date should start at midnight - if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) { + if (isset($value['left_date'][0]) && $value['left_date'][0] instanceof \DateTime) { $value['left_date'][0]->setTime(0, 0, 0); } // right adte should end one second before midnight - if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) { + if (isset($value['right_date'][0]) && $value['right_date'][0] instanceof \DateTime) { $value['right_date'][0]->setTime(23, 59, 59); } diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php index 5f0a60763..a09662858 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php @@ -278,6 +278,15 @@ class EntryControllerTest extends WallabagCoreTestCase $this->assertCount(5, $crawler->filter('div[class=entry]')); + $data = array( + 'entry_filter[createdAt][left_date]' => date('d/m/Y'), + 'entry_filter[createdAt][right_date]' => date('d/m/Y'), + ); + + $crawler = $client->submit($form, $data); + + $this->assertCount(5, $crawler->filter('div[class=entry]')); + $data = array( 'entry_filter[createdAt][left_date]' => '01/01/1970', 'entry_filter[createdAt][right_date]' => '01/01/1970',