fix process multi ID/revision resolutions

Author: fmigneault

tests/functional/test_wps_app.py

@@ -307,7 +307,7 @@ def test_describe_process_single_revision(self, process_revision):
         ([(0, "1.3.2"), (1, "1.3.2"), (0, "1.3.4"), (1, "2.0.0")], ),
         # ensure optional tag returns both variants as pseudo-duplicates when the corresponding revision is also given
         # ("" == "2.0.0"), this is not the same as 'test_describe_process_multi_revision_duplicates' use case
-        ([(0, "1.2.5"), (0, ""), (0, "2.0.0"), (0, ""), (1, "2.0.0")], ),
+        ([(0, "1.2.5"), (0, ""), (0, "2.0.0"), (1, ""), (1, "2.0.0")], ),
     ])
     def test_describe_process_multi_revision_filter(self, process_revisions):
         headers = {"Accept": ContentType.APP_XML}
@@ -316,8 +316,8 @@ def test_describe_process_multi_revision_filter(self, process_revisions):
             for idx, rev in process_revisions
         ]
         proc_vers = [
-            rev if rev else self.process_revisions[0][-1]
-            for rev in process_revisions
+            rev if rev else self.process_revisions[idx][-1]
+            for idx, rev in process_revisions
         ]
         params = {
             "service": "WPS",
@@ -333,15 +333,16 @@ def test_describe_process_multi_revision_filter(self, process_revisions):
             resp.mustcontain(f"ProcessDescription wps:processVersion=\"{proc_ver}\"")  # reported regardless of ID:rev
             resp.mustcontain(f"<ows:Identifier>{proc_id}</ows:Identifier>")  # ID as requested to match search criteria
 
-        unrequested_versions = set(self.process_revisions[0]) - set(proc_vers)
-        for proc_ver in unrequested_versions:
-            assert f"ProcessDescription wps:processVersion=\"{proc_ver}\"" not in resp.text, "filter did not work"
-
         # number of identifiers must match the requested IDs/revisions that exist,
         # even if they represent the same process after optional-latest revision resolution
         # to ensure that PyWPS can resolve them against the specified query string ID values
         # (PyWPS does not have special 'revision' logic, it considers them distinct processes without relationships)
-        assert resp.text.count("<ows:Identifier>") == len(process_revisions)
+        assert sum(
+            # need to include process ID in check to disambiguate from I/O ID
+            # however, stop at the 'ID' only (no revision / end XML block) to count all revisions together
+            resp.text.count(f"<ows:Identifier>{p_id}")
+            for p_id in self.process_ids
+        ) == len(process_revisions)
 
     def test_describe_process_multi_revision_duplicates(self):
         headers = {"Accept": ContentType.APP_XML}

weaver/store/mongodb.py

@@ -585,27 +585,22 @@ def list_processes(self,
                 f"condition_{idx}": [{"$match": {"identifier": proc_id}}]
                 for idx, proc_id in enumerate(process_latest)
             }
+            process_variants.update({
+                f"condition_{idx}": [{"$match": {"identifier": proc_id_rev}}]
+                for idx, proc_id_rev in enumerate(process_revisions, start=len(process_variants))
+            })
             process_variants.update({
                 f"condition_{idx}": [
+                    {"$match": {"identifier": proc_id, "version": proc_rev}},
+                    # After resolutions, align any 'latest' process that indicates the explicit revision.
+                    # The only case that must be patched is when the version is explicitly indicated in query,
+                    # although not explicit set in the DB document since it corresponds to the latest revision.
                     {"$set": {"identifier": {"$cond": {
-                        "if": {
-                            # the only case that must be patched is when the version is explicitly indicated in query,
-                            # although not explicit set in the DB document since it corresponds to the latest revision
-                            "$and": [
-                                {"$regexMatch": {"input": "$identifier", "regex": r"^.*(?!:[0-9]+[^:]*)$"}},
-                                {"$not": {"$in": ["$identifier", list(process_ids)]}}
-                            ]
-                        },
+                        "if": {"$regexMatch": {"input": "$identifier", "regex": r"^.*(?!:[0-9]+[^:]*)$"}},
                         "then": {"$concat": ["$identifier", ":", "$version"]},
                         "else": "$identifier",
                     }}}},
-                    # then, search by 'ID:revision' whether it was the latest or an actual older revision
-                    {"$match": {"identifier": proc_id_rev}}
                 ]
-                for idx, proc_id_rev in enumerate(process_revisions, start=len(process_variants))
-            })
-            process_variants.update({
-                f"condition_{idx}": [{"$match": {"identifier": proc_id, "version": proc_rev}}]
                 for idx, (proc_id, proc_rev) in enumerate(process_id_version, start=len(process_variants))
             })
             resolve_filter = [