Небольшие улучшения кода. Изменение API на PostgreSQL.

Author: potapova-ad

README.md

@@ -13,9 +13,13 @@
 ###### You need to set environment variables into .env file like this
 
 ```
-DB_NAME=postgre
-SECRET_KEY=secret
-USER_NAME=postgre
+STORE_DB_NAME=store-db
+STORE_DB_PSWD=store-pswd
+STORE_DB_USER=store-user
+
+BANK_DB_NAME=bank-db
+BANK_DB_PSWD=bank-store
+BANK_DB_USER=bank-user
 
 DB_PORT=51488
 ```

database/init-scripts/15-store-init.sql

@@ -14,14 +14,13 @@ COPY games(id, name, price, description, brief, studio_id)
 FROM '/store-init-csvs/init-data-games.csv'
 WITH (FORMAT CSV, HEADER, DELIMITER ',');
 
--- generator can generate duplicates for this categories
--- COPY game_tags(game_id, tag_id)
--- FROM '/store-init-csvs/init-data-game-tags.csv'
--- WITH (FORMAT CSV, HEADER, DELIMITER ',');
+COPY game_tags(game_id, tag_id)
+FROM '/store-init-csvs/init-data-game-tags.csv'
+WITH (FORMAT CSV, HEADER, DELIMITER ',');
 
--- COPY purchases(id, owner_id, buyer_id, ts, game_id)
--- FROM '/store-init-csvs/init-data-purchases.csv'
--- WITH (FORMAT CSV, HEADER, DELIMITER ',', NULL 'NULL');
+COPY purchases(id, owner_id, buyer_id, ts, game_id)
+FROM '/store-init-csvs/init-data-purchases.csv'
+WITH (FORMAT CSV, HEADER, DELIMITER ',', NULL 'NULL');
 
 -- create temporary table for games pictures to transform csv
 CREATE TEMP TABLE temp4gpictures (

docker-compose.yaml

@@ -6,9 +6,9 @@ services:
     env_file: .env
     container_name: gamehub-db
     environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${SECRET_KEY}
-      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${STORE_DB_USER}
+      POSTGRES_PASSWORD: ${STORE_DB_PSWD}
+      POSTGRES_DB: ${STORE_DB_NAME}
       PGPORT: ${DB_PORT}
     expose:
       - "${DB_PORT}"
@@ -31,6 +31,11 @@ services:
       - db
     environment:
       BANK_SERVICE_URL: http://bank-service:5001
+      DB_HOST: db
+      DB_PORT: ${DB_PORT}
+      DB_NAME: ${STORE_DB_NAME}
+      DB_USER: ${STORE_DB_USER}
+      DB_PSWD: ${STORE_DB_PSWD}
     volumes:
       - ./database/store-init-csvs:/tmp/init-csvs/
     networks:

store-service/requirements.txt

@@ -2,4 +2,4 @@ flask
 uwsgi
 bleach
 pillow
-psycopg
+psycopg[binary,pool]

store-service/store/database/db_api.py

@@ -1,4 +1,4 @@
-import sqlite3
+import psycopg
 import os
 import csv
 import base64
@@ -9,71 +9,42 @@
 
 from store.utility.User import User
 
-DB_PATH = os.environ.get('DB_PATH', '/var/store-db/store.sql3.db')
 INIT_CSV_PATH = os.environ.get('INIT_CSV_PATH', '/tmp/init-csvs')
 STATIC_PATH = os.environ.get('STATIC_PATH', '/store/store/static')
 
-def init_pics_from_csv(db_file:str, csv_file:str, table_name:str, save_to:str):
-	conn = sqlite3.connect(db_file)
-	cursor = conn.cursor()
+def init_pics_from_csv(csv_file:str, table_name:str, save_to:str):
 	try:
 		with open(csv_file, 'r', encoding='UTF-8') as file:
 			reader = csv.reader(file)
 			headers = next(reader)[:-1]
-			query = f"""
-				INSERT OR IGNORE INTO {table_name} ({','.join(headers)})
-				VALUES ({','.join(['?'] * len(headers))});
-			"""	
+
 			for row in reader:
 				if save_to == 'profiles':
-					img, data, path = base64.b64decode(row[-1]), row[:-1], f'{row[0]}.png'
+					img, data, path = base64.b64decode(row[-1]), row[:-1], f'{row[0]}p.png'
 					img = Image.open(io.BytesIO(img))
 					img.save(f'{STATIC_PATH}/images/{save_to}/{path}')
 				else :
 					img, data = base64.b64decode(row[-1]), row[:-1]
 					img = Image.open(io.BytesIO(img))
-					game_id, path = data[2], data[1] 
+					game_id, path = data[2], f'{row[0]}g.{row[-2]}'
 					os.makedirs(f'{STATIC_PATH}/images/{save_to}/{game_id}', exist_ok=True)
 					img.save(f'{STATIC_PATH}/images/{save_to}/{game_id}/{path}')
-				cursor.execute(query, data)
-			conn.commit()
-			conn.close()
 	except Exception as e:
-		print(f'sqlite error:{e}')
-		conn.rollback()
-		conn.close()
+		print(f'init pictures error:{e}')
 		raise ValueError(str(e)) from e
 
-def execute_sql_file(conn, sql_file):
-	try:
-		with open(sql_file, 'r', encoding='UTF-8') as file:
-			sql_script = file.read()
-		cursor = conn.cursor()
-		cursor.executescript(sql_script)
-		conn.commit()
-	except sqlite3.Error as e:
-		print(f'Execution sql error : {e}')
-		conn.rollback()
-
 def init_database():
 	init_pics_csvs = [{
 		'file': f'{INIT_CSV_PATH}/init-profile-pictures.csv', 
 		'table':'profiles_pictures',
 		'save_to' : 'profiles'
-	},{
+	}, {
 		'file': f'{INIT_CSV_PATH}/init-games-pictures.csv', 
 		'table':'games_pictures',
 		'save_to' : 'games'
 	}]
 	try:
-		_ = [init_from_csv(
-			db_file=DB_PATH, 
-			csv_file=init_data['file'], 
-			table_name=init_data['table']
-		) for init_data in init_csvs]
-
 		_ = [init_pics_from_csv(
-			db_file=DB_PATH, 
 			csv_file=init_pics['file'], 
 			table_name=init_pics['table'], 
 			save_to=init_pics['save_to']
@@ -83,9 +54,19 @@ def init_database():
 
 def get_db():
 	if 'db' not in g:
-		g.db = sqlite3.connect(DB_PATH)
-		g.db.isolation_level = None
-		g.db.row_factory = sqlite3.Row
+		conn_params = {
+			'host'    : os.getenv('DB_HOST'),
+			'port'    : os.getenv('DB_PORT'),
+			'dbname'  : os.getenv('DB_NAME'),
+			'user'    : os.getenv('DB_USER'),
+			'password': os.getenv('DB_PSWD'),
+			'row_factory': psycopg.rows.dict_row
+		}
+		try:
+			g.db = psycopg.connect(**conn_params)
+			g.db.autocommit = True
+		except psycopg.OperationalError as e:
+			raise ValueError(f'Failed to connect to database: {e}')
 	return g.db
 
 def get_games_list(last_game_id:int, page_sz:int)->list[dict]:
@@ -95,20 +76,20 @@ def get_games_list(last_game_id:int, page_sz:int)->list[dict]:
 			SELECT id 
 			FROM games
 			ORDER BY id 
-			LIMIT (?);
+			LIMIT %s;
 		""", (page_sz,)) if last_game_id is None else ("""
 			SELECT id
 			FROM GAMES 
-			WHERE id > (?)
+			WHERE id > %s
 			ORDER BY id
-			LIMIT (?);
+			LIMIT %s;
 		""", (last_game_id, page_sz,))
 		cursor.execute(queue, params)
 		game_ids = cursor.fetchall()
 
 		games = [get_game_info(game_id['id']) for game_id in game_ids]
 		return games
-	except sqlite3.Error as e:
+	except psycopg.OperationalError as e:
 		print(f'sql execution error {e}')
 		return None
 
@@ -122,7 +103,7 @@ def get_game_info(game_id:int)->dict:
 			SELECT g.*, s.name AS studio_name
 			FROM games g
 			JOIN studios s ON s.id = g.studio_id
-			WHERE g.id = (?);
+			WHERE g.id = %s;
 		""", (game_id,))
 		data = cursor.fetchone()
 		if data:
@@ -132,7 +113,7 @@ def get_game_info(game_id:int)->dict:
 		else:
 			print(game_id)
 		return data
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		print(f'execute game query with id={game_id}:{e}')
 		return None
 
@@ -141,7 +122,7 @@ def check_user(user:User)->int:
 	cursor = db.cursor()
 	try:
 		cursor.execute(
-			'SELECT * FROM users WHERE name = (?);', (user.name,)
+			'SELECT * FROM users WHERE name = %s;', (user.name,)
 		)
 		user_data = cursor.fetchone()
 
@@ -153,7 +134,7 @@ def check_user(user:User)->int:
 			return user_data['id'], user_data['balance']
 		raise ValueError('Wrong password')
 
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		raise ValueError(str(e)) from e
 
 def add_user(user:User):
@@ -162,12 +143,12 @@ def add_user(user:User):
 	try:
 		cursor.execute("""
 			INSERT INTO users (name, password_hash, balance)
-			VALUES (?, ?, ?)
+			VALUES (%s, %s, %s)
 		""", (user.name, user.phash, 0))
 		print('user add query was called')
 		db.commit()
-	except sqlite3.Error as e:
-		print(f'sqlite3 error:{e}')
+	except psycopg.Error as e:
+		print(f'sql error:{e}')
 		db.rollback()
 		raise ValueError(str(e)) from e
 
@@ -178,7 +159,7 @@ def get_profile_picture(user_id:int)->str:
 			SELECT pp.name, pp.img_fmt
 			FROM users u
 			JOIN profiles_pictures pp ON u.id = pp.user_id
-			WHERE u.id = ?;
+			WHERE u.id = %s;
 		""", (user_id,))
 		user_pic = cursor.fetchone()
 		if not user_pic:
@@ -187,7 +168,7 @@ def get_profile_picture(user_id:int)->str:
 			user_pic = dict(user_pic)
 			user_pic = user_pic['name'] if 'name' in user_pic else 'default.jpg'
 		return user_pic
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		print(f'sql error:{e}')
 		raise ValueError(str(e)) from e
 
@@ -205,11 +186,11 @@ def get_user_games(user_id:int)->list[int]:
 		cursor.execute("""
 			SELECT game_id 
 			FROM purchases 
-			WHERE owner_id = (?) AND ts IS NOT NULL;
+			WHERE owner_id = %s AND ts IS NOT NULL;
 		""", (user_id,))
 
 		return [x['game_id'] for x in cursor.fetchall()]
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		print(f'sqlite error:{e}')
 		raise ValueError(f'{e}') from e
 
@@ -220,7 +201,7 @@ def get_tags_by_game_id(game_id:int)->list[str]:
 			SELECT t.name
 			FROM game_tags gt
 			JOIN tags t ON gt.tag_id = t.id
-			WHERE gt.game_id = ?;
+			WHERE gt.game_id = %s;
 		""", (game_id,))
 		data = cursor.fetchall()
 		tags = [tag['name'] for tag in data]
@@ -234,7 +215,7 @@ def get_pictures_by_game_id(game_id:int)->list[str]:
 		cursor.execute("""
 			SELECT name, img_type, img_fmt
 			FROM games_pictures 
-			WHERE game_id = ?;
+			WHERE game_id = %s;
 		""", (game_id,))
 		data = cursor.fetchall()
 		return data
@@ -246,21 +227,21 @@ def buy_cart(user_id:int, total:int, games_ids:list[int]):
 	cursor = conn.cursor()
 	print(f'games_ids:{games_ids}')
 	try:
-		placeholders = ', '.join(['?'] * len(games_ids))
+		placeholders = ', '.join(['%s'] * len(games_ids))
 		# change purchases
 		cursor.execute(f"""
 			UPDATE purchases 
 			SET ts = STRFTIME('%s', 'now')
-			WHERE owner_id = (?) AND game_id IN ({placeholders}) AND ts IS NULL;
+			WHERE owner_id = %s AND game_id IN ({placeholders}) AND ts IS NULL;
 		""", [user_id] + games_ids)
 		# change balance
 		cursor.execute("""
 			UPDATE users
-			SET balance = balance - (?)
-			WHERE id = (?);
+			SET balance = balance - %s
+			WHERE id = %s;
 		""", (total, user_id,))
 		conn.commit()
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		conn.rollback()
 		print('something went wrong')
 		raise e from e
@@ -271,10 +252,10 @@ def remove_from_cart(user_id:int, game_id:int):
 	try:
 		cursor.execute("""
 			DELETE FROM purchases 
-			WHERE owner_id = (?) AND game_id = (?) AND ts IS NULL;
+			WHERE owner_id = %s AND game_id = %s AND ts IS NULL;
 		""", (user_id, game_id,))
 		conn.commit()
-	except sqlite3.Error as e:
+	except psycopg.Error as e:
 		conn.rollback()
 		raise ValueError(e) from e
 
@@ -284,36 +265,36 @@ def get_user_cart_games(user_id:int)->list[dict]:
 		cursor.execute("""
 			SELECT game_id 
 			FROM purchases 
-			WHERE owner_id == (?) and ts IS NULL;
+			WHERE owner_id == %s and ts IS NULL;
 		""", (user_id,))
 		data = cursor.fetchall()
 		return data
-	except sqlite3.error as e:
-		raise ValueError(f'sqlite3 error: {e}') from e
+	except psycopg.Error as e:
+		raise ValueError(f'sql error: {e}') from e
 
 def add_game_to_cart(user_id:int, game_id:int):
 	conn = get_db()
 	cursor = conn.cursor()
 	try:
 		cursor.execute("""
 			INSERT INTO purchases (owner_id, buyer_id, ts, game_id) 
-			VALUES (?, ?, ?, ?);
+			VALUES (%s, %s, %s, %s);
 		""", (user_id, user_id, None, game_id,))
 		conn.commit()
-	except sqlite3.error as e:
+	except psycopg.Error as e:
 		conn.rollback()
-		raise ValueError(f'sqlite3 error: {e}') from e
+		raise ValueError(f'sql error: {e}') from e
 
 def check_own_game(user_id:int, game_id:int)->bool:
 	cursor = get_db().cursor()
 	try:
 		cursor.execute("""
 			SELECT id FROM purchases 
-			WHERE game_id == (?) and owner_id == (?);
+			WHERE game_id == %s and owner_id == %s;
 		""", (game_id, user_id,))
 		result = cursor.fetchone()
 		if result : 
 			return True
 		return False
-	except sqlite3.error as e:
-		raise ValueError(f'sqlite3 error: {e}') from e
+	except psycopg.Error as e:
+		raise ValueError(f'sql error: {e}') from e