Merge pull request #2920 from statisticsnorway/MIM-2039_rss_joblog_er…

…ror_view

[MIM-2039] Mim 2039 rss joblog error view

src/main/resources/lib/ssb/cron/pushRss.ts

@@ -1,8 +1,10 @@
 import { HttpRequestParams, HttpResponse, request } from '/lib/http-client'
-import { getRssItemsStatkal } from '/lib/ssb/rss/statkal'
-import { encryptRssNews, encryptRssStatkal } from '/lib/cipher/cipherRss'
 
-export function pushRssNews(): string {
+import { getRssItemsStatkal } from '../../../lib/ssb/rss/statkal'
+import { encryptRssNews, encryptRssStatkal } from '../../../lib/cipher/cipherRss'
+import { Events } from '../../../lib/ssb/repo/query'
+
+export function pushRssNews(): RssResult {
   const newsServiceUrl: string = app.config?.['ssb.baseUrl']
     ? app.config['ssb.baseUrl'] + '/_/service/mimir/news'
     : 'https://www.utv.ssb.no/_/service/mimir/news'
@@ -11,17 +13,17 @@ export function pushRssNews(): string {
     const encryptedBody: string = encryptRssNews(rssNews.body)
     return postRssNews(encryptedBody)
   } else {
-    return rssNews.message
+    return { message: rssNews.message }
   }
 }
 
-export function pushRssStatkal(): string {
+export function pushRssStatkal(): RssResult {
   const rssStatkal: string | null = getRssItemsStatkal()
   if (rssStatkal !== null) {
     const encryptedBody: string = encryptRssStatkal(rssStatkal)
     return postRssStatkal(encryptedBody)
   } else {
-    return 'Ingen publiseringer å pushe til rss/statkal'
+    return { message: 'Ingen publiseringer å pushe til rss/statkal' }
   }
 }
 
@@ -47,15 +49,16 @@ function getRssNews(url: string): RssItems {
       }
     } else {
       status.message = 'Henting av nyheter XP feilet - ' + rssNewsResponse.status
+      status.status = Events.REQUEST_GOT_ERROR_RESPONSE
     }
   } catch (e) {
     status.message = 'Henting av nyheter XP feilet - ' + e
+    status.status = Events.REQUEST_GOT_ERROR_RESPONSE
   }
-
   return status
 }
 
-function postRssNews(encryptedRss: string): string {
+function postRssNews(encryptedRss: string): RssResult {
   const rssNewsBaseUrl: string =
     app.config && app.config['ssb.baseUrl']
       ? app.config['ssb.baseUrl'] + '/rss/populate/news'
@@ -72,16 +75,24 @@ function postRssNews(encryptedRss: string): string {
   try {
     const pushRssNewsResponse: HttpResponse = request(requestParams)
     if (pushRssNewsResponse.status === 200) {
-      return 'Push av RSS nyheter OK'
+      return {
+        message: 'Push av RSS nyheter OK',
+      }
     } else {
-      return 'Push av RSS nyheter feilet - ' + pushRssNewsResponse.status
+      return {
+        message: 'Push av RSS nyheter feilet - ' + pushRssNewsResponse.status,
+        status: Events.REQUEST_GOT_ERROR_RESPONSE,
+      }
     }
   } catch (e) {
-    return 'Push av nyheter feilet - ' + e
+    return {
+      message: 'Push av nyheter feilet - ' + e,
+      status: Events.REQUEST_GOT_ERROR_RESPONSE,
+    }
   }
 }
 
-function postRssStatkal(encryptedRss: string): string {
+function postRssStatkal(encryptedRss: string): RssResult {
   const rssStatkalBaseUrl: string =
     app.config && app.config['ssb.baseUrl']
       ? app.config['ssb.baseUrl'] + '/rss/populate/statkal'
@@ -98,16 +109,25 @@ function postRssStatkal(encryptedRss: string): string {
   try {
     const pushRssStatkalResponse: HttpResponse = request(requestParams)
     if (pushRssStatkalResponse.status === 200) {
-      return 'Push av RSS statkal OK'
+      return { message: 'Push av RSS statkal OK' }
     } else {
-      return `Push av RSS statkal til ${rssStatkalBaseUrl} feilet - ${pushRssStatkalResponse.status} `
+      return {
+        message: `Push av RSS statkal til ${rssStatkalBaseUrl} feilet - ${pushRssStatkalResponse.status}`,
+        status: Events.REQUEST_GOT_ERROR_RESPONSE,
+      }
     }
   } catch (e) {
-    return 'Push av RSS statkal feilet - ' + e
+    return { message: 'Push av RSS statkal feilet - ' + e, status: Events.REQUEST_GOT_ERROR_RESPONSE }
   }
 }
 
 interface RssItems {
   body: string | null
+  message: RssResult['message']
+  status?: RssResult['status']
+}
+
+export interface RssResult {
   message: string
+  status?: string
 }

src/main/resources/lib/ssb/cron/rss.ts

@@ -180,8 +180,10 @@ export interface RSSFilterLogData {
   otherDataType: Array<string>
   inRSSOrNoKey: Array<string>
   savedQueryStatistics: Array<string>
+  start?: Array<string>
   skipped: Array<string>
   end: Array<string>
+  statistics?: Array<string>
 }
 
 export interface DataSourceInfo {