fix

oms/dist/services/cron-jobs/active-user-daily-notify.js

@@ -187,7 +187,8 @@ async function run() {
             fmToken: { $nin: [null, ""] },
             //   versionName: { $in: ["5.8.0-debug"] },
             // versionName: { $in: ["5.8.0", "5.8.0-debug"] },
-            versionCode: { $gte: 347 },
+            // versionCode: { $gte: 347 },
+            $or: [{ versionCode: { $gte: 347 } }, { versionCode: -1 }],
         })
             .select("_id uid fmToken lang cc")
             .lean();
@@ -231,7 +232,7 @@ async function run() {
             const userLang = getUserLanguage(user);
             const fcmToken = user.fmToken;
             const data1 = getMessageDataFromTemplate(messageData.template1, userLang);
-            data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/fcm/640/${artwork1Id}.png`;
+            data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/page/640/${artwork1Id}.png`;
             data1.bigger = "true";
             data1.action = "go/art";
             data1.param = artwork1Id;

oms/dist/services/ingestor-service.js

@@ -374,6 +374,14 @@ async function processMessage(msg) {
                 if (field === "deviceMem" && typeof eventData[sourceFieldName] === "number") {
                     userSetData.deviceMem = eventData[sourceFieldName];
                 }
+                else if (field === "versionCode" && typeof eventData[sourceFieldName] === "number" && eventData[sourceFieldName] < 0) {
+                    // 异常数据处理，verison code 可能为-1
+                    continue;
+                }
+                else if (field === "versionName" && eventData[sourceFieldName] === "unknown") {
+                    // 异常数据处理，versionName 可能为 unkown
+                    continue;
+                }
                 else {
                     // Type assertion needed as Partial<IUser> doesn't guarantee all keys are assignable at runtime
                     userSetData[field] = eventData[sourceFieldName];

oms/dist/src/scripts/active-user-daily-notify.js

@@ -225,6 +225,7 @@ async function run() {
             // versionName: { $in: ["5.8.2-debug"] },
             // versionName: { $in: ["5.8.2", "5.8.2-debug"] },
             // versionCode: { $gte: 347 },
+            $or: [{ versionCode: { $gte: 347 } }, { versionCode: -1 }],
         })
             .select("_id uid fmToken lang cc")
             .lean();

oms/services/cron-jobs/active-user-daily-notify.ts

@@ -198,7 +198,8 @@ export async function run(): Promise<void> {
       fmToken: { $nin: [null, ""] },
       //   versionName: { $in: ["5.8.0-debug"] },
       // versionName: { $in: ["5.8.0", "5.8.0-debug"] },
-      versionCode: { $gte: 347 },
+      // versionCode: { $gte: 347 },
+      $or: [{ versionCode: { $gte: 347 } }, { versionCode: -1 }],
     })
       .select("_id uid fmToken lang cc")
       .lean<IUser[]>();
@@ -248,7 +249,7 @@ export async function run(): Promise<void> {
       const fcmToken = user.fmToken as string;
 
       const data1 = getMessageDataFromTemplate(messageData.template1, userLang);
-      data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/fcm/640/${artwork1Id}.png`;
+      data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/page/640/${artwork1Id}.png`;
       data1.bigger = "true";
       data1.action = "go/art";
       data1.param = artwork1Id;

oms/services/ingestor-service.ts

@@ -351,6 +351,12 @@ async function processMessage(msg: Message) {
       if (sourceFieldName && eventData[sourceFieldName] !== undefined && eventData[sourceFieldName] !== null) {
         if (field === "deviceMem" && typeof eventData[sourceFieldName] === "number") {
           userSetData.deviceMem = eventData[sourceFieldName];
+        } else if (field === "versionCode" && typeof eventData[sourceFieldName] === "number" && eventData[sourceFieldName] < 0) {
+          // 异常数据处理，verison code 可能为-1
+          continue;
+        } else if (field === "versionName" && eventData[sourceFieldName] === "unknown") {
+          // 异常数据处理，versionName 可能为 unkown
+          continue;
         } else {
           // Type assertion needed as Partial<IUser> doesn't guarantee all keys are assignable at runtime
           userSetData[field] = eventData[sourceFieldName];

oms/src/scripts/active-user-daily-notify.ts

@@ -214,6 +214,7 @@ export async function run(): Promise<void> {
       // versionName: { $in: ["5.8.2-debug"] },
       // versionName: { $in: ["5.8.2", "5.8.2-debug"] },
       // versionCode: { $gte: 347 },
+      $or: [{ versionCode: { $gte: 347 } }, { versionCode: -1 }],
     })
       .select("_id uid fmToken lang cc")
       .lean<IUser[]>();