Add request filter on telescope_class to make it safer for adding suspend time on request patches

Author: Jon

observation_portal/requestgroups/filters.py

@@ -42,6 +42,9 @@ class Meta:
 
 
 class RequestFilter(django_filters.FilterSet):
+    telescope_class = django_filters.MultipleChoiceFilter(
+        choices=lambda: configdb.get_telescope_class_tuples(), field_name='location__telescope_class', distinct=True,
+    )
     class Meta:
         model = Request
         fields = ('state',)

observation_portal/requestgroups/serializers.py

@@ -658,7 +658,7 @@ def validate(self, data):
         return data
 
     def validate_suspend_until(self, value):
-        if value and value < timezone.now():
+        if value and value <= timezone.now():
             raise serializers.ValidationError(_('The suspend_until value must be in the future'))
         return value
 

observation_portal/requestgroups/test/test_api.py

@@ -788,7 +788,7 @@ def test_setting_suspend_until_time_succeeds(self):
         for r in self.reqs:
             self.assertIsNone(r.suspend_until)
             # Now set the suspend until time into the future on those requests
-            response = self.client.patch(reverse('api:requests-detail', args=(r.id,)), data=payload)
+            response = self.client.patch(reverse('api:requests-detail', args=(r.id,)) + '?telescope_class=1m0', data=payload)
             self.assertEqual(response.status_code, 200)
             r.refresh_from_db()
             self.assertEqual(r.suspend_until, suspend_time)
@@ -810,6 +810,15 @@ def test_removing_suspend_until_time_succeeds(self):
             r.refresh_from_db()
             self.assertIsNone(r.suspend_until)
 
+    def test_setting_suspend_until_time_with_wrong_telescope_class_fails(self):
+        suspend_time = timezone.now() + timedelta(hours=4)
+        payload = {'suspend_until': suspend_time.isoformat()}
+        for r in self.reqs:
+            self.assertIsNone(r.suspend_until)
+            # Use a filter parameter telescope_class that doesn't match this request which should fail to find the request
+            response = self.client.patch(reverse('api:requests-detail', args=(r.id,)) + '?telescope_class=2m0', data=payload)
+            self.assertContains(response, 'No Request matches', status_code=404)
+
     def test_setting_suspend_fails_with_non_time_fails(self):
         payload = {'suspend_until': 'not a time'}
         r = self.reqs[0]