Skip to content

Commit 9ac5f87

Browse files
bfergusoseeker25
bferguso
and
seeker25
authored
Add unit test for graph searchString validity (#1672)
* Add unit test for graph searchString validity. Fix Publication and Document Submission resouce models * Fix resource model format * lint * fix bcap message --------- Co-authored-by: Travis Semple <travis8814@gmail.com>
1 parent e234ef7 commit 9ac5f87

4 files changed

Lines changed: 459 additions & 235 deletions

File tree

‎bcap/pkg/graphs/resource_models/BCAP Message.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636
}
637637
],
638638
"searchDsl": "",
639-
"searchString": "/search/resources?advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5%22%3A%7B%22op%22%3A%22not_null%22%2C%22val%22%3A%22%22%7D%7D%5D"
639+
"searchString": "/bcap/search?advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5%22%3A%7B%22op%22%3A%22not_null%22%2C%22val%22%3A%22%22%7D%7D%5D"
640640
},
641641
"datatype": "resource-instance",
642642
"description": null,
@@ -742,7 +742,7 @@
742742
}
743743
],
744744
"searchDsl": "",
745-
"searchString": "/search/resources?advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5%22%3A%7B%22op%22%3A%22not_null%22%2C%22val%22%3A%22%22%7D%7D%5D"
745+
"searchString": "/bcap/search?advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5%22%3A%7B%22op%22%3A%22not_null%22%2C%22val%22%3A%22%22%7D%7D%5D"
746746
},
747747
"datatype": "resource-instance",
748748
"description": null,

‎bcap/pkg/graphs/resource_models/Document Submission.json‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -761,26 +761,26 @@
761761
],
762762
"functions_x_graphs": [
763763
{
764-
"id": "97dd3387-7137-4f72-856d-0053ed1cb715",
765-
"function_id": "60000000-0000-0000-0000-000000000001",
766-
"graph_id": "010b893e-c9d2-4dfe-b5d1-837c49c2bb9a",
767764
"config": {
768765
"descriptor_types": {
769-
"name": {
770-
"nodegroup_id": "22e9f8fd-9394-48a0-8911-b48afb0afb34",
771-
"string_template": "<Document Title>"
772-
},
773-
"map_popup": {
766+
"description": {
774767
"nodegroup_id": "",
775768
"string_template": ""
776769
},
777-
"description": {
770+
"map_popup": {
778771
"nodegroup_id": "",
779772
"string_template": ""
773+
},
774+
"name": {
775+
"nodegroup_id": "22e9f8fd-9394-48a0-8911-b48afb0afb34",
776+
"string_template": "<Document Title>"
780777
}
781778
},
782779
"triggering_nodegroups": []
783-
}
780+
},
781+
"function_id": "60000000-0000-0000-0000-000000000001",
782+
"graph_id": "010b893e-c9d2-4dfe-b5d1-837c49c2bb9a",
783+
"id": "97dd3387-7137-4f72-856d-0053ed1cb715"
784784
}
785785
],
786786
"graphid": "010b893e-c9d2-4dfe-b5d1-837c49c2bb9a",
@@ -1056,7 +1056,9 @@
10561056
},
10571057
{
10581058
"alias": "arch_branch_determined_level_of_risk",
1059-
"config": {},
1059+
"config": {
1060+
"rdmCollection": null
1061+
},
10601062
"datatype": "concept",
10611063
"description": null,
10621064
"exportable": false,
@@ -1252,7 +1254,7 @@
12521254
"should": []
12531255
}
12541256
},
1255-
"searchString": "http://localhost:81/bc-fossil-management/search?paging-filter=1&tiles=true&format=tilecsv&reportlink=false&precision=6&total=1&sort-results=asc&advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22c4eca2de-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22eq%22%2C%22val%22%3A%22706881ba-bda3-4fbc-9d66-c26bf2d92c18%22%7D%2C%22e2f1c29a-c500-11ed-9089-5254004d77d3%22%3A%7B%22op%22%3A%22eq%22%2C%22val%22%3A%223489e41e-0168-4a8f-80f1-75fde26e2130%22%7D%2C%22c4ec9b2c-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22c4eca13a-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22a5b2cd72-c4f4-11ed-a06d-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22b5ed0072-c4f4-11ed-94de-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22009ba8da-faf6-11ed-ac37-5254004d77d3%22%3A%7B%22op%22%3A%22%22%2C%22val%22%3A%22%22%7D%2C%2299643f1e-9e4e-11ed-b6d5-5254004d77d3%22%3A%7B%22val%22%3A%22null%22%7D%7D%5D"
1257+
"searchString": "/bcap/search?advanced-search=[{\"op\"%3A\"and\"%2C\"c4eca2de-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"eq\"%2C\"val\"%3A[{\"labels\"%3A[{\"id\"%3A\"e499a812-99ef-4bc6-aba9-2de96c54c8e9\"%2C\"language_id\"%3A\"en\"%2C\"list_item_id\"%3A\"8c4e2933-a97a-5f47-89e7-78d1d8aaad81\"%2C\"value\"%3A\"Individual\"%2C\"valuetype_id\"%3A\"prefLabel\"}]%2C\"uri\"%3A\"https%3A%2F%2Flocalhost%2Fbcap%2Fplugins%2Fcontrolled-list-manager%2Fitem%2F8c4e2933-a97a-5f47-89e7-78d1d8aaad81\"}]}%2C\"e2f1c29a-c500-11ed-9089-5254004d77d3\"%3A{\"op\"%3A\"eq\"%2C\"val\"%3A\"\"}%2C\"c4ec9b2c-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"c4eca13a-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"a5b2cd72-c4f4-11ed-a06d-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"b5ed0072-c4f4-11ed-94de-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5\"%3A{\"op\"%3A\"~\"%2C\"val\"%3A\"\"}%2C\"99643f1e-9e4e-11ed-b6d5-5254004d77d3\"%3A{\"val\"%3A\"\"}}]"
12561258
},
12571259
"datatype": "resource-instance",
12581260
"description": null,
@@ -1484,7 +1486,7 @@
14841486
"should": []
14851487
}
14861488
},
1487-
"searchString": "/bc-fossil-management/search?paging-filter=1&tiles=true&format=tilecsv&reportlink=false&precision=6&total=0&advanced-search=%5B%7B%22op%22%3A%22and%22%2C%22c4eca2de-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22eq%22%2C%22val%22%3A%22a7a00d7b-ac19-4b7a-b911-55b4fb1473ff%22%7D%2C%22e2f1c29a-c500-11ed-9089-5254004d77d3%22%3A%7B%22op%22%3A%22eq%22%2C%22val%22%3A%223489e41e-0168-4a8f-80f1-75fde26e2130%22%7D%2C%22c4ec9b2c-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22c4eca13a-9dea-11ed-9a7b-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22a5b2cd72-c4f4-11ed-a06d-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22b5ed0072-c4f4-11ed-94de-5254004d77d3%22%3A%7B%22op%22%3A%22~%22%2C%22lang%22%3A%22en%22%2C%22val%22%3A%22%22%7D%2C%22009ba8da-faf6-11ed-ac37-5254004d77d3%22%3A%7B%22op%22%3A%22%22%2C%22val%22%3A%22%22%7D%2C%2299643f1e-9e4e-11ed-b6d5-5254004d77d3%22%3A%7B%22val%22%3A%22f%22%7D%7D%5D&sort-results=asc"
1489+
"searchString": "/bcap/search?advanced-search=[{\"op\"%3A\"and\"%2C\"c4eca2de-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"eq\"%2C\"val\"%3A[{\"labels\"%3A[{\"id\"%3A\"29b5c452-81cf-4bb7-b10f-c6bd53a58df1\"%2C\"language_id\"%3A\"en\"%2C\"list_item_id\"%3A\"fd2053d3-c010-519a-97e5-52f3c7b508e2\"%2C\"value\"%3A\"Organization\"%2C\"valuetype_id\"%3A\"prefLabel\"}]%2C\"uri\"%3A\"https%3A%2F%2Flocalhost%2Fbcap%2Fplugins%2Fcontrolled-list-manager%2Fitem%2Ffd2053d3-c010-519a-97e5-52f3c7b508e2\"}]}%2C\"e2f1c29a-c500-11ed-9089-5254004d77d3\"%3A{\"op\"%3A\"eq\"%2C\"val\"%3A\"\"}%2C\"c4ec9b2c-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"c4eca13a-9dea-11ed-9a7b-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"a5b2cd72-c4f4-11ed-a06d-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"b5ed0072-c4f4-11ed-94de-5254004d77d3\"%3A{\"op\"%3A\"~\"%2C\"lang\"%3A\"en\"%2C\"val\"%3A\"\"}%2C\"a80514f2-7d9d-4aa4-b9f3-629bde6c1fd5\"%3A{\"op\"%3A\"~\"%2C\"val\"%3A\"\"}%2C\"99643f1e-9e4e-11ed-b6d5-5254004d77d3\"%3A{\"val\"%3A\"\"}}]"
14881490
},
14891491
"datatype": "resource-instance",
14901492
"description": null,
@@ -1670,9 +1672,9 @@
16701672
"publication": {
16711673
"graph_id": "010b893e-c9d2-4dfe-b5d1-837c49c2bb9a",
16721674
"most_recent_edit_id": null,
1673-
"notes": null,
1674-
"publicationid": "715b305a-30df-4e13-8a28-78dfd1ca411a",
1675-
"published_time": "2026-06-28T21:58:35.223"
1675+
"notes": "Fix searchString",
1676+
"publicationid": "08b5c74e-c655-41ae-b196-0bdd13d901df",
1677+
"published_time": "2026-08-11T11:02:01.702"
16761678
},
16771679
"relatable_resource_model_ids": [],
16781680
"resource_2_resource_constraints": [],
@@ -1772,7 +1774,7 @@
17721774
],
17731775
"metadata": {
17741776
"db": "PostgreSQL 16.3 (Debian 16.3-1.pgdg110+1) on x86_64-pc-linux-gnu, compiled by gcc (Debian 10.2.1-6) 10.2.1 20210110, 64-bit",
1775-
"git hash": "fatal: not a git repository (or any of the parent directories): .git",
1777+
"git hash": "22f8c0b1b3 2026-06-03 18:00:05 -0700",
17761778
"os": "Linux",
17771779
"os version": "6.12.76-linuxkit"
17781780
}

0 commit comments

Comments
 (0)