fixing generator and other site functionality

Author: gubanovpm

database/init-scripts/00-bank-schema.sql database/init-scripts/10-bank-schema.sqldatabase/init-scripts/00-bank-schema.sql renamed to database/init-scripts/10-bank-schema.sql

@@ -1,17 +1,17 @@
 CREATE TABLE IF NOT EXISTS users (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     password_hash TEXT NOT NULL,
     name TEXT NOT NULL UNIQUE,
     balance INTEGER DEFAULT 0
 );
 
 CREATE TABLE IF NOT EXISTS studios (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     name TEXT NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS games (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     name TEXT NOT NULL UNIQUE,
     price INTEGER NOT NULL,
     description TEXT NOT NULL,
@@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS games (
 );
 
 CREATE TABLE IF NOT EXISTS games_pictures (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     name TEXT NOT NULL,
     game_id INTEGER NOT NULL,
     img_type TEXT NOT NULL CHECK (
@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS games_pictures (
 );
 
 CREATE TABLE IF NOT EXISTS profiles_pictures (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     name TEXT NOT NULL UNIQUE,
     user_id INTEGER NOT NULL,
     img_fmt TEXT NOT NULL CHECK (img_fmt IN ('jpg', 'png')),
@@ -47,7 +47,7 @@ CREATE TABLE IF NOT EXISTS profiles_pictures (
 );
 
 CREATE TABLE IF NOT EXISTS purchases (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     owner_id INTEGER NOT NULL,
     buyer_id INTEGER NOT NULL,
     ts INTEGER, -- make it NULL if game not buyed yet but in cart already
@@ -62,7 +62,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS idx_owner_game ON purchases (
 );
 
 CREATE TABLE IF NOT EXISTS tags (
-    id INTEGER PRIMARY KEY,
+    id SERIAL PRIMARY KEY,
     name TEXT NOT NULL UNIQUE
 );
 

database/init-scripts/10-store-schema.sql database/init-scripts/20-store-schema.sqldatabase/init-scripts/10-store-schema.sql renamed to database/init-scripts/20-store-schema.sql

@@ -1,18 +1,22 @@
 COPY users (id, password_hash, name, balance) 
 FROM '/store-init-csvs/init-data-users.csv' 
 WITH (FORMAT CSV, HEADER, DELIMITER ',');
+SELECT setval(pg_get_serial_sequence('users', 'id'), COALESCE(MAX(id), 0) + 1) FROM users;
 
 COPY tags(id, name) 
 FROM '/store-init-csvs/init-data-tags.csv' 
 WITH (FORMAT CSV, HEADER, DELIMITER ',');
+SELECT setval(pg_get_serial_sequence('tags', 'id'), COALESCE(MAX(id), 0) + 1) FROM tags;
 
 COPY studios(id, name) 
 FROM '/store-init-csvs/init-data-studios.csv'
 WITH (FORMAT CSV, HEADER, DELIMITER ',');
+SELECT setval(pg_get_serial_sequence('studios', 'id'), COALESCE(MAX(id), 0) + 1) FROM studios;
 
 COPY games(id, name, price, description, brief, studio_id)
 FROM '/store-init-csvs/init-data-games.csv'
 WITH (FORMAT CSV, HEADER, DELIMITER ',');
+SELECT setval(pg_get_serial_sequence('games', 'id'), COALESCE(MAX(id), 0) + 1) FROM games;
 
 COPY game_tags(game_id, tag_id)
 FROM '/store-init-csvs/init-data-game-tags.csv'
@@ -21,9 +25,10 @@ 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');
+SELECT setval(pg_get_serial_sequence('purchases', 'id'), COALESCE(MAX(id), 0) + 1) FROM purchases;
 
 -- create temporary table for games pictures to transform csv
-CREATE TEMP TABLE temp4gpictures (
+CREATE TEMP TABLE IF NOT EXISTS temp4gpictures (
     id INTEGER PRIMARY KEY,
     name TEXT,
     game_id INTEGER,
@@ -46,12 +51,13 @@ SELECT
 FROM
     temp4gpictures s
 ON CONFLICT (id) DO NOTHING;
+SELECT setval(pg_get_serial_sequence('games_pictures', 'id'), COALESCE(MAX(id), 0) + 1) FROM games_pictures;
 
 DROP TABLE temp4gpictures;
 -- end of copy games pictures
 
 -- create temporary table for profile pictures to transform csv
-CREATE TEMP TABLE temp4ppictures (
+CREATE TEMP TABLE IF NOT EXISTS temp4ppictures (
   id INTEGER PRIMARY KEY,
   name TEXT,
   user_id INTEGER,
@@ -72,6 +78,9 @@ SELECT
 FROM
   temp4ppictures s
 ON CONFLICT (id) DO NOTHING;
+SELECT setval(pg_get_serial_sequence('profiles_pictures', 'id'), COALESCE(MAX(id), 0) + 1) FROM profiles_pictures;
 
 DROP TABLE temp4ppictures;
+
+COMMIT;
 -- end of copy profile pictures

database/init-scripts/15-store-init.sql database/init-scripts/25-store-init.sqldatabase/init-scripts/15-store-init.sql renamed to database/init-scripts/25-store-init.sql

@@ -15,7 +15,7 @@ services:
     ports:
       - "${DB_PORT}:${DB_PORT}"
     volumes:
-      - /var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
       - ./database/init-scripts:/docker-entrypoint-initdb.d
       - ./database/store-init-csvs:/store-init-csvs
       - ./database/bank-init-csvs:/bank-init-csvs
@@ -56,6 +56,5 @@ networks:
   my-network:
 
 volumes:
-  store-db-data:
   bank-db-data:
-  data_sql:
+  postgres_data:

docker-compose.yaml

@@ -231,7 +231,7 @@ def buy_cart(user_id:int, total:int, games_ids:list[int]):
 		# change purchases
 		cursor.execute(f"""
 			UPDATE purchases 
-			SET ts = STRFTIME('%s', 'now')
+			SET ts = EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)::INTEGER
 			WHERE owner_id = %s AND game_id IN ({placeholders}) AND ts IS NULL;
 		""", [user_id] + games_ids)
 		# change balance
@@ -265,7 +265,7 @@ def get_user_cart_games(user_id:int)->list[dict]:
 		cursor.execute("""
 			SELECT game_id 
 			FROM purchases 
-			WHERE owner_id == %s and ts IS NULL;
+			WHERE owner_id = %s and ts IS NULL;
 		""", (user_id,))
 		data = cursor.fetchall()
 		return data
@@ -290,7 +290,7 @@ def check_own_game(user_id:int, game_id:int)->bool:
 	try:
 		cursor.execute("""
 			SELECT id FROM purchases 
-			WHERE game_id == %s and owner_id == %s;
+			WHERE game_id = %s and owner_id = %s;
 		""", (game_id, user_id,))
 		result = cursor.fetchone()
 		if result : 

store-service/store/database/__init__.py

@@ -67,14 +67,22 @@ def generate_game(idx:int):
 		round(random.uniform(1, STUDIO_COUNT))
 	]
 
+PURCHASES_SET = set()
 def generate_purchase(idx:int):
-	return [
-		idx,
-		round(random.uniform(1, USERS_COUNT)),
-		round(random.uniform(1, USERS_COUNT)),
-		'NULL' if round(random.uniform(0,2)) == 0 else round(random.uniform(1, 100000)),
-		round(random.uniform(1, GAMES_COUNT)) 
-	]
+	while True:
+		x = [
+			idx,
+			round(random.uniform(1, USERS_COUNT)),
+			round(random.uniform(1, USERS_COUNT)),
+			'NULL' if round(random.uniform(0,2)) == 0 else round(random.uniform(1, 100000)),
+			round(random.uniform(1, GAMES_COUNT)) 
+		]
+		if (x[1], x[-1]) not in PURCHASES_SET: 
+			break
+	
+	PURCHASES_SET.add((x[1], x[-1]))
+
+	return x
 
 def create_image_with_text(text:str):
 	WIDTH, HEIGHT = 250, 250

store-service/store/database/db_api.py

@@ -17,24 +17,30 @@
 except psycopg.OperationalError as e:
 	raise ValueError(f'Failed to connect to database: {e}')
 
+game_id = 8
+
 cursor = db.cursor()
 
 cursor.execute("""
-			SELECT t.name
-			FROM game_tags gt
-			JOIN tags t ON gt.tag_id = t.id
-			WHERE gt.game_id = %s;
-		""", (game_id,))
-		data = cursor.fetchall()
-		tags = [tag['name'] for tag in data]
-		return tags
+	SELECT g.*, s.name AS studio_name
+	FROM games g
+	JOIN studios s ON s.id = g.studio_id
+	WHERE g.id = %s;
+""", (game_id,))
+
+data = cursor.fetchall()
+print(data)
 
 try:
-	cursor.execute(queue, params)
-	data = cursor.fetchall()
-	print(data)
-except psycopg.OperationalError as e:
-	print(f'sql execution error {e}')
+		cursor.execute("""
+			SELECT name, img_type, img_fmt
+			FROM games_pictures 
+			WHERE game_id = %s;
+		""", (game_id,))
+		data = cursor.fetchall()
+		print(data)
+except:
+	print('e')
 
 db.close()