Merge remote-tracking branch 'origin/release/2.7' into develop

server/planning/commands/export_to_newsroom.py

@@ -73,7 +73,6 @@ def run(self, resource_url, assets_url, size=None):
         logger.info("Completed export events and planning.")
 
     def _fetch_items(self, fetch_callback):
-        """"""
         query = {
             "query": {
                 "bool": {

server/planning/events/events.py

@@ -121,7 +121,6 @@ def post_in_mongo(self, docs, **kwargs):
 
         for doc in docs:
             self._resolve_defaults(doc)
-            doc.pop("pubstatus", None)
             set_ingest_version_datetime(doc)
 
         self.on_create(docs)

server/planning/events/events_tests.py

@@ -135,6 +135,27 @@ def test_get_recurring_timeline(self):
                 self.assertEquals(e["dates"]["start"], expected_time)
                 expected_time += timedelta(days=1)
 
+    def test_create_cancelled_event(self):
+        with self.app.app_context():
+            service = get_resource_service("events")
+            service.post_in_mongo(
+                [
+                    {
+                        "guid": "test",
+                        "name": "Test Event",
+                        "pubstatus": "cancelled",
+                        "dates": {
+                            "start": datetime.now(),
+                            "end": datetime.now() + timedelta(days=1),
+                        },
+                    }
+                ]
+            )
+
+            event = service.find_one(req=None, guid="test")
+            assert event is not None
+            assert event["pubstatus"] == "cancelled"
+
 
 class EventLocationFormatAddress(TestCase):
     def test_format_address(self):