@yellowpanther/shared 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yellowpanther/shared",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "publishConfig": {
     "access": "public"
   },
@@ -20,6 +20,7 @@
     "./redis/redisClient": "./src/redis/redisClient.js",
     "./queue/compressionQueue": "./src/queue/compressionQueue.js",
     "./queue/newsTranslationQueue": "./src/queue/newsTranslationQueue.js",
+    "./queue/addUserPointsQueue": "./src/queue/addUserPointsQueue.js",
     "./queue/newsTranslateQueue": "./src/queue/newsTranslateQueue.js",
     "./queue/newsPublishQueue": "./src/queue/newsPublishQueue.js",
     "./queue/articlePublishQueue": "./src/queue/articlePublishQueue.js",
@@ -28,12 +29,13 @@
     "./queue/imagePublishQueue": "./src/queue/imagePublishQueue.js",
     "./queue/imageAlbumPublishQueue": "./src/queue/imageAlbumPublishQueue.js",
     "./queue/pagePublishQueue": "./src/queue/pagePublishQueue.js",
-    "./queue/shopPublishQueue": "./src/queue/shopPublishQueue.js",
     "./queue/productPublishQueue": "./src/queue/productPublishQueue.js",
     "./queue/quizPublishQueue": "./src/queue/quizPublishQueue.js",
     "./queue/predictPublishQueue": "./src/queue/predictPublishQueue.js",
     "./queue/queueRegistry": "./src/queue/queueRegistry.js",
+    "./queue/shopPublishQueue": "./src/queue/shopPublishQueue.js",
     "./lang/translationHelper": "./src/lang/translationHelper.js",
+    "./queue/pageTranslationQueue": "./src/queue/pageTranslationQueue.js",
     "./*": "./src/*"
   },
   "scripts": {
@@ -42,6 +44,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@yellowpanther/shared": "^1.3.2",
     "dotenv": "^17.2.2",
     "joi": "^18.0.1"
   }

package/src/index.js

@@ -21,6 +21,8 @@ module.exports = {
     .addArticlePublishJob,
   addVideoPublishJob: require("./queue/videoPublishQueue").addVideoPublishJob,
   addImagePublishJob: require("./queue/imagePublishQueue").addImagePublishJob,
+  pageTranslateQueue: require('./queue/pageTranslationQueue'),
+  addPageTranslationJob: require('./queue/pageTranslationQueue').addPageTranslationJob,
   addPagePublishJob: require("./queue/pagePublishQueue").addPagePublishJob,
   addProductPublishJob: require("./queue/productPublishQueue")
     .addProductPublishJob,
@@ -30,5 +32,6 @@ module.exports = {
   addImageAlbumPublishJob: require("./queue/imageAlbumPublishQueue")
     .addImageAlbumPublishJob,
   addEventPublishJob: require("./queue/eventPublishQueue").addEventPublishJob,
+  addUserPointsJob: require("./queue/addUserPointsQueue").addUserPointsJob,
   addShopPublishJob: require("./queue/shopPublishQueue").addShopPublishJob,
 };

package/src/queue/addUserPointsQueue.js

@@ -0,0 +1,49 @@
+
+const { Queue } = require("bullmq");
+const redisClient = require("../redis/redisClient");
+
+const DEBUG = String(process.env.DEBUG_LOGGER || "").trim() === "1";
+
+const addUserPointsQueue = new Queue("addUserPointsQueue", {
+  connection: redisClient,
+  defaultJobOptions: {
+    attempts: 5,
+    backoff: { type: "exponential", delay: 2000 },
+    removeOnComplete: 500,
+    removeOnFail: 500,
+  },
+});
+
+function sanitizeId(str) {
+  return str.replace(/[:.]/g, "-");
+}
+
+function stableJobId(option_id) {
+  return sanitizeId(`addUserPointsQueue:${option_id}`);
+}
+
+function versionedJobId(option_id) {
+  return sanitizeId(`addUserPoints:${option_id}`);
+}
+
+async function addUserPointsJob(correctOption, useStableId = false){
+        // const jobId = useStableId
+        //     ? stableJobId(correctOption.id)
+        //     : versionedJobId(correctOption.id);
+
+        const job = await addUserPointsQueue.add(
+              "addUserPointsQueue",
+              { option_id: correctOption.id },
+              // { jobId }
+            ); 
+
+             if (DEBUG) {
+                console.info("[addUserPointsQueue] upsert", {
+                  option_id: correctOption.id,
+                  // jobId,
+                });
+              }
+          return job;
+  }
+
+module.exports = {addUserPointsJob}

package/src/queue/pageTranslationQueue.js

@@ -0,0 +1,29 @@
+const { Queue } = require('bullmq');
+const redisClient = require('../redis/redisClient');
+
+const pageTranslationQueue = new Queue('pageTranslationQueue', {
+    connection: redisClient,
+    defaultJobOptions: {
+        removeOnComplete: false,
+        removeOnFail: false,
+        attempts: 3,
+        backoff: {
+            type: 'exponential',
+            delay: 1000
+        }
+    }
+});
+
+/**
+ * Add a page translation job
+ * @param {Object} jobData
+ * @returns {Promise<void>}
+ */
+async function addPageTranslationJob({ page_id, user_id, translation, blocks, heromedia }) {
+    await pageTranslationQueue.add('translatePage', { page_id, user_id, translation, blocks, heromedia });
+}
+
+module.exports = {
+    pageTranslationQueue,
+    addPageTranslationJob
+};

package/src/queue/shopPublishQueue.js

@@ -68,7 +68,7 @@ async function findPendingShopJobs(shop_id) {
   const states = ["delayed", "waiting", "waiting-children", "active"];
   const jobs = await shopPublishQueue.getJobs(states);
   return jobs.filter(
-    (j) => j?.name === "shop:publish" && j?.data?.shop_id === String(shop_id),
+    (j) => j?.name === "shop:publish" && j?.data?.shop_id === String(shop_id)
   );
 }
 
@@ -84,7 +84,7 @@ async function purgeExistingForShop(shop_id) {
     } catch (e) {
       if (DEBUG)
         console.warn(
-          `[shopPublishQueue] failed to remove pending job ${j.id}: ${e.message}`,
+          `[shopPublishQueue] failed to remove pending job ${j.id}: ${e.message}`
         );
     }
   }
@@ -98,7 +98,7 @@ async function purgeExistingForShop(shop_id) {
     } catch (e) {
       if (DEBUG)
         console.warn(
-          `[shopPublishQueue] failed to remove stable job ${last.id}: ${e.message}`,
+          `[shopPublishQueue] failed to remove stable job ${last.id}: ${e.message}`
         );
     }
   }
@@ -154,7 +154,7 @@ async function addShopPublishJob({
   const job = await shopPublishQueue.add(
     "shop:publish",
     { shop_id: String(shop_id), runAtUtc: runAtIso, extra },
-    { jobId, delay: delayMs },
+    { jobId, delay: delayMs }
   );
 
   if (DEBUG) {