From 99cc4078c638130d546e1ad457013785c5a9aad9 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 30 Jan 2022 13:17:40 +0100 Subject: [PATCH 1/2] fix setting becca's utcDateModified after marking as deleted --- src/becca/entities/abstract_entity.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/becca/entities/abstract_entity.js b/src/becca/entities/abstract_entity.js index f982bf98d..e88c6fb70 100644 --- a/src/becca/entities/abstract_entity.js +++ b/src/becca/entities/abstract_entity.js @@ -103,9 +103,11 @@ class AbstractEntity { const entityId = this[this.constructor.primaryKeyName]; const entityName = this.constructor.entityName; + this.utcDateModified = dateUtils.utcNowDateTime(); + sql.execute(`UPDATE ${entityName} SET isDeleted = 1, deleteId = ?, utcDateModified = ? WHERE ${this.constructor.primaryKeyName} = ?`, - [deleteId, dateUtils.utcNowDateTime(), entityId]); + [deleteId, this.utcDateModified, entityId]); if (this.dateModified) { sql.execute(`UPDATE ${entityName} SET dateModified = ? WHERE ${this.constructor.primaryKeyName} = ?`, From be44431fdefd382901645ec9977399fed6949e1a Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 30 Jan 2022 13:18:22 +0100 Subject: [PATCH 2/2] fix setting becca's dateModified after marking as deleted --- src/becca/entities/abstract_entity.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/becca/entities/abstract_entity.js b/src/becca/entities/abstract_entity.js index e88c6fb70..4a875e2a9 100644 --- a/src/becca/entities/abstract_entity.js +++ b/src/becca/entities/abstract_entity.js @@ -110,8 +110,10 @@ class AbstractEntity { [deleteId, this.utcDateModified, entityId]); if (this.dateModified) { + this.dateModified = dateUtils.localNowDateTime(); + sql.execute(`UPDATE ${entityName} SET dateModified = ? WHERE ${this.constructor.primaryKeyName} = ?`, - [dateUtils.localNowDateTime(), entityId]); + [this.dateModified, entityId]); } this.addEntityChange(true);