ucampostgresvro 0.2.0__py3-none-any.whl → 0.2.2__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"
@@ -73,7 +73,7 @@ class DB:
         new_crsid: str,
         name: str,
         table_name: str = DEFAULT_TABLES.get("user"),
-    ) -> bool:
+    ) -> int:
         """Updation of the vrauser.
 
         Args:
@@ -83,18 +83,18 @@ class DB:
             table_name (str): table name of the user.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: primary key of the user which is updated.
         """
         with self.connection:
             try:
                 self.cursor.execute(
-                    f"UPDATE {table_name} SET crsid ='{new_crsid}' , name='{name}' WHERE crsid='{old_crsid}';"
+                    f"UPDATE {table_name} SET crsid ='{new_crsid}' , name='{name}' WHERE crsid='{old_crsid}' RETURNING id;"
                 )
                 LOG.info(f"INFO: {table_name} update successful for CRSID {old_crsid}")
-                return True
+                return self.cursor.fetchone()[0]
             except Exception as e:
                 LOG.error(f"Error: {table_name} Updating : {e}")
-                return False
+                raise DbException(f"Error: {table_name} Updating : {e}")
 
     def remove_vrauser(
         self, crsid: str, table_name: str = DEFAULT_TABLES.get("user")
@@ -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"
@@ -243,7 +245,7 @@ class DB:
         old_deployment_id: str,
         new_deployment_id: str,
         table_name: str = DEFAULT_TABLES.get("deploymentid"),
-    ) -> bool:
+    ) -> int:
         """Updation of the the deployment ID in deployment table.
 
         Args:
@@ -252,22 +254,22 @@ class DB:
             table_name (str): table name of the deploymentid.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: primary key of the deployment.
         """
         with self.connection:
             try:
                 self.cursor.execute(
                     f"UPDATE {table_name} SET deploymentID ='{new_deployment_id}' \
-                    WHERE deploymentID='{old_deployment_id}';"
+                    WHERE deploymentID='{old_deployment_id}' RETURNING id;"
                 )
                 LOG.info(
                     f"INFO: deployment ID of {old_deployment_id} updated successfully with \
                     {new_deployment_id} in table {table_name} ."
                 )
-                return True
+                return self.cursor.fetchone()[0]
             except Exception as e:
                 LOG.error(f"Error: deployment ID update for table {table_name}: {e}")
-                return False
+                raise DbException(f"Error: deployment ID update for table {table_name}: {e}")
 
     def remove_deployment_id(
         self, deployment_id: str, table_name: str = DEFAULT_TABLES.get("deploymentid")
@@ -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"
@@ -426,7 +430,7 @@ class DB:
         new_paid_by: int,
         new_amount: float,
         table_name: str = DEFAULT_TABLES.get("proj"),
-    ) -> bool:
+    ) -> int:
         """Updation of the the project detail in project table
 
         Args:
@@ -437,22 +441,22 @@ class DB:
             table_name (str): table name of the project.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: Primary key of the project.
         """
         with self.connection:
             try:
                 self.cursor.execute(
                     f"UPDATE {table_name} SET \
                     project_number ='{new_project_number}', paid_by='{new_paid_by}', amount='{new_amount}' \
-                    WHERE id='{project_id}';"
+                    WHERE id='{project_id}' RETURNING id;"
                 )
                 LOG.info(
                     f"INFO: Updation of the project {project_id} has been peformed successfully"
                 )
-                return True
+                return self.cursor.fetchone()[0]
             except Exception as e:
                 LOG.error(f"Error: Project Updating in table {table_name} : {e}")
-                return False
+                raise DbException(f"Error: Project Updating in table {table_name} : {e}")
 
     def remove_project(
         self, project_id: int, table_name: str = DEFAULT_TABLES.get("proj")
@@ -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"
@@ -605,7 +609,7 @@ class DB:
         new_paid_by: int,
         new_amount: float,
         table_name: str = DEFAULT_TABLES.get("grant"),
-    ) -> bool:
+    ) -> int:
         """ "Updation of the the grant detail in grant table
 
         Args:
@@ -616,23 +620,26 @@ class DB:
             table_name (str): table name of the grant.
 
         Returns:
-            bool: True for the success and False for the failure.
+            int: Primary key of the Grant.
         """
         with self.connection:
             try:
                 self.cursor.execute(
                     f"UPDATE {table_name} SET grant_number ='{new_grant}', paid_by='{new_paid_by}', \
-                    amount='{new_amount}' WHERE id='{grant_id}';"
+                    amount='{new_amount}' WHERE id='{grant_id}' RETURNING id;"
                 )
                 LOG.info(
                     f"INFO: Updation of the grant {grant_id} has been performed successfully."
                 )
-                return True
+                return self.cursor.fetchone()[0]
             except Exception as e:
                 LOG.error(
                     f"Error: grant Updating of '{grant_id}' in table '{table_name}': {e}"
                 )
-                return False
+                raise DbException(
+                    f"Error: grant Updating of '{grant_id}' in table '{table_name}': {e}"
+                )
+
 
     def remove_grant(
         self, grant_id: int, table_name: str = DEFAULT_TABLES.get("grant")
@@ -740,7 +747,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 +762,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 +776,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"
@@ -807,7 +818,7 @@ class DB:
         new_grant_id: Optional[int] = None,
         new_project_id: Optional[int] = None,
         table_name: str = DEFAULT_TABLES.get("costing"),
-    ) -> bool:
+    ) -> int:
         """Updation of the costing database entry.
 
         Args:
@@ -822,7 +833,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.
         """
         if new_grant_id and new_project_id:
             raise DbException(
@@ -835,12 +846,12 @@ class DB:
                 self.cursor.execute(
                     f"UPDATE {table_name} SET \
                     deployment_id ='{new_deployment_id}', type='{new_typee}', project_id={project_id}, \
-                    grant_id={grant_id} WHERE id='{old_costing_id}';"
+                    grant_id={grant_id} WHERE id='{old_costing_id}' RETURNING id;"
                 )
                 LOG.info(
                     "INFO: updation of the costing has been performed successfully."
                 )
-                return True
+                return self.cursor.fetchone()[0]
             except Exception as e:
                 LOG.error(
                     f"Error: Updation of costing has failed in table '{table_name}': \n {e}"

ucampostgresvro/__init__.py

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

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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ucampostgresvro
-Version: 0.2.0
+Version: 0.2.2
 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.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ucampostgresvro/DBA.py,sha256=t8un2LmoTnHczbYMWl4hO7MVDfGZJTFe7xUXKyD3Cbg,37961
-ucampostgresvro/__init__.py,sha256=w9Iw7QVvd8lme2wKwEbCo5IgetVjSfFBOOYAcA_Q0Ns,18
-ucampostgresvro/__main__.py,sha256=RGTDhAAIoY-w6h64aKnsfv665DmdFf7cVwbX_Z16vWU,4122
+ucampostgresvro/DBA.py,sha256=Bz3Ql-LtM-BUiQTWGww-Gjl6S3geTzifiZVxjN2Pcb4,38957
+ucampostgresvro/__init__.py,sha256=qleN2zQctO8stGYcfqFUyavqMP9pxdKBbwgZWyKxPWQ,18
+ucampostgresvro/__main__.py,sha256=87ArORk2ViXoUWCK7zyGL-ly4jpbP_JqMMLKio4K4wY,4130
 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.2.dist-info/LICENSE,sha256=CVTj8C-BHEJjzYlYtHnfykxKkfmk-ImXOs5rcMgXebY,1094
+ucampostgresvro-0.2.2.dist-info/METADATA,sha256=NLZ5tNdr7nQfpzYR2cKjxWQGCndZZv32rY0f5rUDpRQ,9791
+ucampostgresvro-0.2.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+ucampostgresvro-0.2.2.dist-info/RECORD,,