Refactor order search form to be inclusive of orders placed on 'to' date

src/oscar/apps/customer/forms.py

@@ -1,3 +1,4 @@
+import datetime
 import string
 
 from django import forms
@@ -15,6 +16,7 @@ from oscar.apps.customer.utils import get_password_reset_url, normalise_email
 from oscar.core.compat import (
     existing_user_fields, get_user_model, url_has_allowed_host_and_scheme)
 from oscar.core.loading import get_class, get_model, get_profile_class
+from oscar.core.utils import datetime_combine
 from oscar.forms import widgets
 
 CustomerDispatcher = get_class('customer.utils', 'CustomerDispatcher')
@@ -228,12 +230,10 @@ class OrderSearchForm(forms.Form):
         date_to = self.cleaned_data['date_to']
         order_number = self.cleaned_data['order_number']
         kwargs = {}
-        if date_from and date_to:
-            kwargs['date_placed__range'] = [date_from, date_to]
-        elif date_from and not date_to:
-            kwargs['date_placed__gt'] = date_from
-        elif not date_from and date_to:
-            kwargs['date_placed__lt'] = date_to
+        if date_from:
+            kwargs['date_placed__gte'] = datetime_combine(date_from, datetime.time.min)
+        if date_to:
+            kwargs['date_placed__lte'] = datetime_combine(date_to, datetime.time.max)
         if order_number:
             kwargs['number__contains'] = order_number
         return kwargs

tests/unit/customer/test_forms.py

@@ -1,10 +1,14 @@
+from datetime import date, datetime
 from unittest import mock
 
+import pytz
+from django.conf import settings
 from django.core import mail
 from django.core.exceptions import ValidationError
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
-from oscar.apps.customer.forms import EmailUserCreationForm, PasswordResetForm
+from oscar.apps.customer.forms import (
+    EmailUserCreationForm, OrderSearchForm, PasswordResetForm)
 from oscar.test.factories import UserFactory
 
 
@@ -34,3 +38,23 @@ class TestPasswordResetForm(TestCase):
         form.save()
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].to, ['mıke@example.org'])
+
+
+class TestOrderSearchForm(TestCase):
+
+    @override_settings(TIME_ZONE='Africa/Nairobi')
+    def test_get_filters(self):
+        form = OrderSearchForm(data={
+            'date_from': date(2021, 1, 1),
+            'date_to': date(2021, 1, 10),
+            'order_number': '100'
+        })
+        self.assertTrue(form.is_valid())
+
+        filters = form.get_filters()
+        nbi = pytz.timezone(settings.TIME_ZONE)
+        self.assertEqual(filters, {
+            'date_placed__gte': nbi.localize(datetime(2021, 1, 1)),
+            'date_placed__lte': nbi.localize(datetime(2021, 1, 10, 23, 59, 59, 999999)),
+            'number__contains': '100',
+        })