added update_at filter

cookbook/helper/recipe_search.py

@@ -72,6 +72,7 @@ class RecipeSearch():
         self._timescooked = self._params.get('timescooked', None)
         self._cookedon = self._params.get('cookedon', None)
         self._createdon = self._params.get('createdon', None)
+        self._updatedon = self._params.get('updatedon', None)
         self._viewedon = self._params.get('viewedon', None)
         # this supports hidden feature to find recipes missing X ingredients
         try:
@@ -114,6 +115,7 @@ class RecipeSearch():
         self._recently_viewed(num_recent=self._num_recent)
         self._cooked_on_filter(cooked_date=self._cookedon)
         self._created_on_filter(created_date=self._createdon)
+        self._updated_on_filter(updated_date=self._updatedon)
         self._viewed_on_filter(viewed_date=self._viewedon)
         self._favorite_recipes(timescooked=self._timescooked)
         self._new_recipes()
@@ -232,6 +234,16 @@ class RecipeSearch():
         else:
             self._queryset = self._queryset.filter(created_at__date__gte=created_date)
 
+    def _updated_on_filter(self, updated_date=None):
+        if updated_date is None:
+            return
+        lessthan = '-' in updated_date[:1]
+        updated_date = date(*[int(x) for x in updated_date.split('-') if x != ''])
+        if lessthan:
+            self._queryset = self._queryset.filter(updated_at__date__lte=updated_date)
+        else:
+            self._queryset = self._queryset.filter(updated_at__date__gte=updated_date)
+
     def _viewed_on_filter(self, viewed_date=None):
         if self._sort_includes('lastviewed') or viewed_date:
             longTimeAgo = timezone.now() - timedelta(days=100000)

cookbook/tests/factories/__init__.py

@@ -1,4 +1,5 @@
 
+from datetime import date
 from decimal import Decimal
 
 import factory
@@ -9,7 +10,7 @@ from django_scopes import scopes_disabled
 from faker import Factory as FakerFactory
 from pytest_factoryboy import register
 
-from cookbook.models import Step
+from cookbook.models import Recipe, Step
 
 # this code will run immediately prior to creating the model object useful when you want a reverse relationship
 # log = factory.RelatedFactory(
@@ -358,12 +359,13 @@ class RecipeFactory(factory.django.DjangoModelFactory):
     waiting_time = factory.LazyAttribute(lambda x: faker.random_int(min=0, max=360))
     internal = False
     created_by = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
-    created_at = factory.LazyAttribute(lambda x: faker.date_this_decade())
+    created_at = factory.LazyAttribute(lambda x: faker.date_between_dates(date_start=date(2000, 1, 1), date_end=date(2020, 12, 31)))
     space = factory.SubFactory(SpaceFactory)
 
     @classmethod
     def _create(cls, target_class, *args, **kwargs):  # override create to prevent auto_add_now from changing the created_at date
         created_at = kwargs.pop('created_at', None)
+        # updated_at = kwargs.pop('updated_at', None)
         obj = super(RecipeFactory, cls)._create(target_class, *args, **kwargs)
         if created_at is not None:
             obj.created_at = created_at

cookbook/tests/other/test_recipe_full_text_search.py

@@ -87,9 +87,15 @@ def found_recipe(request, space_1, accent, unaccent, u1_s1, u2_s1):
     days_3 = timezone.now() - timedelta(days=3)
     days_15 = timezone.now() - timedelta(days=15)
     days_30 = timezone.now() - timedelta(days=30)
-    recipe1 = RecipeFactory.create(space=space_1)
-    recipe2 = RecipeFactory.create(space=space_1)
-    recipe3 = RecipeFactory.create(space=space_1)
+    if request.param.get('createdon', None):
+        recipe1 = RecipeFactory.create(space=space_1, created_at=days_3)
+        recipe2 = RecipeFactory.create(space=space_1, created_at=days_30)
+        recipe3 = RecipeFactory.create(space=space_1, created_at=days_15)
+
+    else:
+        recipe1 = RecipeFactory.create(space=space_1)
+        recipe2 = RecipeFactory.create(space=space_1)
+        recipe3 = RecipeFactory.create(space=space_1)
     obj1 = None
     obj2 = None
 
@@ -137,13 +143,7 @@ def found_recipe(request, space_1, accent, unaccent, u1_s1, u2_s1):
         i2.instruction = accent
         i1.save()
         i2.save()
-    if request.param.get('createdon', None):
-        recipe1.created_at = days_3
-        recipe2.created_at = days_30
-        recipe3.created_at = days_15
-        recipe1.save()
-        recipe2.save()
-        recipe3.save()
+
     if request.param.get('viewedon', None):
         ViewLogFactory.create(recipe=recipe1, created_by=user1, created_at=days_3, space=space_1)
         ViewLogFactory.create(recipe=recipe2, created_by=user1, created_at=days_30, space=space_1)
@@ -291,8 +291,14 @@ def test_search_string(found_recipe, recipes,  user1,  space_1):
     ({'viewedon': True}, 'viewedon', (1, 1)),
     ({'cookedon': True}, 'cookedon', (1, 1)),
     ({'createdon': True}, 'createdon', (2, 12)),  # created dates are not filtered by user
+    ({'createdon': True}, 'updatedon', (2, 12)),  # updated dates are not filtered by user
 ], indirect=['found_recipe'])
 def test_search_date(found_recipe, recipes, param_type, result, u1_s1, u2_s1, space_1):
+    # force updated_at to equal created_at datetime
+    with scope(space=space_1):
+        for recipe in Recipe.objects.all():
+            Recipe.objects.filter(id=recipe.id).update(updated_at=recipe.created_at)
+
     date = (timezone.now() - timedelta(days=15)).strftime("%Y-%m-%d")
     param1 = f"?{param_type}={date}"
     param2 = f"?{param_type}=-{date}"

cookbook/views/api.py

@@ -654,6 +654,7 @@ class RecipeViewSet(viewsets.ModelViewSet):
         QueryParam(name='timescooked', description=_('Filter recipes cooked X times or more.  Negative values returns cooked less than X times'), qtype='int'),
         QueryParam(name='cookedon', description=_('Filter recipes last cooked on or after YYYY-MM-DD. Prepending ''-'' filters on or before date.')),
         QueryParam(name='createdon', description=_('Filter recipes created on or after YYYY-MM-DD. Prepending ''-'' filters on or before date.')),
+        QueryParam(name='updatedon', description=_('Filter recipes updated on or after YYYY-MM-DD. Prepending ''-'' filters on or before date.')),
         QueryParam(name='viewedon', description=_('Filter recipes lasts viewed on or after YYYY-MM-DD. Prepending ''-'' filters on or before date.')),
         QueryParam(name='makenow', description=_('Filter recipes that can be made with OnHand food. [''true''/''<b>false</b>'']')),
     ]