@yrpri/api 9.0.139 → 9.0.141

package/scripts/showUniqueVotersInCommunity.js

@@ -46,16 +46,16 @@ models.Endorsement.findAll({
         }
     ]
 }).then((endorsements) => {
-    console.log(`Votes: ${endorsements.length}`);
+    log.info(`Votes: ${endorsements.length}`);
     endorsements.forEach(e => {
         if (!allUsers[e.User.ssn]) {
             allUsers[e.User.ssn] = 1;
             uniqueSsns.push(e.User.ssn);
-            console.log(`${e.User.ssn} - ${e.User.name}`);
+            log.info(`${e.User.ssn} - ${e.User.name}`);
         }
     });
-    console.log(`Voters: ${size(allUsers)}`);
-    console.log(`Average votes per user: ${parseInt(endorsements.length / size(allUsers))}`);
+    log.info(`Voters: ${size(allUsers)}`);
+    log.info(`Average votes per user: ${parseInt(endorsements.length / size(allUsers))}`);
     process.exit();
 });
 export {};

package/scripts/showUserAgentsAndIpsForEmails.js

@@ -8,7 +8,7 @@ async.eachSeries(emails, (email, eachOfCallback) => {
         }
     }).then((user) => {
         if (user) {
-            console.log("\n\n\nemail: " + user.email) + "\n";
+            log.info("\n\n\nemail: " + user.email) + "\n";
             let userAgent = null;
             let ipAddress = null;
             async.series([
@@ -52,13 +52,13 @@ async.eachSeries(emails, (email, eachOfCallback) => {
                     });
                 },
             ], (error) => {
-                console.log(ipAddress);
-                console.log(userAgent);
+                log.info(ipAddress);
+                log.info(userAgent);
                 eachOfCallback();
             });
         }
         else {
-            console.error("NOT FOUND: " + email);
+            log.error("NOT FOUND: " + email);
             eachOfCallback();
         }
     });

package/scripts/simpleExportForGroupsForCommunity.js

@@ -5,9 +5,9 @@ var fs = require('fs');
 var communityId = process.argv[2];
 var outFile = process.argv[3];
 var 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, '');
 };
 models.Group.findAll({
@@ -24,7 +24,7 @@ models.Group.findAll({
     ]
 }).then(function (groups) {
     var outFileContent = "";
-    console.log(groups.length);
+    log.info(groups.length);
     outFileContent += "group id, author id, title, text\n";
     groupCounter = 0;
     async.eachSeries(groups, function (group, seriesCallback) {
@@ -36,9 +36,9 @@ models.Group.findAll({
     }, function (error) {
         fs.writeFile(outFile, outFileContent, function (err) {
             if (err) {
-                console.log(err);
+                log.info(err);
             }
-            console.log("The file was saved!");
+            log.info("The file was saved!");
             process.exit();
         });
     });

package/scripts/simpleExportForPointsForCommunity.js

@@ -5,10 +5,10 @@ var fs = require('fs');
 var communityId = process.argv[2];
 var outFile = process.argv[3];
 var clean = function (text) {
-    //console.log("Before: "+ text);
+    //log.info("Before: "+ text);
     if (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, '');
     }
     else {
@@ -51,7 +51,7 @@ models.Point.findAll({
     ]
 }).then(function (points) {
     var outFileContent = "";
-    console.log(points.length);
+    log.info(points.length);
     outFileContent += "group id,post id,point id,point type,author id,text,helpful votes,unhelpful votes,external user id,state\n";
     pointCounter = 0;
     async.eachSeries(points, function (point, seriesCallback) {
@@ -72,9 +72,9 @@ models.Point.findAll({
     }, function (error) {
         fs.writeFile(outFile, outFileContent, function (err) {
             if (err) {
-                console.log(err);
+                log.info(err);
             }
-            console.log("The file was saved!");
+            log.info("The file was saved!");
             process.exit();
         });
     });

package/scripts/simpleExportForPostsForCommunity.js

@@ -5,9 +5,9 @@ var fs = require('fs');
 var communityId = process.argv[2];
 var outFile = process.argv[3];
 var 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, '');
 };
 models.Post.findAll({
@@ -30,7 +30,7 @@ models.Post.findAll({
     ]
 }).then(function (posts) {
     var outFileContent = "";
-    console.log(posts.length);
+    log.info(posts.length);
     outFileContent += "group id,post id,author id,title,text,up votes,down votes,external user id,state\n";
     postCounter = 0;
     async.eachSeries(posts, function (post, seriesCallback) {
@@ -51,9 +51,9 @@ models.Post.findAll({
     }, function (error) {
         fs.writeFile(outFile, outFileContent, function (err) {
             if (err) {
-                console.log(err);
+                log.info(err);
             }
-            console.log("The file was saved!");
+            log.info("The file was saved!");
             process.exit();
         });
     });

package/scripts/testForEndorsments.js

@@ -13,9 +13,9 @@ models.User.findOne({
         }
     ]
 }).then(function (user) {
-    console.log(user.email);
-    console.log(user.facebook_id);
-    console.log(_.map(user.Endorsements, function (e) { return e.post_id + " " + e.created_at; }));
-    console.log(user.Endorsements);
+    log.info(user.email);
+    log.info(user.facebook_id);
+    log.info(_.map(user.Endorsements, function (e) { return e.post_id + " " + e.created_at; }));
+    log.info(user.Endorsements);
 });
 export {};

package/scripts/undeleteGroupAndAllContent.js

@@ -13,7 +13,7 @@ const processPointDependancies = (point, done) => {
                 async.forEachSeries(qualities, (quality, forEachCallback) => {
                     quality.deleted = false;
                     quality.save().then(() => {
-                        console.log(`Done undeleting quality ${point.id}`);
+                        log.info(`Done undeleting quality ${point.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -35,7 +35,7 @@ const processPointDependancies = (point, done) => {
                 async.forEachSeries(revisions, (revision, forEachCallback) => {
                     revision.deleted = false;
                     revision.save().then(() => {
-                        console.log(`Done undeleting point revision ${point.id}`);
+                        log.info(`Done undeleting point revision ${point.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -63,7 +63,7 @@ const processPostDependancies = (post, done) => {
                 async.forEachSeries(endorsements, (endorsement, forEachCallback) => {
                     endorsement.deleted = false;
                     endorsement.save().then(() => {
-                        console.log(`Done undeleting endorsement model ${post.id}`);
+                        log.info(`Done undeleting endorsement model ${post.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -85,7 +85,7 @@ const processPostDependancies = (post, done) => {
                 async.forEachSeries(points, (point, forEachCallback) => {
                     point.deleted = false;
                     point.save().then(() => {
-                        console.log(`Done undeleting point model ${point.id}`);
+                        log.info(`Done undeleting point model ${point.id}`);
                         processPointDependancies(point, forEachCallback);
                     }).catch(error => {
                         forEachCallback(error);
@@ -111,7 +111,7 @@ async.series([
         }).then(group => {
             group.deleted = false;
             group.save().then(() => {
-                console.log(`Done undeleting group model ${group.id}`);
+                log.info(`Done undeleting group model ${group.id}`);
                 seriesCallback();
             });
         }).catch(error => {
@@ -128,7 +128,7 @@ async.series([
             async.forEachSeries(posts, (post, forEachCallback) => {
                 post.deleted = false;
                 post.save().then(() => {
-                    console.log(`Done undeleting post model ${post.id}`);
+                    log.info(`Done undeleting post model ${post.id}`);
                     processPostDependancies(post, forEachCallback);
                 }).catch(error => {
                     forEachCallback(error);
@@ -142,9 +142,9 @@ async.series([
     }
 ], error => {
     if (error)
-        console.error(`Error undeleting group ${groupId} - ${error}`);
+        log.error(`Error undeleting group ${groupId} - ${error}`);
     else
-        console.log(`Done undeleting group ${groupId}`);
+        log.info(`Done undeleting group ${groupId}`);
     process.exit();
 });
 export {};

package/scripts/undeletePost.js

@@ -13,7 +13,7 @@ const processPointDependancies = (point, done) => {
                 async.forEachSeries(qualities, (quality, forEachCallback) => {
                     quality.deleted = false;
                     quality.save().then(() => {
-                        console.log(`Done undeleting quality ${point.id}`);
+                        log.info(`Done undeleting quality ${point.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -35,7 +35,7 @@ const processPointDependancies = (point, done) => {
                 async.forEachSeries(revisions, (revision, forEachCallback) => {
                     revision.deleted = false;
                     revision.save().then(() => {
-                        console.log(`Done undeleting point revision ${point.id}`);
+                        log.info(`Done undeleting point revision ${point.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -63,7 +63,7 @@ const processPostDependancies = (post, done) => {
                 async.forEachSeries(endorsements, (endorsement, forEachCallback) => {
                     endorsement.deleted = false;
                     endorsement.save().then(() => {
-                        console.log(`Done undeleting endorsement model ${post.id}`);
+                        log.info(`Done undeleting endorsement model ${post.id}`);
                         forEachCallback();
                     }).catch(error => {
                         forEachCallback(error);
@@ -85,7 +85,7 @@ const processPostDependancies = (post, done) => {
                 async.forEachSeries(points, (point, forEachCallback) => {
                     point.deleted = false;
                     point.save().then(() => {
-                        console.log(`Done undeleting point model ${point.id}`);
+                        log.info(`Done undeleting point model ${point.id}`);
                         processPointDependancies(point, forEachCallback);
                     }).catch(error => {
                         forEachCallback(error);
@@ -112,7 +112,7 @@ async.series([
             async.forEachSeries(posts, (post, forEachCallback) => {
                 post.deleted = false;
                 post.save().then(() => {
-                    console.log(`Done undeleting post model ${post.id}`);
+                    log.info(`Done undeleting post model ${post.id}`);
                     processPostDependancies(post, forEachCallback);
                 }).catch(error => {
                     forEachCallback(error);
@@ -126,9 +126,9 @@ async.series([
     }
 ], error => {
     if (error)
-        console.error(`Error undeleting post ${postId} - ${error}`);
+        log.error(`Error undeleting post ${postId} - ${error}`);
     else
-        console.log(`Done undeleting post ${postId}`);
+        log.info(`Done undeleting post ${postId}`);
     process.exit();
 });
 export {};

package/scripts/unlinkSsn.js

@@ -1,22 +1,22 @@
 var models = require('../models/index.cjs');
 var async = require('async');
 var ssn = process.argv[2];
-console.log("Unlinking " + ssn + " from user");
+log.info("Unlinking " + ssn + " from user");
 models.User.findOne({
     where: {
         ssn: ssn
     }
 }).then(function (user) {
     if (user) {
-        console.log("Unlinking " + ssn + " from " + user.email);
+        log.info("Unlinking " + ssn + " from " + user.email);
         user.ssn = null;
         user.save().then(function () {
-            console.log("Completed unlinking " + ssn + " from " + user.email);
+            log.info("Completed unlinking " + ssn + " from " + user.email);
             process.exit();
         });
     }
     else {
-        console.log("Not found");
+        log.info("Not found");
         process.exit();
     }
 });

package/scripts/updateFromAlthingi.js

@@ -178,14 +178,14 @@ var saveIssueIfNeeded = function (dbIssue, userId, callback) {
                         addPost(dbIssue, userId, defaultImageId, domain, callback);
                     }
                     else {
-                        console.error("Cant find group id: " + dbIssue.groupId);
+                        log.error("Cant find group id: " + dbIssue.groupId);
                         callback('Cant find group');
                     }
                 });
             });
         }
         else {
-            console.log("Already saved issue id: " + dbIssue.issueId);
+            log.info("Already saved issue id: " + dbIssue.issueId);
             if (post.public_data.law_issue.issueStatus != dbIssue.issueStatus) {
                 post.set('public_data.law_issue.issueStatus', dbIssue.issueStatus);
                 setPostOfficialStatus(post, dbIssue);
@@ -233,7 +233,7 @@ groupsConfigString.split(":").forEach(function (pair) {
 });
 getIssueList(function (error, issueList) {
     if (error) {
-        console.error(error);
+        log.error(error);
         process.exit();
     }
     else {
@@ -243,7 +243,7 @@ getIssueList(function (error, issueList) {
                 var dbIssue = { dataType: 'lawIssue', sessionId: SESSION_ID, issueId: issue.$['málsnúmer'], name: capitalize(issue['málsheiti'][0]),
                     externalHtmlLink: issue['html'][0], xmlLink: issue['xml'][0], issueType: issue['málstegund'][0]['heiti'][0] };
                 if (error) {
-                    console.error(error);
+                    log.error(error);
                     callback(error);
                 }
                 else {
@@ -275,7 +275,7 @@ getIssueList(function (error, issueList) {
                                 ". Málið á Alþingi: " + dbIssue.externalHtmlLink;
                             dbIssue = _.merge(dbIssue, { groupId: topCategoryIdToGroup[dbIssue.topCategoryId], description: description });
                             if (capitalize(dbIssue.issueType).indexOf("Fyrirspurn") > -1 || capitalize(dbIssue.issueType).indexOf("Beiðni um skýrslu") > -1) {
-                                console.log("Not doing questions or reports for now for " + dbIssue.issueId);
+                                log.info("Not doing questions or reports for now for " + dbIssue.issueId);
                                 callback();
                             }
                             else {
@@ -283,19 +283,19 @@ getIssueList(function (error, issueList) {
                             }
                         }
                         else {
-                            console.error("No topCategory");
+                            log.error("No topCategory");
                             callback();
                         }
                     }
                     else {
-                        console.error("No thingmal field");
+                        log.error("No thingmal field");
                         callback();
                     }
                 }
             });
         }, function (error) {
             if (error)
-                console.error(error);
+                log.error(error);
             process.exit();
         });
     }

package/scripts/users/createUserAddDomain.js

@@ -1,21 +1,22 @@
 import bcrypt from 'bcrypt';
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [domainIdArg, email, name, password, ssn] = process.argv.slice(2);
         if (!domainIdArg || !email || !name || !password) {
-            console.log('Usage: node createUserAddDomain.js <domainId> <email> <name> <password> [ssn]');
+            log.info('Usage: node createUserAddDomain.js <domainId> <email> <name> <password> [ssn]');
             process.exit(1);
         }
         const domainId = Number(domainIdArg);
         const domain = await models.Domain.findOne({ where: { id: domainId } });
         if (!domain) {
-            console.error(`Domain ${domainId} not found`);
+            log.error(`Domain ${domainId} not found`);
             process.exit(1);
         }
         const existing = await models.User.findOne({ where: { email } });
         if (existing) {
-            console.error(`User with email ${email} already exists`);
+            log.error(`User with email ${email} already exists`);
             process.exit(1);
         }
         const hashed = await bcrypt.hash(password, 10);
@@ -27,11 +28,11 @@ import models from '../../models/index.cjs';
             encrypted_password: hashed,
         });
         await domain.addDomainUsers(user);
-        console.log(`User ${email} created and added to domain ${domain.name}`);
+        log.info(`User ${email} created and added to domain ${domain.name}`);
         process.exit(0);
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/scripts/users/importUsersForDomainsFromXls.js

@@ -1,10 +1,11 @@
 import ExcelJS from 'exceljs';
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [filePath] = process.argv.slice(2);
         if (!filePath) {
-            console.log('Usage: node importUsersForDomainsFromXls.js <xlsFilePath>');
+            log.info('Usage: node importUsersForDomainsFromXls.js <xlsFilePath>');
             process.exit(1);
         }
         const workbook = new ExcelJS.Workbook();
@@ -62,7 +63,7 @@ import models from '../../models/index.cjs';
                 await domain.addDomainUsers(user, { transaction });
             }
             await transaction.commit();
-            console.log('Import completed');
+            log.info('Import completed');
             process.exit(0);
         }
         catch (error) {
@@ -71,7 +72,7 @@ import models from '../../models/index.cjs';
         }
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/scripts/users/listDomainUsersWithSsn.js

@@ -1,9 +1,10 @@
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [domainIdArg] = process.argv.slice(2);
         if (!domainIdArg) {
-            console.log('Usage: node listDomainUsersWithSsn.js <domainId>');
+            log.info('Usage: node listDomainUsersWithSsn.js <domainId>');
             process.exit(1);
         }
         const domainId = Number(domainIdArg);
@@ -12,19 +13,19 @@ import models from '../../models/index.cjs';
             include: [{ model: models.User, as: 'DomainUsers' }],
         });
         if (!domain) {
-            console.error(`Domain ${domainId} not found`);
+            log.error(`Domain ${domainId} not found`);
             process.exit(1);
         }
-        console.log('email,name,ssn');
+        log.info('email,name,ssn');
         for (const user of domain.DomainUsers) {
             if (user.ssn) {
-                console.log(`${user.email},${user.name},${user.ssn}`);
+                log.info(`${user.email},${user.name},${user.ssn}`);
             }
         }
         process.exit(0);
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/scripts/users/removeUserFromDomain.js

@@ -1,28 +1,29 @@
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [domainIdArg, email] = process.argv.slice(2);
         if (!domainIdArg || !email) {
-            console.log('Usage: node removeUserFromDomain.js <domainId> <email>');
+            log.info('Usage: node removeUserFromDomain.js <domainId> <email>');
             process.exit(1);
         }
         const domainId = Number(domainIdArg);
         const domain = await models.Domain.findOne({ where: { id: domainId } });
         if (!domain) {
-            console.error(`Domain ${domainId} not found`);
+            log.error(`Domain ${domainId} not found`);
             process.exit(1);
         }
         const user = await models.User.findOne({ where: { email } });
         if (!user) {
-            console.error(`User ${email} not found`);
+            log.error(`User ${email} not found`);
             process.exit(1);
         }
         await domain.removeDomainUsers(user);
-        console.log(`Removed ${email} from domain ${domain.name}`);
+        log.info(`Removed ${email} from domain ${domain.name}`);
         process.exit(0);
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/scripts/users/updatePasswordFromSsn.js

@@ -1,25 +1,26 @@
 import bcrypt from 'bcrypt';
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [ssnArg, password] = process.argv.slice(2);
         if (!ssnArg || !password) {
-            console.log('Usage: node updatePasswordFromSsn.js <ssn> <newPassword>');
+            log.info('Usage: node updatePasswordFromSsn.js <ssn> <newPassword>');
             process.exit(1);
         }
         const ssn = ssnArg;
         const user = await models.User.findOne({ where: { ssn } });
         if (!user) {
-            console.error(`User with ssn ${ssn} not found`);
+            log.error(`User with ssn ${ssn} not found`);
             process.exit(1);
         }
         user.encrypted_password = await bcrypt.hash(password, 10);
         await user.save();
-        console.log(`Updated password for ${user.email}`);
+        log.info(`Updated password for ${user.email}`);
         process.exit(0);
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/scripts/users/updateUserSsnFromEmail.js

@@ -1,24 +1,25 @@
 import models from '../../models/index.cjs';
+import log from "../../utils/loggerTs.js";
 (async () => {
     try {
         const [email, ssnArg] = process.argv.slice(2);
         if (!email || !ssnArg) {
-            console.log('Usage: node updateUserSsnFromEmail.js <email> <ssn>');
+            log.info('Usage: node updateUserSsnFromEmail.js <email> <ssn>');
             process.exit(1);
         }
         const user = await models.User.findOne({ where: { email } });
         if (!user) {
-            console.error(`User ${email} not found`);
+            log.error(`User ${email} not found`);
             process.exit(1);
         }
         const ssn = ssnArg;
         user.ssn = ssn;
         await user.save();
-        console.log(`Updated SSN for ${email}`);
+        log.info(`Updated SSN for ${email}`);
         process.exit(0);
     }
     catch (err) {
-        console.error(err);
+        log.error(err);
         process.exit(1);
     }
 })();

package/services/controllers/activities.cjs

@@ -3,7 +3,7 @@ var express = require('express');
 var router = express.Router();
 var models = require("../../models/index.cjs");
 var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var async = require('async');
 var _ = require('lodash');
 var getCommonWhereOptions = require('../engine/news_feeds/news_feeds_utils.cjs').getCommonWhereOptions;

package/services/controllers/news_feeds.cjs

@@ -2,7 +2,7 @@
 var express = require('express');
 var router = express.Router();
 var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var _ = require('lodash');
 var getCuratedNewsItems = require('../engine/news_feeds/generate_dynamically.cjs').getCuratedNewsItems;
 var setupOptions = function (req) {

package/services/controllers/notifications.cjs

@@ -3,7 +3,7 @@ var express = require('express');
 var router = express.Router();
 var models = require("../../models/index.cjs");
 var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var _ = require('lodash');
 var async = require('async');
 var getCommonWhereDateOptions = require('../engine/news_feeds/news_feeds_utils.cjs').getCommonWhereDateOptions;

package/services/controllers/recommendations.cjs

@@ -3,7 +3,7 @@ var express = require('express');
 var router = express.Router();
 var models = require("../../models/index.cjs");
 var auth = require('../../authorization.cjs');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var _ = require('lodash');
 var moment = require('moment');
 var getRecommendationFor = require('../engine/recommendations/events_manager.cjs').getRecommendationFor;