Update database.py

database.py

@@ -3,6 +3,7 @@ import os
 from flask import g
 
 def get_db_path():
+    """Veritabanı dosya yolunu belirler"""
     if os.path.exists('/data'):
         return '/data/users.db'
     elif os.path.exists('/home/user_data'):
@@ -10,6 +11,7 @@ def get_db_path():
     return 'users.db'
 
 def get_db():
+    """Veritabanı bağlantısını getirir veya oluşturur"""
     if 'db' not in g:
         db_path = get_db_path()
         os.makedirs(os.path.dirname(db_path), exist_ok=True)
@@ -18,15 +20,18 @@ def get_db():
     return g.db
 
 def close_db(e=None):
+    """Veritabanı bağlantısını kapatır"""
     db = g.pop('db', None)
     if db is not None:
         db.close()
 
 def init_db(app):
+    """Veritabanı tablolarını oluşturur ve örnek verileri ekler"""
     with app.app_context():
         db = get_db()
         cursor = db.cursor()
         
+        # Kullanıcılar tablosu
         cursor.execute('''
             CREATE TABLE IF NOT EXISTS users (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -40,6 +45,18 @@ def init_db(app):
             )
         ''')
         
+        # Generate list tablosu
+        cursor.execute('''
+            CREATE TABLE IF NOT EXISTS generate_list (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                title TEXT NOT NULL,
+                image_url TEXT NOT NULL,
+                contour INTEGER NOT NULL,
+                item_order INTEGER NOT NULL DEFAULT 0
+            )
+        ''')
+        
+        # Örnek kullanıcı verileri
         cursor.execute('SELECT COUNT(*) FROM users')
         if cursor.fetchone()[0] == 0:
             cursor.executemany('''
@@ -50,48 +67,51 @@ def init_db(app):
                 ('test_udid_2', 'IOS', False, 4, 'test_invoice_2')
             ])
         
-        # Generate_list tablosu güncellendi (order eklendi)
-        cursor.execute('''
-            CREATE TABLE IF NOT EXISTS generate_list (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                title TEXT NOT NULL,
-                image_url TEXT NOT NULL,
-                contour INTEGER NOT NULL,
-                item_order INTEGER NOT NULL DEFAULT 0
-            )
-        ''')
+        # Örnek model verileri
+        cursor.execute('SELECT COUNT(*) FROM generate_list')
+        if cursor.fetchone()[0] == 0:
+            default_models = [
+                ("REALISTIC", "assets/images/0.jpg", 0, 0),
+                ("DRAWING", "assets/images/1.jpg", 10, 1),
+                ("TOY FIGURE", "assets/images/2.jpg", 10, 2),
+                ("3D", "assets/images/3.jpg", 40, 3),
+                ("ANIMATION", "assets/images/4.jpg", 50, 4)
+            ]
+            cursor.executemany('''
+                INSERT INTO generate_list (title, image_url, contour, item_order)
+                VALUES (?, ?, ?, ?)
+            ''', default_models)
         
         db.commit()
 
 def get_generate_list(db):
+    """Generate listesindeki tüm öğeleri sıralı şekilde getirir"""
     cursor = db.cursor()
     cursor.execute('''
         SELECT id, title, image_url, contour, item_order 
         FROM generate_list 
-        ORDER BY item_order ASC, id ASC
+        ORDER BY item_order ASC
     ''')
-    items = cursor.fetchall()
-    return [dict(item) for item in items]
+    return cursor.fetchall()
 
 def add_to_generate_list(db, title, image_url, contour, order=None):
+    """Generate listesine yeni öğe ekler"""
     cursor = db.cursor()
     
-    # Order belirtilmezse en son sıraya ekle
     if order is None:
         cursor.execute('SELECT MAX(item_order) FROM generate_list')
-        max_order = cursor.fetchone()[0]
-        order = (max_order or 0) + 1
+        max_order = cursor.fetchone()[0] or 0
+        order = max_order + 1
     
     cursor.execute('''
         INSERT INTO generate_list (title, image_url, contour, item_order)
         VALUES (?, ?, ?, ?)
     ''', (title, image_url, contour, order))
-    
     db.commit()
-    cursor.execute('SELECT id FROM generate_list WHERE rowid = ?', (cursor.lastrowid,))
-    return cursor.fetchone()[0]
+    return cursor.lastrowid
 
 def update_item_order(db, item_id, new_order):
+    """Öğenin sıralama pozisyonunu günceller"""
     cursor = db.cursor()
     cursor.execute('''
         UPDATE generate_list 
@@ -102,6 +122,7 @@ def update_item_order(db, item_id, new_order):
     return cursor.rowcount > 0
 
 def create_user(udid, platform):
+    """Yeni kullanıcı oluşturur"""
     try:
         if platform not in ['AND', 'IOS']:
             raise ValueError("Platform must be either 'AND' or 'IOS'")
@@ -112,7 +133,8 @@ def create_user(udid, platform):
         db.commit()
         cursor.execute('SELECT * FROM users WHERE udid = ?', (udid,))
         new_user = cursor.fetchone()
-        return dict(new_user)
+        return dict(new_user) if new_user else None
+        
     except sqlite3.IntegrityError:
         raise ValueError("User with this UDID already exists")
     except Exception as e: