From c6655d767ae13d95018caa462f24cb1da7e4a3e1 Mon Sep 17 00:00:00 2001 From: Yannick Bungers Date: Sat, 11 Apr 2020 12:29:41 +0200 Subject: [PATCH] changed for loop to foreach Signed-off-by: Yannick Bungers Signed-off-by: David Mehren --- lib/models/revision.ts | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/models/revision.ts b/lib/models/revision.ts index 1507a4a44..3d358040d 100644 --- a/lib/models/revision.ts +++ b/lib/models/revision.ts @@ -14,17 +14,17 @@ import logger = require('../logger'); const Op = Sequelize.Op; -var dmpWorker: ChildProcess | null = createDmpWorker() -var dmpCallbackCache = {} +let dmpWorker: ChildProcess | null = createDmpWorker(); +const dmpCallbackCache = {}; function createDmpWorker() { - var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore']) + const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore']); logger.debug('dmp worker process started') worker.on('message', function (data: any) { if (!data || !data.msg || !data.cacheKey) { return logger.error('dmp worker error: not enough data on message') } - var cacheKey = data.cacheKey + const cacheKey = data.cacheKey; switch (data.msg) { case 'error': dmpCallbackCache[cacheKey](data.error, null) @@ -44,7 +44,7 @@ function createDmpWorker() { function sendDmpWorker(data, callback) { if (!dmpWorker) dmpWorker = createDmpWorker() - var cacheKey = Date.now() + '_' + shortId.generate() + const cacheKey = Date.now() + '_' + shortId.generate(); dmpCallbackCache[cacheKey] = callback data = Object.assign(data, { cacheKey: cacheKey @@ -112,14 +112,13 @@ export class Revision extends Model { }, order: [['createdAt', 'DESC']] }).then(function (revisions) { - var data: any[] = [] - for (var i = 0; i < revisions.length; i++) { - var revision = revisions[i] + const data: any[] = []; + revisions.forEach(function (revision) { data.push({ time: moment(revision.createdAt).valueOf(), length: revision.length }) - } + }) callback(null, data) }).catch(function (err) { callback(err, null) @@ -197,12 +196,12 @@ export class Revision extends Model { } }).then(function (notes) { if (notes.length <= 0) return callback(null, notes) - var savedNotes: any[] = [] + const savedNotes: any[] = []; async.each(notes, function (note: any, _callback) { // revision saving policy: note not been modified for 5 mins or not save for 10 mins if (note.lastchangeAt && note.savedAt) { - var lastchangeAt = moment(note.lastchangeAt) - var savedAt = moment(note.savedAt) + const lastchangeAt = moment(note.lastchangeAt); + const savedAt = moment(note.savedAt); if (moment().isAfter(lastchangeAt.add(5, 'minutes'))) { savedNotes.push(note) Revision.saveNoteRevision(note, _callback) @@ -221,7 +220,7 @@ export class Revision extends Model { return callback(err, null) } // return null when no notes need saving at this moment but have delayed tasks to be done - var result = ((savedNotes.length === 0) && (notes.length > savedNotes.length)) ? null : savedNotes + const result = ((savedNotes.length === 0) && (notes.length > savedNotes.length)) ? null : savedNotes; return callback(null, result) }) }).catch(function (err) { @@ -249,9 +248,9 @@ export class Revision extends Model { return callback(err, null) }) } else { - var latestRevision = revisions[0] - var lastContent = latestRevision.content || latestRevision.lastContent - var content = note.content + const latestRevision = revisions[0]; + const lastContent = latestRevision.content || latestRevision.lastContent; + const content = note.content; sendDmpWorker({ msg: 'create patch', lastDoc: lastContent,