rtdip · GBBBAS · Feb 20, 2024 · Feb 20, 2024
diff --git a/src/api/v1/sql.py b/src/api/v1/sql.py
@@ -86,8 +86,8 @@ def sql_get(
 
 
 @api_v1_router.post(
-    path="/sql",
-    name="Sql POST",
+    path="/sql/execute",
+    name="Sql Execute POST",
     description=post_description,
     tags=["SQL"],
     dependencies=[Depends(oauth2_scheme)],

diff --git a/tests/api/v1/api_test_objects.py b/tests/api/v1/api_test_objects.py
@@ -62,6 +62,14 @@
 RAW_MOCKED_PARAMETER_ERROR_DICT = RAW_MOCKED_PARAMETER_DICT.copy()
 RAW_MOCKED_PARAMETER_ERROR_DICT.pop("start_date")
 
+SQL_POST_MOCKED_PARAMETER_DICT = BASE_MOCKED_PARAMETER_DICT.copy()
+SQL_POST_MOCKED_PARAMETER_DICT["limit"] = 100
+SQL_POST_MOCKED_PARAMETER_DICT["offset"] = 100
+
+
+SQL_POST_BODY_MOCKED_PARAMETER_DICT = {}
+SQL_POST_BODY_MOCKED_PARAMETER_DICT["sql_statement"] = "SELECT * FROM 1"
+
 RESAMPLE_MOCKED_PARAMETER_DICT = RAW_MOCKED_PARAMETER_DICT.copy()
 RESAMPLE_MOCKED_PARAMETER_ERROR_DICT = RAW_MOCKED_PARAMETER_ERROR_DICT.copy()
 

diff --git a/tests/api/v1/test_api_sql.py b/tests/api/v1/test_api_sql.py
@@ -0,0 +1,115 @@
+# Copyright 2022 RTDIP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import pytest
+from pytest_mock import MockerFixture
+import pandas as pd
+import numpy as np
+from datetime import datetime
+from tests.api.v1.api_test_objects import (
+    SQL_POST_MOCKED_PARAMETER_DICT,
+    SQL_POST_BODY_MOCKED_PARAMETER_DICT,
+    mocker_setup,
+    TEST_HEADERS,
+    BASE_URL,
+)
+from pandas.io.json import build_table_schema
+from httpx import AsyncClient
+from src.api.v1 import app
+
+MOCK_METHOD = "src.sdk.python.rtdip_sdk.queries.sql.sql_query.SQLQueryBuilder.get"
+MOCK_API_NAME = "/api/v1/sql/execute"
+
+pytestmark = pytest.mark.anyio
+
+
+async def test_api_raw_post_success(mocker: MockerFixture):
+    test_data = pd.DataFrame(
+        {
+            "EventTime": [datetime.utcnow()],
+            "TagName": ["TestTag"],
+            "Status": ["Good"],
+            "Value": [1.01],
+        }
+    )
+    mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
+
+    async with AsyncClient(app=app, base_url=BASE_URL) as ac:
+        response = await ac.post(
+            MOCK_API_NAME,
+            headers=TEST_HEADERS,
+            params=SQL_POST_MOCKED_PARAMETER_DICT,
+            json=SQL_POST_BODY_MOCKED_PARAMETER_DICT,
+        )
+    actual = response.text
+    expected = test_data.to_json(orient="table", index=False, date_unit="us")
+    expected = (
+        expected.rstrip("}") + ',"pagination":{"limit":100,"offset":100,"next":null}}'
+    )
+
+    assert response.status_code == 200
+    assert actual == expected
+
+
+async def test_api_raw_post_validation_error(mocker: MockerFixture):
+    test_data = pd.DataFrame(
+        {
+            "EventTime": [datetime.utcnow()],
+            "TagName": ["TestTag"],
+            "Status": ["Good"],
+            "Value": [1.01],
+        }
+    )
+    mocker = mocker_setup(mocker, MOCK_METHOD, test_data)
+
+    async with AsyncClient(app=app, base_url=BASE_URL) as ac:
+        response = await ac.post(
+            MOCK_API_NAME,
+            headers=TEST_HEADERS,
+            params=SQL_POST_MOCKED_PARAMETER_DICT,
+            json={},
+        )
+    actual = response.text
+
+    assert response.status_code == 422
+    assert (
+        actual
+        == '{"detail":[{"type":"missing","loc":["body","sql_statement"],"msg":"Field required","input":{},"url":"https://errors.pydantic.dev/2.4/v/missing"}]}'
+    )
+
+
+async def test_api_raw_post_error(mocker: MockerFixture):
+    test_data = pd.DataFrame(
+        {
+            "EventTime": [datetime.utcnow()],
+            "TagName": ["TestTag"],
+            "Status": ["Good"],
+            "Value": [1.01],
+        }
+    )
+    mocker = mocker_setup(
+        mocker, MOCK_METHOD, test_data, Exception("Error Connecting to Database")
+    )
+
+    async with AsyncClient(app=app, base_url=BASE_URL) as ac:
+        response = await ac.post(
+            MOCK_API_NAME,
+            headers=TEST_HEADERS,
+            params=SQL_POST_MOCKED_PARAMETER_DICT,
+            json=SQL_POST_BODY_MOCKED_PARAMETER_DICT,
+        )
+    actual = response.text
+
+    assert response.status_code == 400
+    assert actual == '{"detail":"Error Connecting to Database"}'