feat: delete comment from database and search for another one

Author: williamdes

package.json

@@ -72,6 +72,7 @@
     },
     "license": "MPL-2.0",
     "dependencies": {
+        "@octokit/request-error": "^2.0.5",
         "@octokit/rest": "^18.1.0",
         "@sentry/node": "^6.1.0",
         "@types/imap": "^0.8.33",

src/deploy.ts

@@ -7,7 +7,7 @@ import dns from '@src/dns';
 import comments from '@src/comments';
 import data, { emailData } from '@src/data';
 import Message, { MessagePlatform } from './modeles/Message';
-import messages from '@root/test/messages';
+import { RequestError } from '@octokit/request-error';
 
 const afterComment = (
     configBlock: string,
@@ -75,6 +75,63 @@ const afterComment = (
         .catch((error: Error) => logger.error(error, prInfos, emailInfos));
 };
 
+const findMessageAndProceed = (
+    prId: number,
+    emailInfos: emailData,
+    prInfos: {
+        sha: string;
+        ref: string;
+        cloneUrl: string;
+        repoSlug: string;
+    },
+    configBlock: string
+) => {
+    Message.forPr(prId, emailInfos.repoName).then((messages) => {
+        if (messages.length === 0) {
+            logger.debug('No comment found, posting one.');
+            github
+                .createComment(
+                    emailInfos.prId || 0,
+                    prInfos.repoSlug,
+                    comments.getPendingComment(emailInfos.commentId || 0, prInfos.ref, prInfos.sha)
+                )
+                .then((deployComment) =>
+                    afterComment(configBlock, emailInfos, deployComment.data.id, {
+                        sha: prInfos.sha,
+                        ref: prInfos.ref,
+                        cloneUrl: prInfos.repoSlug,
+                        repoSlug: prInfos.repoSlug,
+                    })
+                )
+                .catch((error: Error) => logger.error(error, prInfos, emailInfos));
+            return;
+        }
+        logger.debug('Comment found, using it.');
+        const lastMessage = messages[messages.length - 1];
+        github
+            .getComment(lastMessage.getCommentId(), emailInfos.repoName)
+            .then((commentData) => {
+                afterComment(configBlock, emailInfos, commentData.data.id, {
+                    sha: prInfos.sha,
+                    ref: prInfos.ref,
+                    cloneUrl: prInfos.repoSlug,
+                    repoSlug: prInfos.repoSlug,
+                });
+            })
+            .catch((error: RequestError) => {
+                if (error.status && error.status === 404) {
+                    logger.debug('Deleting the comment from the database.');
+                    Message.delete(lastMessage.getId()).then(() => {
+                        logger.debug('Searching for a new comment.');
+                        findMessageAndProceed(prId, emailInfos, prInfos, configBlock);
+                    });
+                    return;
+                }
+                logger.error(error, prInfos, emailInfos);
+            });
+    });
+};
+
 export default {
     deploy: (emailInfos: emailData, configBlock: string) => {
         if (emailInfos.prId === null || emailInfos.commentId === null) {
@@ -84,41 +141,19 @@ export default {
         const prId = emailInfos.prId || 0;
         github
             .getPrInfos(emailInfos.prId || 0, emailInfos.repoName)
-            .then((prInfos) => {
-                Message.forPr(prId, emailInfos.repoName).then((messages) => {
-                    if (messages.length === 0) {
-                        logger.debug('No comment found, posting one.');
-                        github
-                            .createComment(
-                                emailInfos.prId || 0,
-                                prInfos.data.base.repo.full_name,
-                                comments.getPendingComment(
-                                    emailInfos.commentId || 0,
-                                    prInfos.data.head.ref,
-                                    prInfos.data.head.sha
-                                )
-                            )
-                            .then((deployComment) =>
-                                afterComment(configBlock, emailInfos, deployComment.data.id, {
-                                    sha: prInfos.data.head.sha,
-                                    ref: prInfos.data.head.ref,
-                                    cloneUrl: prInfos.data.head.repo.clone_url,
-                                    repoSlug: prInfos.data.base.repo.full_name,
-                                })
-                            )
-                            .catch((error: Error) => logger.error(error, prInfos, emailInfos));
-                        return;
-                    }
-                    logger.debug('Comment found, using it.');
-                    const lastMessage = messages[messages.length - 1];
-                    afterComment(configBlock, emailInfos, lastMessage.getCommentId(), {
+            .then((prInfos) =>
+                findMessageAndProceed(
+                    prId,
+                    emailInfos,
+                    {
                         sha: prInfos.data.head.sha,
                         ref: prInfos.data.head.ref,
                         cloneUrl: prInfos.data.head.repo.clone_url,
                         repoSlug: prInfos.data.base.repo.full_name,
-                    });
-                });
-            })
+                    },
+                    configBlock
+                )
+            )
             .catch((error: Error) => logger.error(error, emailInfos));
     },
 };

src/modeles/Message.ts

@@ -104,6 +104,10 @@ export default class Message {
             });
     }
 
+    public static delete(id: number): Promise<void> {
+        return knex.getConnection().from('messages').where('id', id).delete();
+    }
+
     public static all(): Promise<Message[]> {
         return knex
             .getConnection()
@@ -123,6 +127,10 @@ export default class Message {
         return this.platform;
     }
 
+    public getId(): number {
+        return this.id as number;
+    }
+
     public getCommentId(): number {
         return this.comment_id;
     }

yarn.lock

@@ -774,6 +774,15 @@
     deprecation "^2.0.0"
     once "^1.4.0"
 
+"@octokit/request-error@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143"
+  integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+    deprecation "^2.0.0"
+    once "^1.4.0"
+
 "@octokit/request@^5.3.0":
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.2.tgz#1ca8b90a407772a1ee1ab758e7e0aced213b9883"