ts-glitter 21.8.4 → 21.8.7

package/src/api-public/services/shopping.ts

@@ -647,55 +647,7 @@ export class Shopping {
       }
 
       if (query.status) {
-        const statusSplit = query.status.split(',').map(status => status.trim());
-        const statusJoin = statusSplit.map(status => `"${status}"`).join(',');
-
-        // 基本條件
-        const statusCondition = `JSON_EXTRACT(content, '$.status') IN (${statusJoin})`;
-
-        // 時間條件
-        const currentDate = db.escape(new Date().toISOString());
-
-        const scheduleConditions = statusSplit
-          .map(status => {
-            switch (status) {
-              case 'inRange':
-                return `OR (
-                      JSON_EXTRACT(content, '$.status') IN ('active', 1)
-                      AND (
-                          content->>'$.active_schedule' IS NULL OR 
-                          (
-                              (
-                                  ((CONCAT(content->>'$.active_schedule.start_ISO_Date') IS NULL) and (CONCAT(content->>'$.active_schedule.startDate') IS NULL)) or
-                                  ((CONCAT(content->>'$.active_schedule.start_ISO_Date') <= ${currentDate}) or (CONCAT(content->>'$.active_schedule.startDate') <= ${db.escape(moment().format('YYYY-MM-DD'))}))
-                              )
-                              AND (
-                                ((CONCAT(content->>'$.active_schedule.end_ISO_Date') IS NULL) and (CONCAT(content->>'$.active_schedule.endDate') IS NULL)) or
-                                  (CONCAT(content->>'$.active_schedule.end_ISO_Date') >= ${currentDate}) or (CONCAT(content->>'$.active_schedule.endDate') >= ${db.escape(moment().format('YYYY-MM-DD'))})
-                              )
-                          )
-                      )
-                  )`;
-              case 'beforeStart':
-                return `
-                  OR (
-                      JSON_EXTRACT(content, '$.status') IN ('active', 1)
-                      AND CONCAT(content->>'$.active_schedule.start_ISO_Date') > ${currentDate}
-                  )`;
-              case 'afterEnd':
-                return `
-                  OR (
-                      JSON_EXTRACT(content, '$.status') IN ('active', 1)
-                      AND CONCAT(content->>'$.active_schedule.end_ISO_Date') < ${currentDate}
-                  )`;
-              default:
-                return '';
-            }
-          })
-          .join('');
-
-        // 組合 SQL 條件
-        querySql.push(`(${statusCondition} ${scheduleConditions})`);
+        querySql.push(Shopping.productStatusSQL(query.status));
       }
 
       if (query.channel) {
@@ -4482,12 +4434,31 @@ export class Shopping {
         `,
         [{ content: JSON.stringify(content) }, content.id]
       );
-      // 同步更新蝦皮
-      if (content.shopee_id) {
-        await new Shopee(this.app, this.token).asyncStockToShopee({
-          product: { content },
-          callback: () => {},
-        });
+
+      // 刪除不存在的商品規格
+      const null_variant_id_array = (
+        await db.query(
+          `SELECT v.id
+          FROM \`${this.app}\`.t_variants v
+          LEFT JOIN \`${this.app}\`.t_manager_post p ON v.product_id = p.id
+          WHERE p.content->>'$.type' <> 'product' OR p.id IS NULL`,
+          []
+        )
+      ).map((item: any) => item.id);
+
+      if (null_variant_id_array.length > 0) {
+        await db.query(
+          `DELETE FROM \`${this.app}\`.t_variants WHERE id IN (${null_variant_id_array.join(',')})
+          `,
+          []
+        );
+      }
+        // 同步更新蝦皮
+        if (content.shopee_id) {
+          await new Shopee(this.app, this.token).asyncStockToShopee({
+            product: { content },
+            callback: () => {},
+          });
       }
     } catch (error) {
       console.error(error);
@@ -5557,6 +5528,59 @@ export class Shopping {
     }
   }
 
+  static productStatusSQL(queryStatus: string, table: string = '') {
+    const tableName = table ? `${table}.` : '';
+    const statusSplit = queryStatus.split(',').map(status => status.trim());
+    const statusJoin = statusSplit.map(status => `"${status}"`).join(',');
+
+    // 基本條件
+    const statusCondition = `JSON_EXTRACT(${tableName}content, '$.status') IN (${statusJoin})`;
+
+    // 時間條件
+    const currentDate = db.escape(new Date().toISOString());
+
+    const scheduleConditions = statusSplit
+      .map(status => {
+        switch (status) {
+          case 'inRange':
+            return `OR (
+                  JSON_EXTRACT(${tableName}content, '$.status') IN ('active', 1)
+                  AND (
+                    ${tableName}content->>'$.active_schedule' IS NULL OR 
+                      (
+                          (
+                              ((CONCAT(${tableName}content->>'$.active_schedule.start_ISO_Date') IS NULL) and (CONCAT(${tableName}content->>'$.active_schedule.startDate') IS NULL)) or
+                              ((CONCAT(${tableName}content->>'$.active_schedule.start_ISO_Date') <= ${currentDate}) or (CONCAT(${tableName}content->>'$.active_schedule.startDate') <= ${db.escape(moment().format('YYYY-MM-DD'))}))
+                          )
+                          AND (
+                            ((CONCAT(${tableName}content->>'$.active_schedule.end_ISO_Date') IS NULL) and (CONCAT(${tableName}content->>'$.active_schedule.endDate') IS NULL)) or
+                              (CONCAT(${tableName}content->>'$.active_schedule.end_ISO_Date') >= ${currentDate}) or (CONCAT(${tableName}content->>'$.active_schedule.endDate') >= ${db.escape(moment().format('YYYY-MM-DD'))})
+                          )
+                      )
+                  )
+              )`;
+          case 'beforeStart':
+            return `
+              OR (
+                  JSON_EXTRACT(${tableName}content, '$.status') IN ('active', 1)
+                  AND CONCAT(${tableName}content->>'$.active_schedule.start_ISO_Date') > ${currentDate}
+              )`;
+          case 'afterEnd':
+            return `
+              OR (
+                  JSON_EXTRACT(${tableName}content, '$.status') IN ('active', 1)
+                  AND CONCAT(${tableName}content->>'$.active_schedule.end_ISO_Date') < ${currentDate}
+              )`;
+          default:
+            return '';
+        }
+      })
+      .join('');
+
+    // 組合 SQL 條件
+    return `(${statusCondition} ${scheduleConditions})`;
+  }
+
   async getVariants(query: {
     page: number;
     limit: number;
@@ -5621,11 +5645,14 @@ export class Shopping {
             })
             .join(' or ')})`
         );
-      query.status &&
+
+      if (query.status) {
         querySql.push(`
-             v.product_id in (select p.id
-                                            from \`${this.app}\`.t_manager_post as p where (JSON_EXTRACT(p.content, '$.status') = '${query.status}'))
-            `);
+          v.product_id IN (SELECT p.id
+            FROM \`${this.app}\`.t_manager_post AS p WHERE ${Shopping.productStatusSQL(query.status, 'p')})
+       `);
+      }
+
       query.min_price && querySql.push(`(v.content->>'$.sale_price' >= ${query.min_price})`);
       query.max_price && querySql.push(`(v.content->>'$.sale_price' <= ${query.min_price})`);
 
@@ -5967,9 +5994,7 @@ export class Shopping {
   async getProductComment(product_id: number) {
     try {
       const comments = await db.query(
-        `SELECT *
-         FROM \`${this.app}\`.t_product_comment
-         WHERE product_id = ?;
+        `SELECT * FROM \`${this.app}\`.t_product_comment WHERE product_id = ?;
         `,
         [product_id]
       );

package/src/services/saas-table-check.js

@@ -276,7 +276,7 @@ function chunkArray(array, groupSize) {
 }
 async function compare_sql_table(scheme, table, sql) {
     try {
-        await database_1.default.execute(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
+        await database_1.default.query(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
         return true;
     }
     catch (e) {

package/src/services/saas-table-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"saas-table-check.js","sourceRoot":"","sources":["saas-table-check.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"saas-table-check.js","sourceRoot":"","sources":["saas-table-check.ts"],"names":[],"mappings":"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"}

package/src/services/saas-table-check.ts

@@ -276,7 +276,7 @@ function chunkArray(array: any, groupSize: number) {
 
 export async function compare_sql_table(scheme: string, table: string, sql: string): Promise<any> {
   try {
-    await db.execute(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
+    await db.query(`CREATE TABLE if not exists \`${scheme}\`.\`${table}\` ${sql}`, []);
     // const tempKey = 'tempcompare' + table;
     // const trans = await db.Transaction.build();
     // await trans.execute(`DROP TABLE if exists \`${scheme}\`.\`${tempKey}\`;`, []);