Merge remote-tracking branch 'origin/uat' into develop

superdesk · Oct 16, 2023 · 5dab4bd · 5dab4bd
2 parents 6ecfbae + 062919c
commit 5dab4bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/server/cp/output/formatter/jimi.py b/server/cp/output/formatter/jimi.py
@@ -565,14 +565,17 @@ def _format_refs(self, content, item):
         refs = set(
             [
                 slug(self._get_original_item(ref))
-                for ref in superdesk.get_resource_service("news").get(
-                    req=None,
-                    lookup={
-                        "refs.guid": item["guid"],
-                        "pubstatus": "usable",
-                        "state": "published",
+                for ref in superdesk.get_resource_service("news").search({
+                    "query": {
+                        "bool": {
+                            "must": [
+                                {"term": {"refs.guid": item["guid"]}},
+                                {"term": {"pubstatus": "usable"}},
+                                {"terms": {"state": ["published", "scheduled"]}},
+                            ],
+                        },
                     },
-                )
+                })
             ]
         )
 

diff --git a/server/tests/output/formatter/jimi_test.py b/server/tests/output/formatter/jimi_test.py
@@ -486,7 +486,7 @@ def test_ap_update_keeps_newscomip(self):
         self.assertEqual("00000001", item.find("NewsCompID").text)
 
     def test_picture_container_ids(self):
-        resources["news"].service.get.side_effect = [
+        resources["news"].service.search.side_effect = [
             [
                 {"guid": "usable", "pubstatus": "usable", "type": "text"},
                 {
@@ -507,7 +507,7 @@ def test_picture_container_ids(self):
             }
         )
 
-        resources["news"].service.get.side_effect = None
+        resources["news"].service.search.side_effect = None
 
         self.assertEqual("{}, usable".format(32 * "a"), item.find("ContainerIDs").text)