[db][tests] variables

db/test_variable_values.sql

@@ -0,0 +1,13 @@
+INSERT INTO var_value (type, address, value) VALUES
+('A', 10, 42),
+('A', 11, 24),
+('A', 10, 20),
+('A', 10, 0),
+('I', 5010, 42),
+('I', 5011, 24),
+('I', 5010, 20),
+('I', 5010, 0),
+('D', 10, 1),
+('D', 11, 1),
+('D', 10, 1),
+('D', 10, 0);

db/test_variables.sql

@@ -0,0 +1,13 @@
+INSERT INTO variable (type, address, unit) VALUES
+('A', 10, 'deg'),
+('A', 11, 'deg'),
+('A', 12, 'deg'),
+('A', 13, 'deg'),
+('I', 5010, 'deg'),
+('I', 5011, 'deg'),
+('I', 5012, 'deg'),
+('I', 5013, 'deg'),
+('D', 10, 'bit'),
+('D', 11, 'bit'),
+('D', 12, 'bit'),
+('D', 13, 'bit');

pyheatpump/models/variable.py

@@ -1,12 +1,14 @@
 from pyheatpump.db import RowClass
 from pyheatpump.db import sql
+from datetime import date
 
-class VariableType(RowClass):
-    slabel: str = None
-    label: str = None
+from .variable_type import VariableType
+
+class Variable(RowClass):
+    address: int = None
+    unit: str = None
+    last_update: date = None
     type: str = None
-    start_address: int = None
-    end_address: int = None
  
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -14,5 +16,12 @@ class VariableType(RowClass):
     @staticmethod
     def getall():
         return dict([
-            (row['label'], VariableType(**dict(row)))
-            for row in sql('SELECT * FROM var_type') ])
+            (row.slabel, Variable.getall_of_type(row.slabel))
+            for row in VariableType.getall().values()
+        ])
+
+    def getall_of_type(type: str):
+        return [
+            row['address'] for row in
+            sql(f"SELECT address FROM variable WHERE type LIKE '{type}'")
+        ]

pyheatpump/variable_types.py

@@ -12,8 +12,6 @@ import json
 from pyheatpump.db import sql
 from pyheatpump.models.variable_type import VariableType
 
-def variable_types():
-    assert type(VariableType.getall()) == list
 
 async def get_variable_types(request):
     return JSONResponse(dict([
@@ -21,6 +19,7 @@ async def get_variable_types(request):
         for key, val in VariableType.getall().items()
     ]))
 
+
 async def set_variable_types(request):
 
     body = json.loads(await request.json())
@@ -35,6 +34,7 @@ async def set_variable_types(request):
 
     return PlainTextResponse('OK')
 
+
 async def variable_types_routes(request, *args, **kwargs):
     if request['method'] == 'GET':
         return await get_variable_types(request)

pyheatpump/variables.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+import os
+from datetime import datetime
+from configparser import ConfigParser
+from starlette.routing import Route, Router
+from starlette.responses import PlainTextResponse, JSONResponse
+from pprint import pprint
+import uvicorn
+import json
+
+# pyHeatpump modules
+from pyheatpump.db import sql
+from pyheatpump.models.variable import Variable
+
+
+async def get_variables(request):
+    return JSONResponse(Variable.getall())
+
+
+async def set_variables(request):
+
+    body = json.loads(await request.json())
+
+    """
+    for var_type_label, var_type_values in body.items():
+        vt = VariableType(label=var_type_label)
+        for key, val in var_type_values.items():
+            if key in [ 'start_address', 'end_address' ]:
+                setattr(vt, key, val)
+
+        vt.save()
+
+    """
+    return PlainTextResponse('OK')
+
+
+async def variables_routes(request, *args, **kwargs):
+    if request['method'] == 'GET':
+        return await get_variables(request)
+    elif request['method'] == 'POST':
+        return await set_variables(request)
+
+
+ROUTES=[
+    Route('/', variables_routes, methods=['GET', 'POST'])
+]
+
+app = Router(routes=ROUTES)
+
+if __name__ == '__main__':
+    uvicorn.run('pyHeatpump:conf.app',
+        host='127.0.0.1',
+        port=8000)

tests/test_variable.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+import pytest
+from starlette.authentication import UnauthenticatedUser
+from starlette.testclient import TestClient
+from unittest.mock import patch, MagicMock
+from pprint import pprint
+import json
+from tempfile import mkstemp
+from configparser import ConfigParser
+import os
+import sys
+
+from pyheatpump.conf import config
+from pyheatpump.db import initialize, connect
+from pyheatpump.variables import app, get_variables, set_variables, ROUTES
+
+@pytest.fixture(scope='module')
+def set_test_db():
+    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
+    print(f'Will store database in {tmpdb}')
+    config['heatpump']['database'] = tmpdb
+    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
+        sys.exit(-1)
+
+    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
+        sys.exit(-1)
+
+    yield
+
+    os.unlink(tmpdb)
+
+
+def test_get_(set_test_db):
+    c = TestClient(app)
+    r = c.get('/')
+    assert r.status_code == 200
+
+    d_resp = json.loads(r.content.decode())
+    assert 'A' in d_resp.keys()
+    assert 10 in d_resp['A']
+    assert len(d_resp['A']) == 4
+    assert len(d_resp['I']) == 4
+    assert len(d_resp['D']) == 4
+
+
+@pytest.mark.skip
+def test_set_(set_test_db):
+    c = TestClient(app)
+    r = c.post('/')
+    assert r.status_code == 200

tests/test_variable_types.py

@@ -19,7 +19,7 @@ from pyheatpump.variable_types import app, get_variable_types, set_variable_type
 def set_test_db():
     _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
     print(f'Will store database in {tmpdb}')
-    config['heatpump']['database'] = tmpdb 
+    config['heatpump']['database'] = tmpdb
     if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
         sys.exit(-1)
 

tests/test_variable_values.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+import pytest
+from starlette.authentication import UnauthenticatedUser
+from starlette.testclient import TestClient
+from unittest.mock import patch, MagicMock
+from pprint import pprint
+import json
+from tempfile import mkstemp
+from configparser import ConfigParser
+import os
+import sys
+
+from pyheatpump.conf import config
+from pyheatpump.db import initialize, connect
+from pyheatpump.variables import app, get_variables, set_variables, ROUTES
+
+@pytest.fixture(scope='module')
+def set_test_db():
+    _, tmpdb = mkstemp(suffix='.db', dir=os.getcwd(), )
+    print(f'Will store database in {tmpdb}')
+    config['heatpump']['database'] = tmpdb
+    if not initialize(os.path.join(os.getcwd(), 'db/pyheatpump.sql')):
+        sys.exit(-1)
+
+    if not initialize(os.path.join(os.getcwd(), 'db/test_variables.sql')):
+        sys.exit(-1)
+
+    yield
+
+    os.unlink(tmpdb)
+
+
+def test_get_(set_test_db):
+    c = TestClient(app)
+    r = c.get('/')
+    assert r.status_code == 200
+
+    d_resp = json.loads(r.content.decode())
+    assert 'A' in d_resp.keys()
+    assert 10 in d_resp['A']
+    assert len(d_resp['A']) == 4
+    assert len(d_resp['I']) == 4
+    assert len(d_resp['D']) == 4
+
+
+@pytest.mark.skip
+def test_set_(set_test_db):
+    c = TestClient(app)
+    r = c.post('/')
+    assert r.status_code == 200