Merge pull request #77 from LCOGT/filter_cases

save the configdb filter case for any filters submitted

observation_portal/requestgroups/serializers.py

@@ -364,11 +364,14 @@ def validate(self, data):
                 if plural_type not in available_optical_elements:
                     raise serializers.ValidationError(_("optical_element of type {} is not available on {} instruments"
                                                         .format(oe_type, data['instrument_type'])))
-                available_elements = [element['code'].lower() for element in available_optical_elements[plural_type]]
-                if plural_type in available_optical_elements and value.lower() not in available_elements:
+                available_elements = {element['code'].lower(): element['code'] for element in available_optical_elements[plural_type]}
+                if plural_type in available_optical_elements and value.lower() not in available_elements.keys():
                     raise serializers.ValidationError(_("optical element {} of type {} is not available".format(
                         value, oe_type
                     )))
+                else:
+                    instrument_config['optical_elements'][oe_type] = available_elements[value.lower()]
+
 
             # Also check that any optical element group in configdb is specified in the request unless we are a BIAS or
             # DARK or SCRIPT type observation

observation_portal/requestgroups/test/test_api.py

@@ -1377,6 +1377,13 @@ def test_invalid_filter_for_instrument(self):
         self.assertIn('optical element magic of type filter is not available', str(response.content))
         self.assertEqual(response.status_code, 400)
 
+    def test_filter_case_is_overridden(self):
+        bad_data = self.generic_payload.copy()
+        bad_data['requests'][0]['configurations'][0]['instrument_configs'][0]['optical_elements']['filter'] = 'AiR'
+        response = self.client.post(reverse('api:request_groups-list'), data=bad_data)
+        self.assertEqual(response.json()['requests'][0]['configurations'][0]['instrument_configs'][0]['optical_elements']['filter'], 'air')
+        self.assertEqual(response.status_code, 201)
+
     def test_filter_not_necessary_for_type(self):
         good_data = self.generic_payload.copy()