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

ucampostgresvro/DBA.py

@@ -34,7 +34,7 @@ class DB:
 
     def insert_vrauser(
         self, crsid: str, name: str, table_name: str = DEFAULT_TABLES.get("user")
-    ) -> bool:
+    ) -> int:
         """Insertion of the vrauser detail.
 
         Args:
@@ -46,21 +46,21 @@ class DB:
             DbException: Exception for the provided inputs.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: Primary key of the user.
         """
         with self.connection:
             if crsid and name:
                 try:
                     self.cursor.execute(
-                        f"INSERT INTO {table_name} (crsid, name) VALUES ('{crsid}', '{name}');"
+                        f"INSERT INTO {table_name} (crsid, name) VALUES ('{crsid}', '{name}') RETURNING id;"
                     )
                     LOG.info(
                         f"INFO: {table_name} insersion successful: CRSID {crsid} and Name {name}"
                     )
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(f"Error: {table_name} insertion : {e}")
-                    return False
+                    raise DbException(f"Error: {table_name} insertion fail")
             else:
                 LOG.error(
                     f"Error: Please provide both crid and name for {table_name} insertion"
@@ -204,7 +204,7 @@ class DB:
 
     def insert_deployment_id(
         self, deployment_id: str, table_name: str = DEFAULT_TABLES.get("deploymentid")
-    ) -> bool:
+    ) -> int:
         """Insertion of the deployment detail.
 
         Args:
@@ -215,21 +215,23 @@ class DB:
             DbException: Exception for the provided inputs.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: primary key of the deployment.
         """
         with self.connection:
             if deployment_id:
                 try:
                     self.cursor.execute(
-                        f"INSERT INTO {table_name} (deploymentID) VALUES ('{deployment_id}');"
+                        f"INSERT INTO {table_name} (deploymentID) VALUES ('{deployment_id}') RETURNING id;"
                     )
                     LOG.info(
                         f"INFO: deployment ID {deployment_id} inserted successfully"
                     )
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(f"Error: deployment ID insertion in {table_name}: {e}")
-                    return False
+                    raise DbException(
+                        f"Error: deployment ID insertion in {table_name}: {e}"
+                    )
             else:
                 LOG.error(
                     f"Error: Please provide deployment ID for {table_name} insertion"
@@ -380,7 +382,7 @@ class DB:
         paid_by: int,
         amount: float,
         table_name: str = DEFAULT_TABLES.get("proj"),
-    ) -> bool:
+    ) -> int:
         """Insertion of the project table.
 
         Args:
@@ -393,24 +395,26 @@ class DB:
             DbException: Exception for the provided inputs.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: primary key of the project.
         """
         with self.connection:
             if project_number:
                 try:
                     self.cursor.execute(
                         f"INSERT INTO {table_name} (project_number, paid_by, amount) VALUES \
-                            ('{project_number}', '{paid_by}', '{amount}');"
+                            ('{project_number}', '{paid_by}', '{amount}') RETURNING id;"
                     )
                     LOG.info(
                         f"INFO: Insertion of {project_number} and {amount} by {paid_by} is performed successfully"
                     )
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(
                         f"Error: project insertion in a table '{table_name}':\n {e}"
                     )
-                    return False
+                    raise DbException(
+                        f"Error: project insertion in a table '{table_name}':\n {e}"
+                    )
             else:
                 LOG.error(
                     "Error: Please provide project_number, paid_by, amount for Payment Oder"
@@ -561,7 +565,7 @@ class DB:
         paid_by: int,
         amount: float,
         table_name: str = DEFAULT_TABLES.get("grant"),
-    ) -> bool:
+    ) -> int:
         """Insertion of the grant detail.
 
         Args:
@@ -575,23 +579,23 @@ class DB:
             DbException: Exception for the provided inputs.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: Primary key of the grant.
         """
         with self.connection:
             if grant_number:
                 try:
                     self.cursor.execute(
                         f"INSERT INTO {table_name} (grant_number, paid_by, amount) \
-                        VALUES ('{grant_number}', '{paid_by}', '{amount}');"
+                        VALUES ('{grant_number}', '{paid_by}', '{amount}') RETURNING id;"
                     )
                     LOG.info(
                         f"INFO: Insertion of the grant {grant_number} and {amount} by \
                         {paid_by} has been performed successfully."
                     )
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(f"Error: grant Insert in table '{table_name}': {e}")
-                    return False
+                    raise DbException(f"Error: grant Insert in table '{table_name}': {e}")
             else:
                 LOG.error(
                     "Error: Please provide grant_number, paid_by, amount for grants"
@@ -740,7 +744,7 @@ class DB:
         project_id: Optional[int] = None,
         grant_id: Optional[int] = None,
         table_name: str = DEFAULT_TABLES.get("costing"),
-    ) -> bool:
+    ) -> int:
         """Insertion of the costing detail.
 
         Args:
@@ -755,7 +759,7 @@ class DB:
             DbException: Exception for the provided inputs.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: Primary key of the costing.
         """
         with self.connection:
             if project_id and grant_id:
@@ -769,28 +773,32 @@ class DB:
                 try:
                     self.cursor.execute(
                         f"INSERT INTO {table_name} (deployment_id, type, project_id) VALUES \
-                        ('{deployment_id}', '{typee}', '{project_id}');"
+                        ('{deployment_id}', '{typee}', '{project_id}') RETURNING id;"
                     )
                     LOG.info("INFO: Costing insertion has been performed successfully")
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(
                         f"Error: cost removal failed in table '{table_name}': {e}"
                     )
-                    return False
+                    raise DbException(
+                        f"Error: cost removal failed in table '{table_name}': {e}"
+                    )
             elif deployment_id and grant_id and typee:
                 try:
                     self.cursor.execute(
                         f"INSERT INTO {table_name} (deployment_id, type, grant_id) VALUES \
-                        ('{deployment_id}', '{typee}',  '{grant_id}');"
+                        ('{deployment_id}', '{typee}',  '{grant_id}') RETURNING id;"
                     )
                     LOG.info("INFO: Insertion of costing has been successfully")
-                    return True
+                    return self.cursor.fetchone()[0]
                 except Exception as e:
                     LOG.error(
                         f"Error: cost removal failed in table '{table_name}': {e}"
                     )
-                    return False
+                    raise DbException(
+                        f"Error: cost removal failed in table '{table_name}': {e}"
+                    )
             else:
                 LOG.error(
                     "Error: Please provide correct deployment_id, type, and, (project_id/grant_id) for costing"

ucampostgresvro/__main__.py

@@ -37,7 +37,7 @@ def main():
     if not utils.pre_setupconfig(db_params):
         raise DbException("ERROR: Tables are not created successfully")
 
-    # db.insert_vrauser("ll220", "len")
+    print(db.insert_vrauser("ll221", "leny"))
     # print(db.get_vrauser("ll220"))
     # print(db.get_vrauser_primary_key("ll220"))
     # db.update_vrauser("ll220", "bda20", 'Ben Argyle')

{ucampostgresvro-0.2.0.dist-info → ucampostgresvro-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ucampostgresvro
-Version: 0.2.0
+Version: 0.2.1
 Summary: To connect with postgresql for the billing report
 Author: Ishan Mahajan
 Author-email: mahanishanmahajan@gmail.com

{ucampostgresvro-0.2.0.dist-info → ucampostgresvro-0.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ucampostgresvro/DBA.py,sha256=t8un2LmoTnHczbYMWl4hO7MVDfGZJTFe7xUXKyD3Cbg,37961
+ucampostgresvro/DBA.py,sha256=x795bE2kUOiDc1274bFXO1dMlQlvGQXZayirE0TGlZM,38597
 ucampostgresvro/__init__.py,sha256=w9Iw7QVvd8lme2wKwEbCo5IgetVjSfFBOOYAcA_Q0Ns,18
-ucampostgresvro/__main__.py,sha256=RGTDhAAIoY-w6h64aKnsfv665DmdFf7cVwbX_Z16vWU,4122
+ucampostgresvro/__main__.py,sha256=KzZTQ308dHN0OuvxObUhCdGJz2sbb8iFr-wOP6_iSMg,4128
 ucampostgresvro/ca.crt,sha256=pVDr3AsvwCqJ36JTifsAzIiS2ve_fWC1CBfVI0cnVmY,1135
 ucampostgresvro/exceptions.py,sha256=XVi8Sk_gg3VE4ryTtiYOnGbmCPIsfFt2AE5sOoqQDuI,39
 ucampostgresvro/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,7 +10,7 @@ ucampostgresvro/tests/test_DB.py,sha256=lye6NLUS2k7W7Kr083fQ5HDUD5hMMUqvIXL2xbNo
 ucampostgresvro/tests/utils.py,sha256=lpcvf6HPOOtxAwSwvoAUhil1zQ6Qfr0ZILa0qDVdES0,3722
 ucampostgresvro/tools.py,sha256=Y8MUK1lIG10A-724yrhve8LfjQUmFwpqi19UIO5DeuI,153
 ucampostgresvro/utils.py,sha256=QYhWaBaxGn-yKEGm___3-7RitbIWwICTplbz7LyKgLE,8543
-ucampostgresvro-0.2.0.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
-ucampostgresvro-0.2.0.dist-info/METADATA,sha256=IQ303ShVE8nT0g5qF_G1o473KIopfYzSHvdVJNdeIjI,9791
-ucampostgresvro-0.2.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-ucampostgresvro-0.2.0.dist-info/RECORD,,
+ucampostgresvro-0.2.1.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
+ucampostgresvro-0.2.1.dist-info/METADATA,sha256=xQeFtb89nyd4YJuY7SKQONgjZBhM-1WJ3i3HFbejw0c,9791
+ucampostgresvro-0.2.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+ucampostgresvro-0.2.1.dist-info/RECORD,,