More WIP

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

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

dbrepo-search-service/friendly_names_overrides.json

+{
+  "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

dbrepo-search-service/init/tests/test_app.py

+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))

dbrepo-search-service/tests/rsa/rs256.key

+-----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

dbrepo-search-service/tests/rsa/rsa256.pkey

+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END PUBLIC KEY-----

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))