add new config parameter for ohsomedb connection

Author: matthiasschaub

config/sample.config.yaml

@@ -1,5 +1,10 @@
 ---
 # Database connection parameters;
+ohsomedb_host: localhost
+ohsomedb_port: 5432
+ohsomedb_db: postgres
+ohsomedb_user: postgres
+ohsomedb_password: mylocalpassword
 postgres_host: localhost
 postgres_port: 5445
 postgres_db: oqapi

docs/configuration.md

@@ -8,7 +8,12 @@ Below is a table listing all possible configuration variables.
 
 | Configuration Variable Name | Environment Variable Name       | Configuration File Name   | Default Value                  | Description                                                                 |
 | --------------------------- | ------------------------------- | ------------------------- | ------------------------------ | --------------------------------------------------------------------------- |
-| Postgres Host               | `POSTGRES_HOST`                 | `postgres_host`           | `localhost`                    | Database connection parameter                                               |
+| ohsomeDB Host               | `OHSOMEDB_HOST`                 | `ohsomedb_host`           | `localhost`                    | ohsomeDB database connection parameter                                      |
+| ohsomeDB Port               | `OHSOMEDB_PORT`                 | `ohsomedb_port`           | `5432`                         | "                                                                           |
+| ohsomeDB Database           | `OHSOMEDB_DB`                   | `ohsomedb_db`             | `postgres`                     | "                                                                           |
+| ohsomeDB User               | `OHSOMEDB_USER`                 | `ohsomedb_user`           | `postgres`                     | "                                                                           |
+| ohsomeDB Password           | `OHSOMEDB_PASSWORD`             | `ohsomedb_password`       | `mylocalpassword`              | "                                                                           |
+| Postgres Host               | `POSTGRES_HOST`                 | `postgres_host`           | `localhost`                    | Postgres database connection parameter                                      |
 | Postgres Port               | `POSTGRES_PORT`                 | `postgres_port`           | `5445`                         | "                                                                           |
 | Postgres Database           | `POSTGRES_DB`                   | `postgres_db`             | `oqapi`                        | "                                                                           |
 | Postgres User               | `POSTGRES_USER`                 | `postgres_user`           | `oqapi`                        | "                                                                           |

ohsome_quality_api/config.py

@@ -24,6 +24,11 @@ def get_config_path() -> str:
 
 def load_config_default() -> dict:
     return {
+        "ohsomdb_host": "localhost",
+        "ohsomdb_port": 5432,
+        "ohsomdb_db": "postgres",
+        "ohsomdb_user": "postgres",
+        "ohsomdb_password": "mylocalpassword",
         "postgres_host": "localhost",
         "postgres_port": 5445,
         "postgres_db": "oqapi",
@@ -56,6 +61,11 @@ def load_config_from_file(path: str) -> dict:
 def load_config_from_env() -> dict:
     """Load configuration from environment variables."""
     cfg = {
+        "ohsomedb_host": os.getenv("OHSOMEDB_HOST"),
+        "ohsomedb_port": os.getenv("OHSOMEDB_PORT"),
+        "ohsomedb_db": os.getenv("OHSOMEDB_DB"),
+        "ohsomedb_user": os.getenv("OHSOMEDB_USER"),
+        "ohsomedb_password": os.getenv("OHSOMEDB_PASSWORD"),
         "postgres_host": os.getenv("POSTGRES_HOST"),
         "postgres_port": os.getenv("POSTGRES_PORT"),
         "postgres_db": os.getenv("POSTGRES_DB"),

tests/unittests/fixtures/config.yaml

@@ -1,5 +1,10 @@
 ---
 # Database connection parameters;
+ohsomedb_host: localhost
+ohsomedb_port: 5432
+ohsomedb_db: postgres
+ohsomedb_user: postgres
+ohsomedb_password: mylocalpassword
 postgres_host: localhost
 postgres_port: 5445
 postgres_db: oqapi

tests/unittests/test_config.py

@@ -9,6 +9,11 @@
 class TestConfig(unittest.TestCase):
     def setUp(self):
         self.keys = {
+            "ohsomedb_host",
+            "ohsomedb_port",
+            "ohsomedb_db",
+            "ohsomedb_user",
+            "ohsomedb_password",
             "postgres_host",
             "postgres_port",
             "postgres_db",
@@ -46,7 +51,7 @@ def test_get_config_path_set_env(self):
     def test_config_default(self):
         cfg = config.load_config_default()
         self.assertIsInstance(cfg, dict)
-        self.assertEqual(self.keys, cfg.keys())
+        self.assertEqual(list(self.keys).sort(), list(cfg.keys()).sort())
 
     @mock.patch.dict(
         "os.environ",
@@ -89,7 +94,7 @@ def test_load_config_from_env_set(self):
     def test_get_config(self):
         cfg = config.get_config()
         self.assertIsInstance(cfg, MappingProxyType)
-        self.assertEqual(self.keys, cfg.keys())
+        self.assertEqual(list(self.keys).sort(), list(cfg.keys()).sort())
 
     @mock.patch.dict("os.environ", {}, clear=True)
     def test_get_config_value(self):
@@ -105,7 +110,7 @@ def test_get_config_value(self):
     def test_get_config_env_empty_str(self):
         cfg = config.get_config()
         self.assertIsInstance(cfg, MappingProxyType)
-        self.assertEqual(self.keys, cfg.keys())
+        self.assertEqual(list(self.keys).sort(), list(cfg.keys()).sort())
 
     @mock.patch.dict("os.environ", {}, clear=True)
     def test_get_data_dir_unset_env(self):