feat: handle delete tweet status

src/migrations/20220418091527_statuses_deleted_at.js

@@ -0,0 +1,13 @@
+const kTable = 'statuses';
+
+exports.up = async (knex) => {
+  await knex.schema.alterTable(kTable, (table) => {
+    table.timestamp('deleted_at');
+  });
+};
+
+exports.down = async (knex) => {
+  return knex.schema.alterTable(kTable, (table) => {
+    table.dropColumn('deleted_at');
+  });
+};

src/services/storage/twitter-statuses.js

@@ -8,6 +8,12 @@ class TwitterStatuses {
     return this.knex.upsertItem(this.table, 'id', data);
   }
 
+  softDelete(criteria) {
+    return this.knex.table(this.table)
+      .update('deleted_at', this.knex.fn.now())
+      .where(criteria);
+  }
+
   list(data) {
     const {
       page,
@@ -27,11 +33,11 @@ class TwitterStatuses {
       : data.filter.account.toLowerCase();
 
     const query = this.knex(this.table)
-      .select()
-      .whereRaw(rawQuery, [account])
+      .select('id', 'date', 'text', 'account', 'meta')
+      .whereNull('deleted_at')
+      .andWhereRaw(rawQuery, [account])
       .orderBy([
         { column: 'id', order },
-        { column: 'account' },
       ])
       .limit(pageSize)
       .offset(offset);
@@ -51,7 +57,9 @@ class TwitterStatuses {
 
   byId(tweetId) {
     return this.knex(this.table)
-      .where('id', tweetId)
+      .select('id', 'date', 'text', 'account', 'meta')
+      .whereNull('deleted_at')
+      .andWhere('id', tweetId)
       .first();
   }
 }

src/services/twitter.js

@@ -227,6 +227,7 @@ class Twitter {
     this.onData = (json) => this._onData(json);
     this.onError = (err) => this._onError(err);
     this.onEnd = () => this._onEnd();
+    this.onDelete = (json) => this._onDelete(json);
   }
 
   async init() {
@@ -315,14 +316,11 @@ class Twitter {
     listener.on('data', this.onData);
     listener.on('error', this.onError);
     listener.on('end', this.onEnd);
+    listener.on('delete', this.onDelete);
 
     // attach params
     listener.params = params;
 
-    // TODO: do this!
-    // add 'delete' handler
-    // listener.on('delete', this.onDelete);
-
     // remap stream receiver to add 90 sec timeout
     const { receive } = listener;
     listener.receive = (chunk) => {
@@ -446,6 +444,19 @@ class Twitter {
     return false;
   }
 
+  async _onDelete(data) {
+    this.logger.debug({ data }, 'deleting tweet');
+    const { id_str: id } = data.delete.status;
+
+    if (!id) {
+      return false;
+    }
+
+    return this.storage
+      .twitterStatuses()
+      .softDelete({ id });
+  }
+
   publish(tweet) {
     const account = get(tweet, 'meta.account', false);
     const { following } = this;

src/utils/response.js

@@ -42,7 +42,7 @@ function collectionResponse(objects, type, options = {}) {
 
 function modelResponse(model, type) {
   const response = {
-    data: model !== null ? transform(model, type) : null,
+    data: model !== null && model !== undefined ? transform(model, type) : null,
   };
 
   return response;

test/suites/01.twitter.js

@@ -85,6 +85,17 @@ describe('twitter', function testSuite() {
     invalidTweet: {
       tweetId: '123-not-number',
     },
+
+    deletionNotice: {
+      delete: {
+        status: {
+          id: 20,
+          id_str: '20',
+          user_id: 12,
+          user_id_str: '12',
+        },
+      },
+    },
   };
 
   let tweetId;
@@ -236,7 +247,6 @@ describe('twitter', function testSuite() {
     assert.strictEqual(text, 'just setting up my twttr');
     assert(meta);
     assert.strictEqual(meta.id_str, payload.oneTweet.tweetId);
-    assert(data.attributes.explicit);
   });
 
   it('rejects with error on sync non-existing tweet', async () => {
@@ -260,9 +270,8 @@ describe('twitter', function testSuite() {
     assert(data);
     assert.strictEqual(data.id, payload.oneTweet.tweetId);
     assert.strictEqual(data.type, 'tweet');
-    const { text, meta, explicit } = data.attributes;
+    const { text, meta } = data.attributes;
     assert.strictEqual(text, 'just setting up my twttr');
-    assert(explicit);
     assert(meta.account_id, '12');
     assert(meta.account);
     assert(meta.account_name);
@@ -279,6 +288,29 @@ describe('twitter', function testSuite() {
     });
   });
 
+  it('handle deletion tweet on stream', async () => {
+    service
+      .service('twitter')
+      .listener
+      .emit('delete', payload.deletionNotice);
+
+    const res = await service.amqp.publishAndWait(uri.getOne, payload.oneTweet);
+    assert(res);
+    assert.strictEqual(res.data, null);
+
+    const id = payload.oneTweet.tweetId;
+
+    const hidden = await service
+      .knex('statuses')
+      .where({ id })
+      .first();
+
+    assert(hidden);
+    assert.strictEqual(hidden.id, id);
+    assert(hidden.explicit);
+    assert(hidden.deleted_at);
+  });
+
   after('close consumer', () => listener.close());
   after('shutdown service', () => service.close());
 });