Update supabase-client.js

supabase-client.js

@@ -1,6 +1,5 @@
 /**
- * Supabase Database Client
- * Handles all database operations for MindVideo accounts
+ * Supabase Database Client (Updated for New Schema)
  */
 
 import { createClient } from '@supabase/supabase-js';
@@ -38,20 +37,36 @@ export function getSupabase() {
 export async function saveAccount(accountData) {
     const db = getSupabase();
 
+    // 准备数据，移除 undefined 的字段以避免覆盖
+    const upsertData = {
+        email: accountData.email,
+        updated_at: new Date().toISOString()
+    };
+    
+    if (accountData.password) upsertData.password = accountData.password;
+    if (accountData.token) upsertData.token = accountData.token;
+    if (accountData.user_id) upsertData.user_id = accountData.user_id;
+    if (accountData.status) upsertData.status = accountData.status;
+    if (accountData.expire_at) upsertData.expire_at = accountData.expire_at;
+    if (accountData.last_login_at) upsertData.last_login_at = accountData.last_login_at;
+    
+    // 如果是新插入且没有 user_id，生成一个临时的 (为了满足 NOT NULL 约束)
+    // 注意：这里使用 onConflict: email，所以如果 user_id 变了(从 pending 变成真实 ID)，也能更新
+    const { data: existing } = await db.from('accounts').select('user_id').eq('email', accountData.email).single();
+    if (!existing && !accountData.user_id) {
+        upsertData.user_id = `pending_${accountData.email}`;
+    }
+
+    // 合并 metadata 而不是直接覆盖
+    if (accountData.metadata) {
+        // 这一步在 SQL 中比较复杂，这里简化处理：读取-合并-写入，或者直接覆盖
+        // 如果为了性能，可以直接覆盖，因为我们通常是获取了最新全量数据
+        upsertData.metadata = accountData.metadata; 
+    }
+
     const { data, error } = await db
         .from('accounts')
-        .upsert({
-            email: accountData.email,
-            password: accountData.password,
-            token: accountData.token,
-            // If user_id is missing (e.g. during import), use a temporary placeholder
-            user_id: accountData.user_id || `pending_${accountData.email}`,
-            status: accountData.status || 'active',
-            last_login_at: new Date().toISOString(),
-            expire_at: accountData.expire_at,
-            metadata: accountData.metadata || {},
-            updated_at: new Date().toISOString()
-        }, {
+        .upsert(upsertData, {
             onConflict: 'email'
         })
         .select()
@@ -67,154 +82,108 @@ export async function saveAccount(accountData) {
 
 export async function getAccount(email) {
     const db = getSupabase();
-
-    const { data, error } = await db
-        .from('accounts')
-        .select('*')
-        .eq('email', email)
-        .single();
-
-    if (error && error.code !== 'PGRST116') { // PGRST116 = not found
-        console.error('❌ Failed to get account:', error.message);
-        throw error;
-    }
-
+    const { data, error } = await db.from('accounts').select('*').eq('email', email).single();
+    if (error && error.code !== 'PGRST116') throw error;
     return data;
 }
 
 export async function getAllAccounts(status = null) {
     const db = getSupabase();
-
     let query = db.from('accounts').select('*').order('created_at', { ascending: false });
-
-    if (status) {
-        query = query.eq('status', status);
-    }
-
+    if (status) query = query.eq('status', status);
     const { data, error } = await query;
-
-    if (error) {
-        console.error('❌ Failed to get accounts:', error.message);
-        throw error;
-    }
-
+    if (error) throw error;
     return data || [];
 }
 
-export async function updateAccountStatus(email, status) {
-    const db = getSupabase();
-
-    const { data, error } = await db
-        .from('accounts')
-        .update({
-            status,
-            updated_at: new Date().toISOString()
-        })
-        .eq('email', email)
-        .select()
-        .single();
-
-    if (error) {
-        console.error('❌ Failed to update account status:', error.message);
-        throw error;
-    }
-
-    return data;
-}
-
 export async function updateAccountToken(email, token, expireAt, metadata = null) {
-    const db = getSupabase();
-
+    // 复用 saveAccount 逻辑，更加健壮
     const updateData = {
+        email,
         token,
         expire_at: expireAt,
-        last_login_at: new Date().toISOString(),
-        updated_at: new Date().toISOString()
+        last_login_at: new Date().toISOString()
     };
-
-    if (metadata) {
-        updateData.metadata = metadata;
-    }
-
-    const { data, error } = await db
-        .from('accounts')
-        .update(updateData)
-        .eq('email', email)
-        .select()
-        .single();
-
-    if (error) {
-        console.error('❌ Failed to update account token:', error.message);
-        throw error;
-    }
-
-    return data;
+    if (metadata) updateData.metadata = metadata;
+    return await saveAccount(updateData);
 }
 
 /**
- * System Logs
+ * [NEW] Creations Operations
+ * 将 API 返回的列表保存到 creations 表
  */
-export async function logSystem(level, module, message, details = {}) {
+export async function saveCreations(userId, creationsList) {
+    if (!creationsList || creationsList.length === 0) return;
     const db = getSupabase();
 
+    // 映射 API 数据到数据库表结构
+    const records = creationsList.map(item => ({
+        creation_id: item.id,
+        user_id: userId, // 外键，必须存在于 accounts 表
+        type: item.type || 'video', // 默认为 video，根据实际 API 调整
+        status: item.status === 1 ? 'success' : (item.status === 2 ? 'failed' : 'processing'), 
+        prompt: item.prompt || item.title, // API 可能用 title 或 prompt
+        url: item.file_url || item.url || item.video_url,
+        thumbnail_url: item.cover_url,
+        metadata: {
+            duration: item.duration,
+            ratio: item.ratio,
+            engine: item.engine
+        },
+        created_at: item.created_at ? new Date(item.created_at).toISOString() : null,
+        fetched_at: new Date().toISOString()
+    }));
+
     const { error } = await db
-        .from('system_logs')
-        .insert({
-            level,
-            module,
-            message,
-            details,
-            created_at: new Date().toISOString()
+        .from('creations')
+        .upsert(records, {
+            onConflict: 'creation_id' // 根据 creation_id 去重更新
         });
 
     if (error) {
-        console.error('❌ Failed to log system event:', error.message);
+        console.error(`❌ Failed to save creations for user ${userId}:`, error.message);
+    } else {
+        console.log(`💾 Saved ${records.length} creations for user ${userId}`);
     }
 }
 
 /**
- * Import accounts from KV or JSON data
+ * System Logs
  */
-export async function importAccounts(accountsData) {
+export async function logSystem(level, module, message, details = {}) {
     const db = getSupabase();
-    const results = {
-        success: 0,
-        failed: 0,
-        errors: []
-    };
+    // 尝试获取 details 中的 email 或 user_id 来填充字段 (可选优化)
+    const userId = details.user_id || null;
+
+    await db.from('system_logs').insert({
+        level,
+        module,
+        message,
+        details,
+        user_id: userId,
+        created_at: new Date().toISOString()
+    });
+}
 
+// ... importAccounts 等其他函数保持兼容性即可 ...
+export async function importAccounts(accountsData) {
+    const results = { success: 0, failed: 0, errors: [] };
     for (const account of accountsData) {
         try {
             await saveAccount(account);
             results.success++;
         } catch (error) {
             results.failed++;
-            results.errors.push({
-                email: account.email,
-                error: error.message
-            });
+            results.errors.push({ email: account.email, error: error.message });
         }
     }
-
-    await logSystem('info', 'import', `Imported ${results.success} accounts`, results);
-
     return results;
 }
 
-/**
- * Get account statistics
- */
 export async function getAccountStats() {
     const db = getSupabase();
-
-    const { data, error } = await db
-        .from('account_statistics')
-        .select('*');
-
-    if (error) {
-        console.error('❌ Failed to get account statistics:', error.message);
-        return null;
-    }
-
+    // 使用你新建的视图
+    const { data, error } = await db.from('account_statistics').select('*');
+    if (error) return null;
     return data;
 }