diff --git a/dbrepo-search-service/.gitignore b/dbrepo-search-service/.gitignore
index 726e588cd1b2f59f2f847d48bf8a48549202d1b4..e4a1bfbd16200450d72d68d3c880e8f7aae5bae2 100644
--- a/dbrepo-search-service/.gitignore
+++ b/dbrepo-search-service/.gitignore
@@ -38,12 +38,6 @@ MANIFEST
*.manifest
*.spec
-# generate
-/friendly_names_overrides.json
-/test/rsa
-/test/test_keycloak_client.py
-/test/test_opensearch_client.py
-
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
diff --git a/dbrepo-search-service/friendly_names_overrides.json b/dbrepo-search-service/friendly_names_overrides.json
new file mode 100644
index 0000000000000000000000000000000000000000..8aca718186f840d438b4906cbd039debda15f179
--- /dev/null
+++ b/dbrepo-search-service/friendly_names_overrides.json
@@ -0,0 +1,18 @@
+{
+ "tables.name": "Table Name",
+ "owner.id": "Owner ID",
+ "owner.username": "Owner Username",
+ "owner.attributes.orcid": "Owner ORCID",
+ "creator.orcid": "Creator ORCID",
+ "identifiers.doi": "DOI",
+ "identifiers.licenses.uri": "License URI",
+ "identifiers.funders.funder_identifier": "Funder PID",
+ "identifiers.table_id": "Table ID",
+ "identifiers.query_id": "Subset ID",
+ "identifiers.view_id": "View ID",
+ "identifiers.database_id": "Database ID",
+ "identifiers.creator.username": "Creator Username",
+ "is_public": "Public",
+ "tables.columns.concept.uri": "URI",
+ "tables.columns.unit.uri": "URI"
+}
\ No newline at end of file
diff --git a/dbrepo-search-service/init/tests/test_app.py b/dbrepo-search-service/init/tests/test_app.py
index b4a67d3ec82ecb92742811692bfca55fdcf5c01c..aab1b90a35b09ca90d54643a714ef8af1eb18428 100644
--- a/dbrepo-search-service/init/tests/test_app.py
+++ b/dbrepo-search-service/init/tests/test_app.py
@@ -1,15 +1,18 @@
+import json
+import os
import unittest
-from app import App
-from dbrepo.core.client.SearchServiceClient import SearchServiceClient
+from dbrepo.core.client.search import SearchServiceClient
class AppTest(unittest.TestCase):
def test_index_update_succeeds(self):
+ # mock
+ client = SearchServiceClient()
# test
- app = App()
- app.index_update()
+ with open('./database.json', 'r') as f:
+ client.index_update(json.load(f))
def test_index_update_not_exists_succeeds(self):
# mock
@@ -17,5 +20,5 @@ class AppTest(unittest.TestCase):
client._instance().indices.delete(index="database")
# test
- app = App()
- app.index_update()
+ with open('./database.json', 'r') as f:
+ client.index_update(json.load(f))
diff --git a/dbrepo-search-service/tests/rsa/rs256.key b/dbrepo-search-service/tests/rsa/rs256.key
new file mode 100644
index 0000000000000000000000000000000000000000..86b3eaf5c6c4c6b83071b6d1e9d69cb22bcd4085
--- /dev/null
+++ b/dbrepo-search-service/tests/rsa/rs256.key
@@ -0,0 +1,3 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==
+-----END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/dbrepo-search-service/tests/rsa/rsa256.pkey b/dbrepo-search-service/tests/rsa/rsa256.pkey
new file mode 100644
index 0000000000000000000000000000000000000000..857dfb22beeac202c2955d7cc4f782b787492beb
--- /dev/null
+++ b/dbrepo-search-service/tests/rsa/rsa256.pkey
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/lib/python/coverage.xml b/lib/python/coverage.xml
index b23a031c5fe13102ab04331b3ef60329ee9353c0..ba3da4f2e6334a47f8e1fc55af11e024bbf698fc 100644
--- a/lib/python/coverage.xml
+++ b/lib/python/coverage.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" ?>
-<coverage version="7.6.10" timestamp="1741253336897" lines-valid="1941" lines-covered="1818" line-rate="0.9366" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
- <!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.6.10 -->
+<coverage version="7.7.1" timestamp="1743366739557" lines-valid="1967" lines-covered="1831" line-rate="0.9309" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+ <!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.7.1 -->
<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
<sources>
<source>/home/mweise/Projects/fda-services/lib/python</source>
</sources>
<packages>
- <package name="dbrepo" line-rate="0.9102" branch-rate="0" complexity="0">
+ <package name="dbrepo" line-rate="0.8972" branch-rate="0" complexity="0">
<classes>
- <class name="RestClient.py" filename="dbrepo/RestClient.py" complexity="0" line-rate="0.9102" branch-rate="0">
+ <class name="RestClient.py" filename="dbrepo/RestClient.py" complexity="0" line-rate="0.8972" branch-rate="0">
<methods/>
<lines>
<line number="1" hits="1"/>
@@ -902,6 +902,20 @@
<line number="1923" hits="1"/>
<line number="1924" hits="1"/>
<line number="1925" hits="1"/>
+ <line number="1927" hits="1"/>
+ <line number="1941" hits="0"/>
+ <line number="1942" hits="0"/>
+ <line number="1944" hits="0"/>
+ <line number="1945" hits="0"/>
+ <line number="1946" hits="0"/>
+ <line number="1947" hits="0"/>
+ <line number="1948" hits="0"/>
+ <line number="1949" hits="0"/>
+ <line number="1950" hits="0"/>
+ <line number="1951" hits="0"/>
+ <line number="1953" hits="0"/>
+ <line number="1954" hits="0"/>
+ <line number="1955" hits="0"/>
</lines>
</class>
<class name="__init__.py" filename="dbrepo/__init__.py" complexity="0" line-rate="1" branch-rate="0">
@@ -910,7 +924,7 @@
</class>
</classes>
</package>
- <package name="dbrepo.api" line-rate="0.959" branch-rate="0" complexity="0">
+ <package name="dbrepo.api" line-rate="0.9595" branch-rate="0" complexity="0">
<classes>
<class name="__init__.py" filename="dbrepo/api/__init__.py" complexity="0" line-rate="1" branch-rate="0">
<methods/>
@@ -1326,20 +1340,18 @@
<line number="502" hits="1"/>
<line number="505" hits="1"/>
<line number="506" hits="1"/>
- <line number="507" hits="1"/>
+ <line number="509" hits="1"/>
<line number="510" hits="1"/>
<line number="511" hits="1"/>
<line number="514" hits="1"/>
<line number="515" hits="1"/>
- <line number="516" hits="1"/>
- <line number="517" hits="1"/>
<line number="518" hits="1"/>
<line number="519" hits="1"/>
<line number="520" hits="1"/>
+ <line number="521" hits="1"/>
+ <line number="522" hits="1"/>
<line number="523" hits="1"/>
<line number="524" hits="1"/>
- <line number="525" hits="1"/>
- <line number="526" hits="1"/>
<line number="527" hits="1"/>
<line number="528" hits="1"/>
<line number="529" hits="1"/>
@@ -1348,24 +1360,24 @@
<line number="532" hits="1"/>
<line number="533" hits="1"/>
<line number="534" hits="1"/>
+ <line number="535" hits="1"/>
+ <line number="536" hits="1"/>
<line number="537" hits="1"/>
<line number="538" hits="1"/>
- <line number="539" hits="1"/>
- <line number="540" hits="1"/>
<line number="541" hits="1"/>
+ <line number="542" hits="1"/>
+ <line number="543" hits="1"/>
<line number="544" hits="1"/>
+ <line number="545" hits="1"/>
<line number="548" hits="1"/>
- <line number="549" hits="1"/>
- <line number="550" hits="1"/>
- <line number="551" hits="1"/>
+ <line number="552" hits="1"/>
+ <line number="553" hits="1"/>
<line number="554" hits="1"/>
+ <line number="555" hits="1"/>
<line number="558" hits="1"/>
- <line number="559" hits="1"/>
- <line number="560" hits="1"/>
+ <line number="562" hits="1"/>
<line number="563" hits="1"/>
<line number="564" hits="1"/>
- <line number="565" hits="1"/>
- <line number="566" hits="1"/>
<line number="567" hits="1"/>
<line number="568" hits="1"/>
<line number="569" hits="1"/>
@@ -1375,19 +1387,19 @@
<line number="573" hits="1"/>
<line number="574" hits="1"/>
<line number="575" hits="1"/>
+ <line number="576" hits="1"/>
+ <line number="577" hits="1"/>
<line number="578" hits="1"/>
<line number="579" hits="1"/>
- <line number="580" hits="1"/>
- <line number="581" hits="1"/>
<line number="582" hits="1"/>
<line number="583" hits="1"/>
<line number="584" hits="1"/>
<line number="585" hits="1"/>
<line number="586" hits="1"/>
+ <line number="587" hits="1"/>
+ <line number="588" hits="1"/>
<line number="589" hits="1"/>
<line number="590" hits="1"/>
- <line number="591" hits="1"/>
- <line number="592" hits="1"/>
<line number="593" hits="1"/>
<line number="594" hits="1"/>
<line number="595" hits="1"/>
@@ -1396,23 +1408,23 @@
<line number="598" hits="1"/>
<line number="599" hits="1"/>
<line number="600" hits="1"/>
+ <line number="601" hits="1"/>
+ <line number="602" hits="1"/>
<line number="603" hits="1"/>
<line number="604" hits="1"/>
<line number="607" hits="1"/>
<line number="608" hits="1"/>
- <line number="609" hits="1"/>
- <line number="610" hits="1"/>
<line number="611" hits="1"/>
+ <line number="612" hits="1"/>
+ <line number="613" hits="1"/>
<line number="614" hits="1"/>
<line number="615" hits="1"/>
- <line number="616" hits="1"/>
- <line number="617" hits="1"/>
+ <line number="618" hits="1"/>
+ <line number="619" hits="1"/>
<line number="620" hits="1"/>
<line number="621" hits="1"/>
<line number="624" hits="1"/>
<line number="625" hits="1"/>
- <line number="626" hits="1"/>
- <line number="627" hits="1"/>
<line number="628" hits="1"/>
<line number="629" hits="1"/>
<line number="630" hits="1"/>
@@ -1432,12 +1444,12 @@
<line number="644" hits="1"/>
<line number="645" hits="1"/>
<line number="646" hits="1"/>
+ <line number="647" hits="1"/>
+ <line number="648" hits="1"/>
<line number="649" hits="1"/>
<line number="650" hits="1"/>
<line number="653" hits="1"/>
<line number="654" hits="1"/>
- <line number="655" hits="1"/>
- <line number="656" hits="1"/>
<line number="657" hits="1"/>
<line number="658" hits="1"/>
<line number="659" hits="1"/>
@@ -1461,17 +1473,17 @@
<line number="677" hits="1"/>
<line number="678" hits="1"/>
<line number="679" hits="1"/>
+ <line number="680" hits="1"/>
+ <line number="681" hits="1"/>
<line number="682" hits="1"/>
<line number="683" hits="1"/>
- <line number="684" hits="1"/>
- <line number="685" hits="1"/>
<line number="686" hits="1"/>
<line number="687" hits="1"/>
<line number="688" hits="1"/>
+ <line number="689" hits="1"/>
+ <line number="690" hits="1"/>
<line number="691" hits="1"/>
<line number="692" hits="1"/>
- <line number="693" hits="1"/>
- <line number="694" hits="1"/>
<line number="695" hits="1"/>
<line number="696" hits="1"/>
<line number="697" hits="1"/>
@@ -1481,10 +1493,10 @@
<line number="701" hits="1"/>
<line number="702" hits="1"/>
<line number="703" hits="1"/>
+ <line number="704" hits="1"/>
+ <line number="705" hits="1"/>
<line number="706" hits="1"/>
<line number="707" hits="1"/>
- <line number="708" hits="1"/>
- <line number="709" hits="1"/>
<line number="710" hits="1"/>
<line number="711" hits="1"/>
<line number="712" hits="1"/>
@@ -1494,19 +1506,19 @@
<line number="716" hits="1"/>
<line number="717" hits="1"/>
<line number="718" hits="1"/>
+ <line number="719" hits="1"/>
+ <line number="720" hits="1"/>
<line number="721" hits="1"/>
<line number="722" hits="1"/>
- <line number="723" hits="1"/>
- <line number="724" hits="1"/>
<line number="725" hits="1"/>
+ <line number="726" hits="1"/>
+ <line number="727" hits="1"/>
<line number="728" hits="1"/>
<line number="729" hits="1"/>
- <line number="730" hits="1"/>
- <line number="731" hits="1"/>
+ <line number="732" hits="1"/>
+ <line number="733" hits="1"/>
<line number="734" hits="1"/>
<line number="735" hits="1"/>
- <line number="736" hits="1"/>
- <line number="737" hits="1"/>
<line number="738" hits="1"/>
<line number="739" hits="1"/>
<line number="740" hits="1"/>
@@ -1514,68 +1526,73 @@
<line number="742" hits="1"/>
<line number="743" hits="1"/>
<line number="744" hits="1"/>
+ <line number="745" hits="1"/>
+ <line number="746" hits="1"/>
<line number="747" hits="1"/>
<line number="748" hits="1"/>
- <line number="749" hits="1"/>
- <line number="750" hits="1"/>
<line number="751" hits="1"/>
+ <line number="752" hits="1"/>
+ <line number="753" hits="1"/>
<line number="754" hits="1"/>
<line number="755" hits="1"/>
- <line number="756" hits="1"/>
- <line number="757" hits="1"/>
+ <line number="758" hits="1"/>
+ <line number="759" hits="1"/>
<line number="760" hits="1"/>
<line number="761" hits="1"/>
<line number="764" hits="1"/>
<line number="765" hits="1"/>
- <line number="766" hits="1"/>
- <line number="767" hits="1"/>
<line number="768" hits="1"/>
<line number="769" hits="1"/>
+ <line number="770" hits="1"/>
+ <line number="771" hits="1"/>
<line number="772" hits="1"/>
<line number="773" hits="1"/>
<line number="774" hits="1"/>
- <line number="775" hits="1"/>
+ <line number="777" hits="1"/>
<line number="778" hits="1"/>
<line number="779" hits="1"/>
- <line number="782" hits="1"/>
+ <line number="780" hits="1"/>
<line number="783" hits="1"/>
<line number="784" hits="1"/>
<line number="785" hits="1"/>
<line number="786" hits="1"/>
+ <line number="787" hits="1"/>
+ <line number="788" hits="1"/>
<line number="789" hits="1"/>
+ <line number="792" hits="1"/>
<line number="793" hits="1"/>
<line number="794" hits="1"/>
<line number="795" hits="1"/>
- <line number="798" hits="1"/>
- <line number="802" hits="1"/>
+ <line number="796" hits="1"/>
+ <line number="799" hits="1"/>
<line number="803" hits="1"/>
- <line number="806" hits="1"/>
- <line number="807" hits="1"/>
+ <line number="804" hits="1"/>
+ <line number="805" hits="1"/>
<line number="808" hits="1"/>
- <line number="809" hits="1"/>
- <line number="810" hits="1"/>
+ <line number="812" hits="1"/>
<line number="813" hits="1"/>
- <line number="814" hits="1"/>
- <line number="815" hits="1"/>
<line number="816" hits="1"/>
<line number="817" hits="1"/>
+ <line number="818" hits="1"/>
+ <line number="819" hits="1"/>
<line number="820" hits="1"/>
- <line number="821" hits="1"/>
- <line number="822" hits="1"/>
+ <line number="823" hits="1"/>
+ <line number="824" hits="1"/>
<line number="825" hits="1"/>
<line number="826" hits="1"/>
<line number="827" hits="1"/>
<line number="830" hits="1"/>
<line number="831" hits="1"/>
<line number="832" hits="1"/>
- <line number="833" hits="1"/>
- <line number="834" hits="1"/>
+ <line number="835" hits="1"/>
+ <line number="836" hits="1"/>
<line number="837" hits="1"/>
- <line number="838" hits="1"/>
- <line number="839" hits="1"/>
<line number="840" hits="1"/>
<line number="841" hits="1"/>
+ <line number="842" hits="1"/>
+ <line number="843" hits="1"/>
<line number="844" hits="1"/>
+ <line number="847" hits="1"/>
<line number="848" hits="1"/>
<line number="849" hits="1"/>
<line number="850" hits="1"/>
@@ -1583,17 +1600,12 @@
<line number="854" hits="1"/>
<line number="858" hits="1"/>
<line number="859" hits="1"/>
- <line number="862" hits="1"/>
- <line number="866" hits="1"/>
- <line number="867" hits="1"/>
+ <line number="860" hits="1"/>
+ <line number="861" hits="1"/>
+ <line number="864" hits="1"/>
<line number="868" hits="1"/>
<line number="869" hits="1"/>
- <line number="870" hits="1"/>
- <line number="871" hits="1"/>
<line number="872" hits="1"/>
- <line number="873" hits="1"/>
- <line number="874" hits="1"/>
- <line number="875" hits="1"/>
<line number="876" hits="1"/>
<line number="877" hits="1"/>
<line number="878" hits="1"/>
@@ -1602,17 +1614,17 @@
<line number="881" hits="1"/>
<line number="882" hits="1"/>
<line number="883" hits="1"/>
+ <line number="884" hits="1"/>
+ <line number="885" hits="1"/>
<line number="886" hits="1"/>
+ <line number="887" hits="1"/>
+ <line number="888" hits="1"/>
+ <line number="889" hits="1"/>
<line number="890" hits="1"/>
<line number="891" hits="1"/>
<line number="892" hits="1"/>
<line number="893" hits="1"/>
- <line number="894" hits="1"/>
- <line number="895" hits="1"/>
<line number="896" hits="1"/>
- <line number="897" hits="1"/>
- <line number="898" hits="1"/>
- <line number="899" hits="1"/>
<line number="900" hits="1"/>
<line number="901" hits="1"/>
<line number="902" hits="1"/>
@@ -1637,69 +1649,69 @@
<line number="921" hits="1"/>
<line number="922" hits="1"/>
<line number="923" hits="1"/>
+ <line number="924" hits="1"/>
+ <line number="925" hits="1"/>
<line number="926" hits="1"/>
+ <line number="927" hits="1"/>
+ <line number="928" hits="1"/>
+ <line number="929" hits="1"/>
<line number="930" hits="1"/>
<line number="931" hits="1"/>
<line number="932" hits="1"/>
<line number="933" hits="1"/>
- <line number="934" hits="1"/>
- <line number="935" hits="1"/>
- <line number="938" hits="1"/>
+ <line number="936" hits="1"/>
+ <line number="940" hits="1"/>
+ <line number="941" hits="1"/>
<line number="942" hits="1"/>
<line number="943" hits="1"/>
+ <line number="944" hits="1"/>
<line number="945" hits="1"/>
- <line number="946" hits="1"/>
- <line number="949" hits="1"/>
+ <line number="948" hits="1"/>
+ <line number="952" hits="1"/>
<line number="953" hits="1"/>
- <line number="954" hits="1"/>
+ <line number="955" hits="1"/>
<line number="956" hits="1"/>
- <line number="957" hits="1"/>
<line number="959" hits="1"/>
- <line number="960" hits="1"/>
- <line number="962" hits="1"/>
<line number="963" hits="1"/>
+ <line number="964" hits="1"/>
<line number="966" hits="1"/>
+ <line number="967" hits="1"/>
+ <line number="969" hits="1"/>
<line number="970" hits="1"/>
- <line number="971" hits="1"/>
+ <line number="972" hits="1"/>
<line number="973" hits="1"/>
- <line number="974" hits="1"/>
- <line number="977" hits="1"/>
- <line number="978" hits="1"/>
- <line number="979" hits="1"/>
+ <line number="976" hits="1"/>
<line number="980" hits="1"/>
<line number="981" hits="1"/>
- <line number="982" hits="1"/>
<line number="983" hits="1"/>
<line number="984" hits="1"/>
- <line number="985" hits="1"/>
- <line number="986" hits="1"/>
<line number="987" hits="1"/>
<line number="988" hits="1"/>
<line number="989" hits="1"/>
+ <line number="990" hits="1"/>
+ <line number="991" hits="1"/>
<line number="992" hits="1"/>
<line number="993" hits="1"/>
<line number="994" hits="1"/>
<line number="995" hits="1"/>
+ <line number="996" hits="1"/>
+ <line number="997" hits="1"/>
<line number="998" hits="1"/>
<line number="999" hits="1"/>
<line number="1002" hits="1"/>
<line number="1003" hits="1"/>
<line number="1004" hits="1"/>
- <line number="1007" hits="1"/>
+ <line number="1005" hits="1"/>
<line number="1008" hits="1"/>
<line number="1009" hits="1"/>
<line number="1012" hits="1"/>
<line number="1013" hits="1"/>
- <line number="1016" hits="1"/>
+ <line number="1014" hits="1"/>
<line number="1017" hits="1"/>
<line number="1018" hits="1"/>
<line number="1019" hits="1"/>
- <line number="1020" hits="1"/>
- <line number="1021" hits="1"/>
<line number="1022" hits="1"/>
<line number="1023" hits="1"/>
- <line number="1024" hits="1"/>
- <line number="1025" hits="1"/>
<line number="1026" hits="1"/>
<line number="1027" hits="1"/>
<line number="1028" hits="1"/>
@@ -1707,6 +1719,8 @@
<line number="1030" hits="1"/>
<line number="1031" hits="1"/>
<line number="1032" hits="1"/>
+ <line number="1033" hits="1"/>
+ <line number="1034" hits="1"/>
<line number="1035" hits="1"/>
<line number="1036" hits="1"/>
<line number="1037" hits="1"/>
@@ -1715,8 +1729,6 @@
<line number="1040" hits="1"/>
<line number="1041" hits="1"/>
<line number="1042" hits="1"/>
- <line number="1043" hits="1"/>
- <line number="1044" hits="1"/>
<line number="1045" hits="1"/>
<line number="1046" hits="1"/>
<line number="1047" hits="1"/>
@@ -1734,6 +1746,8 @@
<line number="1059" hits="1"/>
<line number="1060" hits="1"/>
<line number="1061" hits="1"/>
+ <line number="1062" hits="1"/>
+ <line number="1063" hits="1"/>
<line number="1064" hits="1"/>
<line number="1065" hits="1"/>
<line number="1066" hits="1"/>
@@ -1742,8 +1756,6 @@
<line number="1069" hits="1"/>
<line number="1070" hits="1"/>
<line number="1071" hits="1"/>
- <line number="1072" hits="1"/>
- <line number="1073" hits="1"/>
<line number="1074" hits="1"/>
<line number="1075" hits="1"/>
<line number="1076" hits="1"/>
@@ -1751,6 +1763,8 @@
<line number="1078" hits="1"/>
<line number="1079" hits="1"/>
<line number="1080" hits="1"/>
+ <line number="1081" hits="1"/>
+ <line number="1082" hits="1"/>
<line number="1083" hits="1"/>
<line number="1084" hits="1"/>
<line number="1085" hits="1"/>
@@ -1761,8 +1775,6 @@
<line number="1090" hits="1"/>
<line number="1091" hits="1"/>
<line number="1092" hits="1"/>
- <line number="1093" hits="1"/>
- <line number="1094" hits="1"/>
<line number="1095" hits="1"/>
<line number="1096" hits="1"/>
<line number="1097" hits="1"/>
@@ -1771,6 +1783,8 @@
<line number="1100" hits="1"/>
<line number="1101" hits="1"/>
<line number="1102" hits="1"/>
+ <line number="1103" hits="1"/>
+ <line number="1104" hits="1"/>
<line number="1105" hits="1"/>
<line number="1106" hits="1"/>
<line number="1107" hits="1"/>
@@ -1781,7 +1795,7 @@
<line number="1112" hits="1"/>
<line number="1113" hits="1"/>
<line number="1114" hits="1"/>
- <line number="1115" hits="1"/>
+ <line number="1117" hits="1"/>
<line number="1118" hits="1"/>
<line number="1119" hits="1"/>
<line number="1120" hits="1"/>
@@ -1792,34 +1806,36 @@
<line number="1125" hits="1"/>
<line number="1126" hits="1"/>
<line number="1127" hits="1"/>
- <line number="1128" hits="1"/>
- <line number="1129" hits="1"/>
<line number="1130" hits="1"/>
<line number="1131" hits="1"/>
<line number="1132" hits="1"/>
<line number="1133" hits="1"/>
<line number="1134" hits="1"/>
<line number="1135" hits="1"/>
+ <line number="1136" hits="1"/>
+ <line number="1137" hits="1"/>
<line number="1138" hits="1"/>
<line number="1139" hits="1"/>
<line number="1140" hits="1"/>
<line number="1141" hits="1"/>
+ <line number="1142" hits="1"/>
+ <line number="1143" hits="1"/>
<line number="1144" hits="1"/>
<line number="1145" hits="1"/>
<line number="1146" hits="1"/>
<line number="1147" hits="1"/>
<line number="1148" hits="1"/>
- <line number="1151" hits="1"/>
+ <line number="1149" hits="1"/>
+ <line number="1152" hits="1"/>
+ <line number="1153" hits="1"/>
+ <line number="1154" hits="1"/>
<line number="1155" hits="1"/>
- <line number="1156" hits="1"/>
- <line number="1157" hits="1"/>
<line number="1158" hits="1"/>
<line number="1159" hits="1"/>
+ <line number="1160" hits="1"/>
+ <line number="1161" hits="1"/>
<line number="1162" hits="1"/>
- <line number="1163" hits="1"/>
- <line number="1166" hits="1"/>
- <line number="1167" hits="1"/>
- <line number="1168" hits="1"/>
+ <line number="1165" hits="1"/>
<line number="1169" hits="1"/>
<line number="1170" hits="1"/>
<line number="1171" hits="1"/>
@@ -1827,10 +1843,10 @@
<line number="1173" hits="1"/>
<line number="1176" hits="1"/>
<line number="1177" hits="1"/>
- <line number="1178" hits="1"/>
- <line number="1179" hits="1"/>
<line number="1180" hits="1"/>
<line number="1181" hits="1"/>
+ <line number="1182" hits="1"/>
+ <line number="1183" hits="1"/>
<line number="1184" hits="1"/>
<line number="1185" hits="1"/>
<line number="1186" hits="1"/>
@@ -1840,6 +1856,16 @@
<line number="1192" hits="1"/>
<line number="1193" hits="1"/>
<line number="1194" hits="1"/>
+ <line number="1195" hits="1"/>
+ <line number="1198" hits="1"/>
+ <line number="1199" hits="1"/>
+ <line number="1200" hits="1"/>
+ <line number="1201" hits="1"/>
+ <line number="1204" hits="1"/>
+ <line number="1205" hits="1"/>
+ <line number="1206" hits="1"/>
+ <line number="1207" hits="1"/>
+ <line number="1208" hits="1"/>
</lines>
</class>
<class name="exceptions.py" filename="dbrepo/api/exceptions.py" complexity="0" line-rate="1" branch-rate="0">
diff --git a/lib/python/tests/conftest.py b/lib/python/tests/conftest.py
index 09a89096744412d78861a21b193101de6ddb45dc..c906c18fa7c09a77baac9122c687d45f4037b586 100644
--- a/lib/python/tests/conftest.py
+++ b/lib/python/tests/conftest.py
@@ -40,7 +40,7 @@ def cleanup(request, session):
:return:
"""
logging.info("[fixture] clean schema")
- with open('./database.json', 'r') as f:
+ with open('./tests/opensearch/database.json', 'r') as f:
if session.get_client().indices.exists(index="database"):
session.get_client().indices.delete(index="database")
session.get_client().indices.create(index="database", body=json.load(f))