ucampostgresvro 0.1.2__tar.gz → 0.2.0__tar.gz

{ucampostgresvro-0.1.2 → ucampostgresvro-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ucampostgresvro
-Version: 0.1.2
+Version: 0.2.0
 Summary: To connect with postgresql for the billing report
 Author: Ishan Mahajan
 Author-email: mahanishanmahajan@gmail.com
@@ -55,6 +55,8 @@ pre_setupconfig(db_params)
 - To perform CRUD operation 
 ```
 from ucampostgresvro.DBA import DB
+from datetime import datetime
+
 db_params = {
     "dbname": "vrapricing",
     "user": "postgres",
@@ -74,6 +76,15 @@ db.insert_vrauser("ll220", "Ling-Yan Lau")
 # read user
 print(db.get_vrauser())
 
+# read user specific user by crsid
+print(db.get_vrauser("ll220"))
+
+# read user specific user by user id
+print(db.get_vrauser_by_id(1))
+
+# get the primary key of user using crsid
+print(db.get_vrauser_primary_key("ll220"))
+
 # update user
 db.update_vrauser("ll220", "bda20", 'Ben Argyle')
 
@@ -83,9 +94,18 @@ db.remove_vrauser('bda20')
 # create vra deploymentid 
 db.insert_deployment_id("1231ee112ad11212")
 
-# read vra deployment id
+# read all the vra deployment ids
+print(db.get_deployment_id())
+
+# read specific specific deploymentid by deploymentid
 print(db.get_deployment_id("1231a"))
 
+# read specific deploymentid by primary key
+print(db.get_deployment_id_by_id(1))
+
+# read primary key of specific deploymentid
+print(db.get_deployment_id_primary_key("1231a"))
+
 # update vra deployment id
 db.update_deployment_id("1231ee112ad1", "1231a")
 
@@ -95,38 +115,77 @@ db.remove_deployment_id('1231a')
 # create project 
 db.insert_project("0001",1,100.0)
 
-# read project 
+# read all the projects 
 print(db.get_project())
 
-# update project 
-db.update_project("0001", "0002", 4, 200)
+# read specific project
+print(db.get_project("0001"))
+
+# read project from the ID
+print(db.get_project_by_id(1))
+
+# get the primary key of the project
+print(db.get_project_primary_key("001"))
+
+# get the primary key of the project if more than 1 entites using date of insertion.
+print(db.get_project_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update project with new information 1 is the primary key
+db.update_project(1, "0002", 4, 200)
 
-# delete project
-# db.remove_project("0002")
+# delete project using primary key of project
+# db.remove_project(1)
 
 # create grant 
 db.insert_grant("0001",1,100.0)
 
-# read grant
+# read all the grants
 print(db.get_grant())
 
-# update grant 
-db.update_grant("0001", "0002", 4, 200)
+# read specific grant
+print(db.get_grant("0001"))
 
-# delete grant
-db.remove_grant("0002")
+# read grant from the ID
+print(db.get_grant_by_id(1))
+
+# get the primary key of the grant
+print(db.get_grant_primary_key("001"))
+
+# get the primary key of the grant if more than 1 entites using date of insertion.
+print(db.get_grant_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update grant with new information 1 is the primary key of grant
+db.update_grant(1, "2002", 4, 200)
+
+# delete grant 1 is the primary key of the grant
+db.remove_grant(1)
 
 # create costing 
 db.insert_costing(2, "Initial Resource", project_id=4, grant_id=None)
 
-# read costing 
+# read all the costing 
 print(db.get_costing())
 
-# update costing 
-db.update_costing(2, "Duration Expansion", old_grant_id=4, old_project_id=None, grant_id=4, project_id=None)
+# read specific costing using primary key of the costing
+print(db.get_costing_by_id(1))
+
+# read specific costing for the project 
+print(db.get_costing(2, "Initial Resource", 2))
 
-# delete costing 
-db.remove_costing(2, "Duration Expansion", 4, None)
+# read specific costing for the grant 
+print(db.get_costing(2, "Initial Resource", None, 2))
+
+# get primary key for the specific costing for the project
+print(db.get_costing_primary_key(2, "Initial Resource", 2))
+
+# get primary key for the specific costing for the grant
+print(db.get_costing_primary_key(2, "Initial Resource", None, 2))
+
+# update costing where 3 is the primary key of the costing.
+db.update_costing(3, 2, "Duration Expansion", new_grant_id=None, new_project_id=2)
+
+# delete costing where 3 is the primary key
+db.remove_costing(3)
 
 # to close db connection
 db.closedb()
@@ -173,39 +232,40 @@ Referenced by:
 
 ## - project table 
 ```
-vrapricing=# \d projects;
-                                        Table "public.projects"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('projects_id_seq'::regclass)
- project_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d projects
+                                          Table "public.projects"
+     Column     |            Type             | Collation | Nullable |               Default
+----------------+-----------------------------+-----------+----------+--------------------------------------
+ id             | integer                     |           | not null | nextval('projects_id_seq'::regclass)
+ date           | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ project_number | character varying(255)      |           |          |
+ paid_by        | integer                     |           |          |
+ amount         | double precision            |           | not null |
 Indexes:
     "projects_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
     "projects_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
     TABLE "costing" CONSTRAINT "costing_project_id_fkey" FOREIGN KEY (project_id) REFERENCES projects(id)
-
 ```
 
 ## - grants table 
 ```
-vrapricing=# \d grant;
-                                        Table "public.grant"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('grant_id_seq'::regclass)
- voucher_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d grants
+                                         Table "public.grants"
+    Column    |            Type             | Collation | Nullable |              Default
+--------------+-----------------------------+-----------+----------+------------------------------------
+ id           | integer                     |           | not null | nextval('grants_id_seq'::regclass)
+ date         | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ grant_number | character varying(255)      |           |          |
+ paid_by      | integer                     |           |          |
+ amount       | double precision            |           | not null |
 Indexes:
-    "grant_pkey" PRIMARY KEY, btree (id)
+    "grants_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
-    "grant_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
+    "grants_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
-    TABLE "costing" CONSTRAINT "costing_voucher_id_fkey" FOREIGN KEY (voucher_id) REFERENCES grant(id)
+    TABLE "costing" CONSTRAINT "costing_grant_id_fkey" FOREIGN KEY (grant_id) REFERENCES grants(id)
 ```
 
 ## - Costing table 

{ucampostgresvro-0.1.2 → ucampostgresvro-0.2.0}/README.md

@@ -40,6 +40,8 @@ pre_setupconfig(db_params)
 - To perform CRUD operation 
 ```
 from ucampostgresvro.DBA import DB
+from datetime import datetime
+
 db_params = {
     "dbname": "vrapricing",
     "user": "postgres",
@@ -59,6 +61,15 @@ db.insert_vrauser("ll220", "Ling-Yan Lau")
 # read user
 print(db.get_vrauser())
 
+# read user specific user by crsid
+print(db.get_vrauser("ll220"))
+
+# read user specific user by user id
+print(db.get_vrauser_by_id(1))
+
+# get the primary key of user using crsid
+print(db.get_vrauser_primary_key("ll220"))
+
 # update user
 db.update_vrauser("ll220", "bda20", 'Ben Argyle')
 
@@ -68,9 +79,18 @@ db.remove_vrauser('bda20')
 # create vra deploymentid 
 db.insert_deployment_id("1231ee112ad11212")
 
-# read vra deployment id
+# read all the vra deployment ids
+print(db.get_deployment_id())
+
+# read specific specific deploymentid by deploymentid
 print(db.get_deployment_id("1231a"))
 
+# read specific deploymentid by primary key
+print(db.get_deployment_id_by_id(1))
+
+# read primary key of specific deploymentid
+print(db.get_deployment_id_primary_key("1231a"))
+
 # update vra deployment id
 db.update_deployment_id("1231ee112ad1", "1231a")
 
@@ -80,38 +100,77 @@ db.remove_deployment_id('1231a')
 # create project 
 db.insert_project("0001",1,100.0)
 
-# read project 
+# read all the projects 
 print(db.get_project())
 
-# update project 
-db.update_project("0001", "0002", 4, 200)
+# read specific project
+print(db.get_project("0001"))
+
+# read project from the ID
+print(db.get_project_by_id(1))
+
+# get the primary key of the project
+print(db.get_project_primary_key("001"))
+
+# get the primary key of the project if more than 1 entites using date of insertion.
+print(db.get_project_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update project with new information 1 is the primary key
+db.update_project(1, "0002", 4, 200)
 
-# delete project
-# db.remove_project("0002")
+# delete project using primary key of project
+# db.remove_project(1)
 
 # create grant 
 db.insert_grant("0001",1,100.0)
 
-# read grant
+# read all the grants
 print(db.get_grant())
 
-# update grant 
-db.update_grant("0001", "0002", 4, 200)
+# read specific grant
+print(db.get_grant("0001"))
 
-# delete grant
-db.remove_grant("0002")
+# read grant from the ID
+print(db.get_grant_by_id(1))
+
+# get the primary key of the grant
+print(db.get_grant_primary_key("001"))
+
+# get the primary key of the grant if more than 1 entites using date of insertion.
+print(db.get_grant_primary_key("001", datetime(2025, 1, 22, 15, 55, 25, 95698)))
+
+# update grant with new information 1 is the primary key of grant
+db.update_grant(1, "2002", 4, 200)
+
+# delete grant 1 is the primary key of the grant
+db.remove_grant(1)
 
 # create costing 
 db.insert_costing(2, "Initial Resource", project_id=4, grant_id=None)
 
-# read costing 
+# read all the costing 
 print(db.get_costing())
 
-# update costing 
-db.update_costing(2, "Duration Expansion", old_grant_id=4, old_project_id=None, grant_id=4, project_id=None)
+# read specific costing using primary key of the costing
+print(db.get_costing_by_id(1))
+
+# read specific costing for the project 
+print(db.get_costing(2, "Initial Resource", 2))
 
-# delete costing 
-db.remove_costing(2, "Duration Expansion", 4, None)
+# read specific costing for the grant 
+print(db.get_costing(2, "Initial Resource", None, 2))
+
+# get primary key for the specific costing for the project
+print(db.get_costing_primary_key(2, "Initial Resource", 2))
+
+# get primary key for the specific costing for the grant
+print(db.get_costing_primary_key(2, "Initial Resource", None, 2))
+
+# update costing where 3 is the primary key of the costing.
+db.update_costing(3, 2, "Duration Expansion", new_grant_id=None, new_project_id=2)
+
+# delete costing where 3 is the primary key
+db.remove_costing(3)
 
 # to close db connection
 db.closedb()
@@ -158,39 +217,40 @@ Referenced by:
 
 ## - project table 
 ```
-vrapricing=# \d projects;
-                                        Table "public.projects"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('projects_id_seq'::regclass)
- project_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d projects
+                                          Table "public.projects"
+     Column     |            Type             | Collation | Nullable |               Default
+----------------+-----------------------------+-----------+----------+--------------------------------------
+ id             | integer                     |           | not null | nextval('projects_id_seq'::regclass)
+ date           | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ project_number | character varying(255)      |           |          |
+ paid_by        | integer                     |           |          |
+ amount         | double precision            |           | not null |
 Indexes:
     "projects_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
     "projects_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
     TABLE "costing" CONSTRAINT "costing_project_id_fkey" FOREIGN KEY (project_id) REFERENCES projects(id)
-
 ```
 
 ## - grants table 
 ```
-vrapricing=# \d grant;
-                                        Table "public.grant"
-     Column     |          Type          | Collation | Nullable |               Default
-----------------+------------------------+-----------+----------+--------------------------------------
- id             | integer                |           | not null | nextval('grant_id_seq'::regclass)
- voucher_number | character varying(255) |           |          |
- paid_by        | integer                |           |          |
- amount         | double precision       |           | not null |
+vrapricing=# \d grants
+                                         Table "public.grants"
+    Column    |            Type             | Collation | Nullable |              Default
+--------------+-----------------------------+-----------+----------+------------------------------------
+ id           | integer                     |           | not null | nextval('grants_id_seq'::regclass)
+ date         | timestamp without time zone |           |          | CURRENT_TIMESTAMP
+ grant_number | character varying(255)      |           |          |
+ paid_by      | integer                     |           |          |
+ amount       | double precision            |           | not null |
 Indexes:
-    "grant_pkey" PRIMARY KEY, btree (id)
+    "grants_pkey" PRIMARY KEY, btree (id)
 Foreign-key constraints:
-    "grant_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
+    "grants_paid_by_fkey" FOREIGN KEY (paid_by) REFERENCES vrauser(id)
 Referenced by:
-    TABLE "costing" CONSTRAINT "costing_voucher_id_fkey" FOREIGN KEY (voucher_id) REFERENCES grant(id)
+    TABLE "costing" CONSTRAINT "costing_grant_id_fkey" FOREIGN KEY (grant_id) REFERENCES grants(id)
 ```
 
 ## - Costing table 

{ucampostgresvro-0.1.2 → ucampostgresvro-0.2.0}/pyproject.toml

@@ -1,11 +1,12 @@
 [project]
 name = "ucampostgresvro"
-version = "0.1.2"
+version = "0.2.0"
 description = "To connect with postgresql for the billing report"
 authors = [
     {name = "Ishan Mahajan",email = "mahanishanmahajan@gmail.com"}
 ]
 readme = "README.md"
+homepage = "https://gitlab.developers.cam.ac.uk/uis/infra/ucampostgresvro.git"
 requires-python = ">=3.10"
 dependencies = [
     "psycopg2-binary (>=2.9.10,<3.0.0)"