ucampostgresvro 0.1.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

ucampostgresvro/__init__.py

@@ -1 +1 @@
-VERSION = "0.1.1"
+VERSION = "0.2.0"

ucampostgresvro/__main__.py

@@ -1,12 +1,11 @@
 import logging
 import sys
-from typing import Dict
 
+# from datetime import datetime
 from ucampostgresvro import VERSION, utils
 from ucampostgresvro.DBA import DB
 from ucampostgresvro.exceptions import DbException
 from ucampostgresvro.secrets import password
-from ucampostgresvro.tools import DEFAULT_TABLES
 
 
 def setloggerdetail():
@@ -21,52 +20,6 @@ def setloggerdetail():
     return LOG
 
 
-def pre_setupconfig(db_params: Dict[str, str]) -> bool:
-    """Create the Database
-
-    Args:
-        db_params (Dict[str, str]): provide parameters for DB connection.
-
-    Returns:
-        bool: True if creation of database is suceess else False
-    """
-    result = []
-    if not utils.check_table_exists(DEFAULT_TABLES.get("user"), db_params):
-        result.append(utils.create_user_table(DEFAULT_TABLES.get("user"), db_params))
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("deploymentid"), db_params):
-        result.append(
-            utils.create_deployment_table(DEFAULT_TABLES.get("deploymentid"), db_params)
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("proj"), db_params):
-        result.append(
-            utils.create_project_table(
-                DEFAULT_TABLES.get("proj"), DEFAULT_TABLES.get("user"), db_params
-            )
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("grant"), db_params):
-        result.append(
-            utils.create_grant_table(
-                DEFAULT_TABLES.get("grant"), DEFAULT_TABLES.get("user"), db_params
-            )
-        )
-
-    if not utils.check_table_exists(DEFAULT_TABLES.get("costing"), db_params):
-        result.append(
-            utils.create_costing_table(
-                DEFAULT_TABLES.get("costing"),
-                DEFAULT_TABLES.get("deploymentid"),
-                DEFAULT_TABLES.get("proj"),
-                DEFAULT_TABLES.get("grant"),
-                db_params,
-            )
-        )
-
-    return False not in result
-
-
 def main():
     LOG = setloggerdetail()
     LOG.info(f"VERSION : {VERSION}")
@@ -81,50 +34,79 @@ def main():
     }
     db = DB(db_params)
 
-    if not pre_setupconfig(db_params):
+    if not utils.pre_setupconfig(db_params):
         raise DbException("ERROR: Tables are not created successfully")
 
     # db.insert_vrauser("ll220", "len")
     # print(db.get_vrauser("ll220"))
+    # print(db.get_vrauser_primary_key("ll220"))
     # db.update_vrauser("ll220", "bda20", 'Ben Argyle')
     # print(db.get_vrauser())
     # db.remove_vrauser('bda20')
+    # print(db.get_vrauser_by_id(2))
     # print(db.get_vrauser())
 
     # db.insert_deployment_id("1231ee112ad11212")
+    # print(db.get_deployment_id("1231ee112ad11212"))
+    # print(db.get_deployment_id_primary_key("1231ee112ad11212"))
     # db.update_deployment_id("1231ee112ad11212", "1231a")
     # print(db.get_deployment_id("1231a"))
     # db.remove_deployment_id('1231a')
+    # print(db.get_deployment_id())
     # db.insert_deployment_id("123")
     # print(db.get_deployment_id())
+    # print(db.get_deployment_id_by_id(2))
+    # print(db.get_deployment_id_primary_key("123"))
 
-    # print(db.get_project())
-    # db.insert_project("0001",1,100.0)
     # db.insert_project("0101",2,100.0)
-    # db.update_project("0001", "0002", 1, 200)
-    # db.remove_project("0002")
-    # db.insert_project("0001",1,100.0)
-    # db.insert_project("0002",1,200.0)
-    # print(db.get_project("0002",1,200))
+    # db.insert_project("0001",2,100.0)
+    # print(db.get_project())
+    # db.update_project(2, "0002", 2, 200)
+    # print(db.get_project())
+    # db.remove_project(1)
+    # print(db.get_project())
+    # db.insert_project("2001",2,100.0)
+    # db.insert_project("2003",2,200.0)
+    # db.insert_project("2001",2,100.0)
+    # print(db.get_project("2001"))
+    # print(db.get_project_by_id(6))
+    # print(db.get_project_primary_key("2001"))
+    # print(db.get_project_primary_key("2001",  datetime(2025, 1, 22, 15, 55, 25, 95698)))
+    # print(db.get_project())
 
     # print(db.get_grant())
-    # db.insert_grant("0001",1,100.0)
-    # db.update_grant("0001", "0002", 1, 200)
+    # db.insert_grant("0001",2,100.0)
+    # print(db.get_grant())
+    # db.update_grant(2, "0002", 2, 200)
     # print(db.get_grant())
-    # db.remove_grant("0002")
+    # db.insert_grant("2001",2,100.0)
+    # db.insert_grant("2003",2,200.0)
+    # db.insert_grant("2001",2,100.0)
     # print(db.get_grant())
-    # db.insert_grant("0001",1,100.0)
-    # db.insert_grant("0002",1,200.0)
-    # print(db.get_grant("0002",1,200))
+    # print(db.get_grant())
+    # print(db.get_grant("2001"))
+    # print(db.get_grant_primary_key("2001"))
+    # print(db.get_grant_by_id(5))
+    # print(db.get_grant_primary_key("2001",
+    #                                datetime(2025, 1, 22, 18, 17, 25, 95698)
+    #                                )
+    #       )
+    # print(db.get_project())
+    # db.remove_grant(1)
 
+    # db.insert_costing(2, "Initial Resource", project_id=2, grant_id=None)
+    # db.insert_costing(2, "Initial Resource", project_id=None, grant_id=2)
     # print(db.get_costing())
-    # db.insert_costing(1, "Initial Resource", project_id=2, grant_id=None)
-    # db.insert_costing(1, "Initial Resource", project_id=None, grant_id=1)
-    # db.update_costing(1, "Duration Expansion", old_grant_id=None,
-    #                 old_project_id=2, grant_id=None, project_id=2)
     # print(db.get_costing())
+    # print(db.get_costing(2, "Initial Resource", 2)) # project
+    # print(db.get_costing(2, "Initial Resource", None, 2)) # Grant
+    # print(db.get_costing(3, "Duration Expansion", None, 2)) # Grant
+    # # print(db.get_costing_primary_key(2, "Initial Resource", 2)) # project
+    # print(db.get_costing_primary_key(2, "Initial Resource", None, 2)) #Grant
+    # db.update_costing(3, 2, "Duration Expansion", new_grant_id=None, new_project_id=2)
     # print(db.get_costing())
-    # db.remove_costing(1, "Duration Expansion", 4, None)
+    # print(db.get_costing_by_id(3))
+    # db.remove_costing(4)
     # print(db.get_costing())
 
     db.closedb()

ucampostgresvro/tests/dbconnect.py

@@ -2,9 +2,9 @@ import os
 
 
 db_params = {
-    "dbname": os.environ['POSTGRES_DB'],
-    "user": os.environ['POSTGRES_USER'],
-    "password": os.environ['POSTGRES_PASSWORD'],
-    "host": os.environ['POSTGRES_HOST'],
-    "port": os.environ['POSTGRES_PORT']
+    "dbname": os.environ["POSTGRES_DB"],
+    "user": os.environ["POSTGRES_USER"],
+    "password": os.environ["POSTGRES_PASSWORD"],
+    "host": os.environ["POSTGRES_HOST"],
+    "port": os.environ["POSTGRES_PORT"],
 }

ucampostgresvro/tests/test_DB.py

@@ -38,6 +38,14 @@ def test_user_fetchall(user_db_fixture):
     assert info[1][1] == "im532"
 
 
+def test_user_fetch_by_id(user_db_fixture):
+    db = user_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    db.insert_vrauser("im532", "Ishan", tables.get("user"))
+    info = db.get_vrauser_by_id(2, tables.get("user"))
+    assert info[1] == "im532"
+
+
 def test_user_fetch_one(user_db_fixture):
     db = user_db_fixture
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
@@ -47,6 +55,14 @@ def test_user_fetch_one(user_db_fixture):
     assert info[0][1] == "im530"
 
 
+def test_user_fetch_primary_key_crsid(user_db_fixture):
+    db = user_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    db.insert_vrauser("im532", "Ishan", tables.get("user"))
+    info = db.get_vrauser_primary_key("im532", tables.get("user"))
+    assert info == 2
+
+
 def test_deployment_insertion(deploymentid_db_fixture):
     db = deploymentid_db_fixture
     result = db.insert_deployment_id("121212", tables.get("deploymentid"))
@@ -84,6 +100,14 @@ def test_deployment_fetchall(deploymentid_db_fixture):
     assert info[1][1] == "1256"
 
 
+def test_deployment_fetch_by_id(deploymentid_db_fixture):
+    db = deploymentid_db_fixture
+    db.insert_deployment_id("1212", tables.get("deploymentid"))
+    db.insert_deployment_id("1256", tables.get("deploymentid"))
+    info = db.get_deployment_id_by_id(2, tables.get("deploymentid"))
+    assert info[1] == "1256"
+
+
 def test_deployment_fetch_one(deploymentid_db_fixture):
     db = deploymentid_db_fixture
     db.insert_deployment_id("1212", tables.get("deploymentid"))
@@ -93,6 +117,14 @@ def test_deployment_fetch_one(deploymentid_db_fixture):
     assert info[0][1] == "1256"
 
 
+def test_deployment_fetch_primary_key_deployment(deploymentid_db_fixture):
+    db = deploymentid_db_fixture
+    db.insert_deployment_id("1212", tables.get("deploymentid"))
+    db.insert_deployment_id("1256", tables.get("deploymentid"))
+    info = db.get_deployment_id_primary_key("1256", tables.get("deploymentid"))
+    assert info == 2
+
+
 def test_proj_insertion(project_db_fixture):
     db = project_db_fixture
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
@@ -109,13 +141,13 @@ def test_proj_update(project_db_fixture):
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
     result = db.update_project(
-        "123abc", "9876xyz", users[0][0], 220.0, tables.get("proj")
+        1, "9876xyz", users[0][0], 220.0, tables.get("proj")
     )
     info = db.get_project(None, tables.get("proj"))
     assert len(info) == 1
     assert result
-    assert info[0][1] == "9876xyz"
-    assert info[0][3] == 220.0
+    assert info[0][2] == "9876xyz"
+    assert info[0][4] == 220.0
 
 
 def test_proj_remove(project_db_fixture):
@@ -123,8 +155,8 @@ def test_proj_remove(project_db_fixture):
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
-    info = db.get_project(None, tables.get("proj"))
-    result = db.remove_project("123abc", tables.get("proj"))
+    prj = db.get_project(None, tables.get("proj"))
+    result = db.remove_project(prj[0][0], tables.get("proj"))
     info = db.get_project(None, tables.get("proj"))
     assert result
     assert len(info) == 0
@@ -138,8 +170,8 @@ def test_proj_fetchall(project_db_fixture):
     db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
     info = db.get_project(None, tables.get("proj"))
     assert len(info) == 2
-    assert info[0][1] == "123abc"
-    assert info[1][1] == "123xyz"
+    assert info[0][2] == "123abc"
+    assert info[1][2] == "123xyz"
 
 
 def test_proj_fetch_one(project_db_fixture):
@@ -150,7 +182,27 @@ def test_proj_fetch_one(project_db_fixture):
     db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
     info = db.get_project("123xyz", tables.get("proj"))
     assert len(info) == 1
-    assert info[0][1] == "123xyz"
+    assert info[0][2] == "123xyz"
+
+
+def test_proj_fetch_by_id(project_db_fixture):
+    db = project_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
+    info = db.get_project_by_id(2, tables.get("proj"))
+    assert info[2] == "123xyz"
+
+
+def test_proj_fetch_primary_key(project_db_fixture):
+    db = project_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    db.insert_project("123xyz", users[0][0], 200.0, tables.get("proj"))
+    info = db.get_project_primary_key("123xyz", None, tables.get("proj"))
+    assert info == 2
 
 
 def test_grant_insertion(grant_db_fixture):
@@ -169,13 +221,13 @@ def test_grant_update(grant_db_fixture):
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
     result = db.update_grant(
-        "123abc", "9876xyz", users[0][0], 220.0, tables.get("grant")
+        1, "9876xyz", users[0][0], 220.0, tables.get("grant")
     )
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 1
     assert result
-    assert info[0][1] == "9876xyz"
-    assert info[0][3] == 220.0
+    assert info[0][2] == "9876xyz"
+    assert info[0][4] == 220.0
 
 
 def test_grant_remove(grant_db_fixture):
@@ -183,7 +235,7 @@ def test_grant_remove(grant_db_fixture):
     db.insert_vrauser("im530", "Ishan", tables.get("user"))
     users = db.get_vrauser(None, None, tables.get("user"))
     db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
-    result = db.remove_grant("123abc", tables.get("grant"))
+    result = db.remove_grant(1, tables.get("grant"))
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 0
     assert result
@@ -197,8 +249,8 @@ def test_grant_fetchall(grant_db_fixture):
     db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
     info = db.get_grant(None, tables.get("grant"))
     assert len(info) == 2
-    assert info[0][1] == "123abc"
-    assert info[1][1] == "123xyz"
+    assert info[0][2] == "123abc"
+    assert info[1][2] == "123xyz"
 
 
 def test_grant_fetch_one(grant_db_fixture):
@@ -209,7 +261,27 @@ def test_grant_fetch_one(grant_db_fixture):
     db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
     info = db.get_grant("123xyz", tables.get("grant"))
     assert len(info) == 1
-    assert info[0][1] == "123xyz"
+    assert info[0][2] == "123xyz"
+
+
+def test_grant_fetch_by_id(grant_db_fixture):
+    db = grant_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
+    db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
+    info = db.get_grant_by_id(2, tables.get("grant"))
+    assert info[2] == "123xyz"
+
+
+def test_grant_primary_key(grant_db_fixture):
+    db = grant_db_fixture
+    db.insert_vrauser("im530", "Ishan", tables.get("user"))
+    users = db.get_vrauser(None, None, tables.get("user"))
+    db.insert_grant("123abc", users[0][0], 100.0, tables.get("grant"))
+    db.insert_grant("123xyz", users[0][0], 200.0, tables.get("grant"))
+    info = db.get_grant_primary_key("123xyz", None, tables.get("grant"))
+    assert info == 2
 
 
 def test_costing_insertion(costing_db_fixture):
@@ -249,12 +321,10 @@ def test_costing_update(costing_db_fixture):
         deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
     )
 
-    info = db.get_costing(None, None, None, None, tables.get("costing"))
     result = db.update_costing(
+        1,
         deploy[0][0],
         "Resource Expansion",
-        None,
-        proj[0][0],
         grant[0][0],
         None,
         tables.get("costing"),
@@ -281,9 +351,7 @@ def test_costing_remove(costing_db_fixture):
         deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
     )
 
-    result = db.remove_costing(
-        deploy[0][0], "Resource Expansion", proj[0][0], None, tables.get("costing")
-    )
+    result = db.remove_costing(1, tables.get("costing"))
 
     info = db.get_costing(None, None, None, None, tables.get("costing"))
     assert len(info) == 0
@@ -337,3 +405,43 @@ def test_costing_fetch_one(costing_db_fixture):
     )
     assert len(info) == 1
     assert info[0][2] == "Duration Expansion"
+
+
+def test_costing_fetch_by_id(costing_db_fixture):
+    db = costing_db_fixture
+    db.insert_vrauser("im530", "Ishan", "test_user")
+    users = db.get_vrauser(None, None, tables.get("user"))
+
+    db.insert_deployment_id("121212", tables.get("deploymentid"))
+    deploy = db.get_deployment_id(None, tables.get("deploymentid"))
+
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    proj = db.get_project(None, tables.get("proj"))
+
+    db.insert_costing(
+        deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing")
+    )
+
+    info = db.get_costing_by_id(1, tables.get("costing"))
+    assert info[1] == deploy[0][0]
+    assert info[2] == "Duration Expansion"
+    assert info[3] == proj[0][0]
+
+
+def test_costing_fetch_primary_key(costing_db_fixture):
+    db = costing_db_fixture
+    db.insert_vrauser("im530", "Ishan", "test_user")
+    users = db.get_vrauser(None, None, tables.get("user"))
+
+    db.insert_deployment_id("121212", tables.get("deploymentid"))
+    deploy = db.get_deployment_id(None, tables.get("deploymentid"))
+
+    db.insert_project("123abc", users[0][0], 100.0, tables.get("proj"))
+    proj = db.get_project(None, tables.get("proj"))
+
+    db.insert_costing(
+        deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing")
+    )
+
+    info = db.get_costing_primary_key(deploy[0][0], "Duration Expansion", proj[0][0], None, tables.get("costing"))
+    assert info == 1

ucampostgresvro/utils.py

@@ -3,10 +3,52 @@ from typing import Callable, Dict
 
 from ucampostgresvro.DBA import DB
 from ucampostgresvro.exceptions import DbException
+from ucampostgresvro.tools import DEFAULT_TABLES
 
 LOG = logging.getLogger(__name__)
 
 
+def pre_setupconfig(db_params: Dict[str, str]) -> bool:
+    """Create the Database
+
+    Args:
+        db_params (Dict[str, str]): provide parameters for DB connection.
+
+    Returns:
+        bool: True if creation of database is suceess else False
+    """
+    result = []
+    if not check_table_exists(DEFAULT_TABLES.get("user"), db_params):
+        result.append(create_user_table(DEFAULT_TABLES.get("user"), db_params))
+    if not check_table_exists(DEFAULT_TABLES.get("deploymentid"), db_params):
+        result.append(
+            create_deployment_table(DEFAULT_TABLES.get("deploymentid"), db_params)
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("proj"), db_params):
+        result.append(
+            create_project_table(
+                DEFAULT_TABLES.get("proj"), DEFAULT_TABLES.get("user"), db_params
+            )
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("grant"), db_params):
+        result.append(
+            create_grant_table(
+                DEFAULT_TABLES.get("grant"), DEFAULT_TABLES.get("user"), db_params
+            )
+        )
+    if not check_table_exists(DEFAULT_TABLES.get("costing"), db_params):
+        result.append(
+            create_costing_table(
+                DEFAULT_TABLES.get("costing"),
+                DEFAULT_TABLES.get("deploymentid"),
+                DEFAULT_TABLES.get("proj"),
+                DEFAULT_TABLES.get("grant"),
+                db_params,
+            )
+        )
+    return False not in result
+
+
 def create_table(tablename: str, db_params: Dict[str, str], design: str) -> bool:
     """Creation of table with provided design
 
@@ -109,6 +151,7 @@ def create_project_table(
     """
     design = f"CREATE TABLE {proj_tablename} (\
         id SERIAL PRIMARY KEY, \
+        date TIMESTAMP DEFAULT CURRENT_TIMESTAMP, \
         project_number VARCHAR(255), \
         paid_by INTEGER REFERENCES {user_tablename}(id), \
         amount FLOAT NOT NULL \
@@ -131,6 +174,7 @@ def create_grant_table(
     """
     design = f"CREATE TABLE {grant_tablename} (\
         id SERIAL PRIMARY KEY,\
+        date TIMESTAMP DEFAULT CURRENT_TIMESTAMP, \
         grant_number VARCHAR(255),\
         paid_by INTEGER REFERENCES {user_tablename}(id),\
         amount FLOAT NOT NULL\