public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Work in progress on refactoring all mail sending to use the message sender an sender workers. No yet finished.

Browse source
This commit is contained in:
Tomas Bures 2019-06-29 23:19:56 +02:00
parent 355e03900a
commit 4e9f6bd57b
22 changed files with 811 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/setup/knex/migrations/20190615000000_generalization_of_queued_and_file_locking.js
View file

@ -15,7 +15,7 @@ const entityTypesWithFiles = {
exports.up = (knex, Promise) => (async() => {
await knex.schema.table('queued', table => {
table.integer('send_configuration').unsigned().notNullable();
table.integer('type').unsigned().notNullable(); // The values come from campaign-sender.js:MessageType
table.integer('type').unsigned().notNullable(); // The values come from message-sender.js:MessageType
table.text('data', 'longtext');
});

26
server/setup/knex/migrations/20190629000000_add_start_at_to_campaigns.js Normal file
View file

@ -0,0 +1,26 @@
const { CampaignType, CampaignStatus } = require('../../../../shared/campaigns');
exports.up = (knex, Promise) => (async() => {
await knex.schema.table('campaigns', table => {
table.timestamp('start_at').nullable().defaultTo(null);
});
await knex('campaigns')
.whereIn('type', [CampaignType.REGULAR, CampaignType.RSS_ENTRY])
.whereIn('status', [CampaignStatus.SCHEDULED, CampaignStatus.SENDING, CampaignStatus.PAUSING, CampaignStatus.PAUSED])
.whereNotNull('scheduled')
.update({
start_at: knex.raw('scheduled')
});
await knex('campaigns')
.whereIn('type', [CampaignType.REGULAR, CampaignType.RSS_ENTRY])
.whereIn('status', [CampaignStatus.SCHEDULED, CampaignStatus.SENDING, CampaignStatus.PAUSING, CampaignStatus.PAUSED])
.whereNull('scheduled')
.update({
start_at: new Date()
});
})();
exports.down = (knex, Promise) => (async() => {
})();

25
server/setup/knex/migrations/20190629170000_generalization_of_queued.js Normal file
View file

@ -0,0 +1,25 @@
exports.up = (knex, Promise) => (async() => {
const queued = await knex('queued');
for (const queuedEntry of queued) {
const data = JSON.parse(queuedEntry.data);
data.listId = queuedEntry.list;
data.subscriptionId = queuedEntry.subscription;
knex('queued')
.where('id', queuedEntry.id)
.update({
data: JSON.stringify(data)
});
}
await knex.schema.table('queued', table => {
table.dropColumn('list');
table.dropColumn('subscription');
});
})();
exports.down = (knex, Promise) => (async() => {
})();