@yrpri/api 9.0.139 → 9.0.141

package/services/workers/anonymizations.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/services/workers/bulk_status_update.cjs

@@ -2,7 +2,7 @@
 // https://gist.github.com/mojodna/1251812
 var async = require("async");
 var models = require("../../models/index.cjs");
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var queue = require('./queue.cjs');
 var i18n = require('../utils/i18n.cjs');
 var toJson = require('../utils/to_json.cjs');
@@ -202,7 +202,7 @@ var createStatusUpdateForPostId = function (postId, official_status, content, us
                 });
             }
             else {
-                console.log("Not changing status, only verifying");
+                log.info("Not changing status, only verifying");
                 verifiedStatusChangedPostsCount += 1;
             }
         }

package/services/workers/delayed_jobs.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require("../utils/logger.cjs");
+const log = require("../../utils/logger.cjs");
 const queue = require("./queue.cjs");
 const i18n = require("../utils/i18n.cjs");
 const toJson = require("../utils/to_json.cjs");

package/services/workers/deletions.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/services/workers/email.cjs

@@ -1,6 +1,6 @@
 "use strict";
 // https://gist.github.com/mojodna/1251812
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 /**
  * @class EmailWorker
  * @constructor

package/services/workers/fraud_management.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');
@@ -54,7 +54,7 @@ const ProcessFraudGet = async (workPackage, done) => {
         }
     }
     catch (error) {
-        console.error(error);
+        log.error(error);
         await models.AcBackgroundJob.updateErrorAsync(workPackage.jobId, error);
         done(error);
     }
@@ -88,7 +88,7 @@ const ProcessFraudDelete = async (workPackage, done) => {
         }
     }
     catch (error) {
-        console.error(error);
+        log.error(error);
         await models.AcBackgroundJob.updateErrorAsync(workPackage.jobId, error.toString());
         done(error);
     }

package/services/workers/generativeAi.js

@@ -1,12 +1,13 @@
 import { AoiIconGenerator } from "../engine/allOurIdeas/iconGenerator.js";
 import models from "../../models/index.cjs";
 import { CollectionImageGenerator } from "../llms/imageGeneration/collectionImageGenerator.js";
+import log from "../../utils/loggerTs.js";
 const dbModels = models;
 const Image = dbModels.Image;
 const AcBackgroundJob = dbModels.AcBackgroundJob;
 export class GenerativeAiWorker {
     async process(workPackage, callback) {
-        console.info(`Processing workPackage: ${JSON.stringify(workPackage)}`);
+        log.info(`Processing workPackage: ${JSON.stringify(workPackage)}`);
         switch (workPackage.type) {
             case "collection-image":
                 try {
@@ -18,13 +19,13 @@ export class GenerativeAiWorker {
                         generator = new CollectionImageGenerator();
                     }
                     const { imageId, imageUrl } = await generator.createCollectionImage(workPackage);
-                    console.info(`Created imageId: ${imageId} imageUrl: ${imageUrl}`);
+                    log.info(`Created imageId: ${imageId} imageUrl: ${imageUrl}`);
                     if (imageId) {
                         await AcBackgroundJob.updateDataAsync(workPackage.jobId, {
                             imageId,
                             imageUrl,
                         });
-                        console.debug(`Updated job ${workPackage.jobId} with imageId: ${imageId} imageUrl: ${imageUrl}`);
+                        log.debug(`Updated job ${workPackage.jobId} with imageId: ${imageId} imageUrl: ${imageUrl}`);
                     }
                     else {
                         await AcBackgroundJob.update({
@@ -36,7 +37,7 @@ export class GenerativeAiWorker {
                     callback();
                 }
                 catch (error) {
-                    console.error(error);
+                    log.error(error);
                     if (typeof error !== "string") {
                         error = JSON.stringify(error);
                     }
@@ -44,7 +45,7 @@ export class GenerativeAiWorker {
                         await AcBackgroundJob.updateErrorAsync(workPackage.jobId, error);
                     }
                     catch (error) {
-                        console.error(error);
+                        log.error(error);
                     }
                     callback(error);
                 }

package/services/workers/main.cjs

@@ -1,7 +1,7 @@
 "use strict";
 var i18n = require('../utils/i18n.cjs');
 var Backend = require('i18next-fs-backend');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var path = require('path');
 var activity = require('./activity.cjs');
 var notification_delivery = require('./notification_delivery.cjs');

package/services/workers/marketing.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/services/workers/moderation.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/services/workers/notification_delivery.cjs

@@ -2,7 +2,7 @@
 // https://gist.github.com/mojodna/1251812
 var async = require("async");
 var models = require("../../models/index.cjs");
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var queue = require('./queue.cjs');
 var i18n = require('../utils/i18n.cjs');
 var toJson = require('../utils/to_json.cjs');

package/services/workers/notification_news_feed.cjs

@@ -2,7 +2,7 @@
 // https://gist.github.com/mojodna/1251812
 var async = require("async");
 var models = require("../../models/index.cjs");
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var queue = require('./queue.cjs');
 var i18n = require('../utils/i18n.cjs');
 var toJson = require('../utils/to_json.cjs');

package/services/workers/queue.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const url = require('url');
 var airbrake = null;
 if (process.env.AIRBRAKE_PROJECT_ID) {
@@ -20,7 +20,7 @@ const redissOptions = {
 log.info("Starting app access to Bull Queue", { redis_url: redisUrl });
 class YpQueue {
     constructor() {
-        console.log("Create YpQueue");
+        log.info("Create YpQueue");
         this.createQueues();
     }
     get defaultQueueOptions() {

package/services/workers/recount.cjs

@@ -1,6 +1,6 @@
 "use strict";
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const _ = require("lodash");
 const recountGroupFolder = async (workPackage, callback) => {
     try {

package/services/workers/reports.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/services/workers/similarities.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');
@@ -21,8 +21,10 @@ function SimilaritiesWorker() { }
  */
 SimilaritiesWorker.prototype.process = function (workPackage, callback) {
     switch (workPackage.type) {
+        //TODO: This is disabled until our new similarities backend is ready
         case 'update-collection':
-            updateSimilaritiesCollection(workPackage, callback);
+            // updateSimilaritiesCollection(workPackage, callback);
+            callback();
             break;
         default:
             callback("Unknown type for workPackage: " + workPackage.type);

package/services/workers/speech_to_text.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const async = require("async");
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const queue = require('./queue.cjs');
 const i18n = require('../utils/i18n.cjs');
 const toJson = require('../utils/to_json.cjs');

package/utils/airbrake.cjs

@@ -2,6 +2,7 @@
 if (process.env.AIRBRAKE_PROJECT_ID) {
     const Airbrake = require('@airbrake/node');
     let airBrake = null;
+    const log = require('./logger.cjs');
     try {
         airBrake = new Airbrake.Notifier({
             projectId: process.env.AIRBRAKE_PROJECT_ID,
@@ -11,7 +12,7 @@ if (process.env.AIRBRAKE_PROJECT_ID) {
     }
     catch (error) {
         airBrake = null;
-        console.error(error);
+        log.error(error);
     }
     module.exports = airBrake;
 }

package/utils/cjsCodeReview.js

@@ -2,6 +2,7 @@ import { OpenAI } from "openai";
 import * as fs from "fs";
 import * as path from "path";
 import { promisify } from "util";
+import log from "./loggerTs.js";
 const readFilePromise = promisify(fs.readFile);
 export class YpCjsCodeReview {
     constructor() {
@@ -36,10 +37,10 @@ export class YpCjsCodeReview {
     async reviewCjsFiles() {
         const files = await this.readFilesRecursively("./");
         for (const file of files) {
-            console.log(`Reviewing file: ${file}`);
+            log.info(`Reviewing file: ${file}`);
             const content = await readFilePromise(file, "utf8");
             const review = await this.callLlm(content);
-            console.log(`\n-----------------\nReview for file ${file}:\n${review}\n-----------------\n\n`);
+            log.info(`\n-----------------\nReview for file ${file}:\n${review}\n-----------------\n\n`);
         }
     }
     renderSystemPrompt() {
@@ -69,22 +70,22 @@ Your review results:`;
         let running = true;
         while (running) {
             try {
-                //console.log(`Messages ${retries}:`, messages);
+                //log.info(`Messages ${retries}:`, messages);
                 const results = await this.openaiClient.chat.completions.create({
                     model: this.modelName,
                     messages,
                     max_tokens: this.maxTokens,
                     temperature: this.temperature,
                 });
-                //console.log("Results:", results);
+                //log.info("Results:", results);
                 const textReview = results.choices[0].message.content;
                 return textReview;
             }
             catch (error) {
-                console.error("Error:", error);
+                log.error("Error:", error);
                 retries++;
                 if (retries > maxRetries) {
-                    console.error("Max retries reached");
+                    log.error("Max retries reached");
                     running = false;
                     return undefined;
                 }

package/utils/community_mapping_tools.cjs

@@ -1,5 +1,6 @@
 "use strict";
 const models = require('../models/index.cjs');
+const log = require('./logger.cjs');
 async function getTranslationForMap(textType, model, targetLanguage) {
     return await new Promise((resolve, reject) => {
         models.AcTranslationCache.getTranslation({ query: { textType, targetLanguage } }, model, async (error, translation) => {
@@ -8,7 +9,7 @@ async function getTranslationForMap(textType, model, targetLanguage) {
             }
             else {
                 resolve();
-                console.log("No translation");
+                log.info("No translation");
             }
         });
     });
@@ -89,7 +90,7 @@ const getCommunityMap = async (communityId, map, options) => {
                 resolve();
             }
             else {
-                console.error("Cant find community " + communityId);
+                log.error("Cant find community " + communityId);
                 map.children.push({ name: "Not found community id " + communityId, children: [] });
                 resolve();
             }

package/utils/copy_utils.cjs

@@ -1,6 +1,7 @@
 "use strict";
 var models = require("../models/index.cjs");
 var async = require("async");
+const log = require('./logger.cjs');
 const { cloneTranslationForGroup, } = require("../services/utils/translation_cloning.cjs");
 const { cloneTranslationForCommunity, } = require("../services/utils/translation_cloning.cjs");
 const { cloneTranslationForPoint, } = require("../services/utils/translation_cloning.cjs");
@@ -132,7 +133,7 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
             }).then(function (postIn) {
                 oldPost = postIn;
                 if (!postIn) {
-                    console.error("No post in");
+                    log.error("No post in");
                     callback("no post");
                 }
                 else {
@@ -371,7 +372,7 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
                                 }
                             },
                         ], function (error) {
-                            console.log("Have copied post to group id");
+                            log.info("Have copied post to group id");
                             callback(error);
                         });
                     })
@@ -527,7 +528,7 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
                                                 newActivity
                                                     .save()
                                                     .then(function (results) {
-                                                    console.log("Have changed group and all activity: " +
+                                                    log.info("Have changed group and all activity: " +
                                                         newActivity.id);
                                                     activitesSeriesCallback();
                                                 })
@@ -548,7 +549,7 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
                             });
                         });
                     }, function (error) {
-                        console.log("Have changed group and all for point");
+                        log.info("Have changed group and all for point");
                         callback();
                     });
                 });
@@ -578,7 +579,7 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
                         newActivity
                             .save()
                             .then(function (results) {
-                            console.log("Have changed group and all activity: " + newActivity.id);
+                            log.info("Have changed group and all activity: " + newActivity.id);
                             innerSeriesCallback();
                         })
                             .catch((error) => {
@@ -597,9 +598,9 @@ const copyPost = (fromPostId, toGroupId, options, done) => {
             }
         },
     ], function (error) {
-        console.log("Done copying post id " + fromPostId);
+        log.info("Done copying post id " + fromPostId);
         if (error)
-            console.error(error);
+            log.error(error);
         done(error, newPost);
     });
 };
@@ -959,7 +960,7 @@ const copyGroup = (fromGroupId, toCommunityIn, toDomainId, options, done) => {
                             }
                         },
                     ], function (error) {
-                        console.log("Have copied post to group id");
+                        log.info("Have copied post to group id");
                         callback(error);
                     });
                 });
@@ -969,9 +970,9 @@ const copyGroup = (fromGroupId, toCommunityIn, toDomainId, options, done) => {
             });
         },
     ], function (error) {
-        console.log("Done copying group");
+        log.info("Done copying group");
         if (error)
-            console.error(error);
+            log.error(error);
         done(error, newGroup);
     });
 };
@@ -1206,7 +1207,7 @@ const copyCommunity = (fromCommunityId, toDomainId, options, linkFromOptions, do
                             }
                         },
                     ], function (error) {
-                        console.log("Have copied community");
+                        log.info("Have copied community");
                         callback(error);
                     });
                 });
@@ -1216,9 +1217,9 @@ const copyCommunity = (fromCommunityId, toDomainId, options, linkFromOptions, do
             });
         },
     ], function (error) {
-        console.log("Done copying community", newCommunity);
+        log.info("Done copying community", newCommunity);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error);
         }
         else {
@@ -1253,13 +1254,13 @@ const copyCommunityWithEverything = (communityId, toDomainId, options, done) =>
         copyPoints: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
-            //console.log("Done for new community "+ńewCommunity.id);
+            //log.info("Done for new community "+ńewCommunity.id);
             done(null, newCommunity);
         }
     });
@@ -1277,13 +1278,13 @@ const deepCopyCommunityOnlyStructureWithAdminsAndPosts = (communityId, toDomainI
         skipActivities: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
-            //console.log("Done for new community "+ńewCommunity.id);
+            //log.info("Done for new community "+ńewCommunity.id);
             done(null, newCommunity);
         }
     });
@@ -1299,15 +1300,15 @@ const copyCommunityNoUsersNoEndorsementsNoPoints = (communityId, toDomainId, don
         skipActivities: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
             recountCommunity(newCommunity.id, (recountError) => {
                 if (recountError) {
-                    console.error(error);
+                    log.error(error);
                     done(recountError, newCommunity);
                 }
                 else {
@@ -1328,13 +1329,13 @@ const copyCommunityNoUsersNoEndorsements = (communityId, toDomainId, done) => {
         skipActivities: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
-            //console.log("Done for new community "+ńewCommunity.id);
+            //log.info("Done for new community "+ńewCommunity.id);
             done(null, newCommunity);
         }
     });
@@ -1350,13 +1351,13 @@ const copyCommunityNoUsersNoEndorsementsOneGroup = (communityId, groupId, toDoma
         skipActivities: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
-            //console.log("Done for new community "+ńewCommunity.id);
+            //log.info("Done for new community "+ńewCommunity.id);
             done(null, newCommunity);
         }
     });
@@ -1373,13 +1374,13 @@ const copyCommunityOnlyGroups = (communityId, toDomainId, done) => {
         skipActivities: true,
     }, null, (error, newCommunity) => {
         if (newCommunity)
-            console.log(newCommunity.id);
+            log.info(newCommunity.id);
         if (error) {
-            console.error(error);
+            log.error(error);
             done(error, newCommunity);
         }
         else {
-            //console.log("Done for new community "+ńewCommunity.id);
+            //log.info("Done for new community "+ńewCommunity.id);
             done(null, newCommunity);
         }
     });

package/utils/export_utils.cjs

@@ -22,15 +22,15 @@ const getUserEmail = function (post) {
     }
 };
 const clean = function (text) {
-    //console.log("Before: "+ text);
+    //log.info("Before: "+ text);
     var newText = text.replace('"', "'").replace('\n', '').replace('\r', '').replace(/(\r\n|\n|\r)/gm, "").replace(/"/gm, "'").replace(/,/, ';').trim();
-    //console.log("After:" + newText);
+    //log.info("After:" + newText);
     return newText.replace(/´/g, '');
 };
 const cleanDescription = function (text) {
-    //console.log("Before: "+ text);
+    //log.info("Before: "+ text);
     var newText = text.replace('"', "'").replace(/"/gm, "'").replace(/,/, ';').trim();
-    //console.log("After:" + newText);
+    //log.info("After:" + newText);
     return newText.replace(/´/g, '');
 };
 const getLocation = function (post) {
@@ -49,7 +49,7 @@ const getPoints = function (points) {
         if (content.startsWith(",")) {
             content = content.substr(1);
         }
-        //console.log("content: "+content);
+        //log.info("content: "+content);
         totalContent += content;
     });
     return totalContent;
@@ -84,7 +84,7 @@ const getPointsUpOrDown = function (post, value) {
     if (pointsText.startsWith(",")) {
         pointsText = pointsText.substr(1);
     }
-    //console.log("PointText: "+pointsText);
+    //log.info("PointText: "+pointsText);
     return pointsText;
 };
 var getPointsUp = function (post) {
@@ -349,7 +349,7 @@ var getExportFileDataForGroup = function (group, hostName, callback) {
             if (group.configuration && group.configuration.customRatings) {
                 customRatings = group.configuration.customRatings;
             }
-            //console.log(posts.length);
+            //log.info(posts.length);
             outFileContent += "Nr, Post id,email,User Name,Post Name," + getDescriptionHeaders(group) + ",Url,Category,Latitude,Longitude,Up Votes,Down Votes,Points Count,Points For,Points Against,Images,Contact Name,Contact Email,Contact telephone,Attachment URL,Attachment filename,Media URLs,Post transcript" + getRatingHeaders(customRatings) + "\n";
             let postCounter = 0;
             async.eachSeries(posts, function (post, seriesCallback) {