engineering
/
ramirez
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add next_message_number to threads, use it for reply numbers

cshd
Dragory 2020-08-14 01:18:45 +03:00
parent 205262660b
commit a4c7b84616
No known key found for this signature in database
GPG Key ID: 5F387BA66DF8AAC1
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/migrations/20200814011007_add_next_message_number_to_threads.js Normal file
View File

@ -0,0 +1,11 @@
exports.up = async function(knex) {
await knex.schema.table("threads", table => {
table.integer("next_message_number").defaultTo(1);
});
};
exports.down = async function(knex) {
await knex.schema.table("threads", table => {
table.dropColumn("next_message_number");
});
};

26
src/data/Thread.js
View File

@ -18,6 +18,7 @@ const {THREAD_MESSAGE_TYPE, THREAD_STATUS} = require("./constants");
* @property {String} user_id
* @property {String} user_name
* @property {String} channel_id
* @property {Number} next_message_number
* @property {String} scheduled_close_at
* @property {String} scheduled_close_id
* @property {String} scheduled_close_name
@ -116,7 +117,7 @@ class Thread {
*/
async _addThreadMessageToDB(data) {
if (data.message_type === THREAD_MESSAGE_TYPE.TO_USER) {
data.message_number = knex.raw(`IFNULL((${this._lastMessageNumberInThreadSQL()}), 0) + 1`);
data.message_number = await this._getAndIncrementNextMessageNumber();
}
const dmChannel = await this.getDMChannel();
@ -159,15 +160,22 @@ class Thread {
}
/**
* @returns {string}
* @private
* @returns {Promise<Number>}
*/
_lastMessageNumberInThreadSQL() {
return knex("thread_messages AS tm_msg_num_ref")
.select(knex.raw("MAX(tm_msg_num_ref.message_number)"))
.whereRaw(`tm_msg_num_ref.thread_id = '${this.id}'`)
.toSQL()
.sql;
async _getAndIncrementNextMessageNumber() {
return knex.transaction(async trx => {
const nextNumberRow = await trx("threads")
.where("id", this.id)
.select("next_message_number")
.first();
const nextNumber = nextNumberRow.next_message_number;
await trx("threads")
.where("id", this.id)
.update({ next_message_number: nextNumber + 1 });
return nextNumber;
});
}
/**