updates (94c3b2dc) · Commits · GSHS Utilities / common-package

Pipfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ verify_ssl = true
		name = "pypi"

		[packages]
		common = {editable = true, directory = "./src"}
		common-package = {editable = true, path = "./src", extras=["postgres"]}

		[dev-packages]
		pytest = "*"

+327 −76

File changed.

Preview size limit exceeded, changes collapsed.

+6 −1

Original line number	Diff line number	Diff line
		@@ -174,6 +174,10 @@ def login(
		return {"msg": "Invalid uid or password"}, 401


		def check_username_exists(args, kwargs):
		return True


		def register_user(
		username: str,
		password: str,
		@@ -184,7 +188,7 @@ def register_user(
		work_sector: str,
		user_type: str,
		reason: str,
		db: UNDB,
		db: Database,
		table_name: str,
		username_column: str,
		password_column: str,
		@@ -235,6 +239,7 @@ def reset_password(
		table_name: str,
		username_column: str,
		salt_column: str,
		password_column: str,
		) -> dict:
		# Retrieve user's salt from the database
		user_salt = db.query(

+4 −4

Original line number	Diff line number	Diff line
		@@ -10,9 +10,6 @@ from concurrent.futures import ThreadPoolExecutor
		from common.env import mock_env_vars
		from common.database import Database
		from common.logz import create_logger
		from common.mixins.postgres import PostgresMixin
		from common.mixins.mssql import MSSQLMixin
		from common.mixins.influx import InfluxMixin


		class MultiDatabase:
		@@ -36,13 +33,16 @@ class MultiDatabase:
		@staticmethod
		def _get_mixin_for_type(
		db_type: str,
		) -> Optional[Type[Union[PostgresMixin, MSSQLMixin, InfluxMixin]]]:
		) -> Optional[Type[Union['PostgresMixin', 'MSSQLMixin', 'InfluxMixin']]]:
		db_type = db_type.lower()
		if db_type.startswith("postgres") or db_type.startswith("pg"):
		from common.mixins.postgres import PostgresMixin
		return PostgresMixin
		if db_type.startswith("mssql"):
		from common.mixins.mssql import MSSQLMixin
		return MSSQLMixin
		if db_type.startswith("influx"):
		from common.mixins.influx import InfluxMixin
		return InfluxMixin
		# add more database Mixins here as they become available
		return None

+1 −0