fix: don't hide errors

Klimatbyran · Mar 29, 2024 · be9b5ba · be9b5ba
1 parent 91e87ed
commit be9b5ba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/elastic.ts b/src/elastic.ts
@@ -62,16 +62,14 @@ class Elastic {
           body: {
             mappings: {
               properties: {
-                url: { type: 'keyword' },
                 pdfHash: { type: 'keyword' },
                 report: {
                   type: 'object',
                   properties: {
                     companyName: { type: 'keyword' },
-                    orgranizationNumber: { type: 'keyword' },
+                    url: { type: 'keyword' },
                     industry: { type: 'keyword' },
                     baseYear: { type: 'keyword' },
-                    url: { type: 'keyword' },
                     emissions: {
                       type: 'object',
                       properties: {
@@ -260,7 +258,7 @@ class Elastic {
     }
   }
 
-  async indexReport(pdfHash: string, reportData: any, url: string) {
+  async indexReport(pdfHash: string, reportData: any) {
     try {
       let parsed
       if (typeof reportData === 'string') {
@@ -287,7 +285,6 @@ class Elastic {
       const response = await this.client.index({
         index: this.indexName,
         body: {
-          url: url,
           pdfHash: pdfHash,
           report,
           state: 'pending',

diff --git a/src/workers/discordReview.ts b/src/workers/discordReview.ts
@@ -25,6 +25,12 @@ class JobData extends Job {
   }
 }
 
+async function saveToDb(id: string, report: any) {
+  let documentId = ''
+  documentId = await elastic.indexReport(id, report)
+  return documentId
+}
+
 const worker = new Worker(
   'discordReview',
   async (job: JobData) => {
@@ -35,16 +41,9 @@ const worker = new Worker(
 
     job.updateProgress(10)
     const parsedJson = JSON.parse(job.data.json)
-    let documentId = ''
-    try {
-      documentId = await elastic.indexReport(
-        job.data.pdfHash,
-        parsedJson,
-        job.data.url
-      )
-    } catch (error) {
-      job.log(`Error indexing report: ${error.message}`)
-    }
+    parsedJson.url = job.data.url
+    job.log(`Saving to db: ${job.data.pdfHash}`)
+    const documentId = await saveToDb(job.data.pdfHash, parsedJson)
 
     // Skapa en knapp
     const row = new ActionRowBuilder().addComponents(
@@ -65,6 +64,7 @@ const worker = new Worker(
     const summary = await summaryTable(parsedJson)
     const scope3 = await scope3Table(parsedJson)
 
+    job.log(`Sending message to Discord channel ${discord.channelId}`)
     discord.sendMessageToChannel(discord.channelId, {
       content: `Ny företagsdata behöver manuell hantering: 
 ${parsedJson.companyName}