From 23ce66684721af4c8b47a3384d00b8e839f294c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20H=C3=A5rek=20Andreassen?= <tim@harek.no>
Date: Sat, 6 Apr 2024 23:56:35 +0200
Subject: [PATCH] refactor: Returns `null` instead of throwing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Hårek Andreassen <tim@harek.no>
---
 lib/nrk.ts      | 15 +++++++++++----
 lib/nrk_test.ts |  9 +++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/nrk.ts b/lib/nrk.ts
index fec43c5..55ff674 100644
--- a/lib/nrk.ts
+++ b/lib/nrk.ts
@@ -8,6 +8,8 @@ type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 type PodcastEpisodes = catalogComponents["schemas"]["EpisodesHalResource"];
 type Podcast = catalogComponents["schemas"]["SeriesHalResource"];
 type PodcastEpisodesSingle = catalogComponents["schemas"]["EpisodeHalResource"];
+type RadioSeriesEpisode = catalogComponents["schemas"]["EpisodesHalResource"];
+type RadioSeries = catalogComponents["schemas"]["SeriesHalResource"];
 
 export type Serie = catalogComponents["schemas"]["SeriesViewModel"];
 export type OriginalEpisode = PodcastEpisodesSingle & { url: string };
@@ -61,7 +63,9 @@ export const nrkRadio = {
     console.error(`Something went wrong with ${query} - got status ${status}`);
     return null;
   },
-  getSerieData: async (seriesId: string) => {
+  getSerieData: async (
+    seriesId: string,
+  ): Promise<{ episodes: OriginalEpisode[] } & (RadioSeries["series"] | Podcast["series"]) | null> => {
     let [
       { status: episodeStatus, body: episodeResponse },
       { status: seriesStatus, body: serieResponse },
@@ -79,10 +83,10 @@ export const nrkRadio = {
         { status: episodeStatus, body: episodeResponse },
         { status: seriesStatus, body: serieResponse },
       ] = await Promise.all([
-        get<catalogComponents["schemas"]["EpisodesHalResource"]>(
+        get<RadioSeriesEpisode>(
           `https://psapi.nrk.no/radio/catalog/series/${seriesId}/episodes`,
         ),
-        get<catalogComponents["schemas"]["SeriesHalResource"]>(
+        get<RadioSeries>(
           `https://psapi.nrk.no/radio/catalog/series/${seriesId}`,
         ),
       ]);
@@ -100,7 +104,10 @@ export const nrkRadio = {
         episodes,
       };
     }
-    throw `Error getting episodes for ${seriesId}: EpisodeStatus: ${episodeStatus}. SerieStatus: ${seriesStatus}`;
+    console.error(
+      `Error getting episodes for ${seriesId}: EpisodeStatus: ${episodeStatus}. SerieStatus: ${seriesStatus}`,
+    );
+    return null;
   },
   getEpisode: async (seriesId: string, episodeId: string): Promise<PodcastEpisode | null> => {
     const url = `${nrkAPI}/radio/catalog/podcast/${seriesId}/episodes/${episodeId}`;
diff --git a/lib/nrk_test.ts b/lib/nrk_test.ts
index cb4eb03..d31cdb1 100644
--- a/lib/nrk_test.ts
+++ b/lib/nrk_test.ts
@@ -19,13 +19,14 @@ Deno.test("Verify empty search query yields `null`", async () => {
 Deno.test("Verify getting series data for 'trygdekontoret' works", async () => {
   const result = await nrkRadio.getSerieData("trygdekontoret");
 
+  assertExists(result);
   assertGreaterOrEqual(result.episodes.length, 1);
 });
 
-// TODO: This doesn't work because there is no try-catch system, it seems.
-// Deno.test("Verify getting series data for 'trygd' does not works", async () => {
-//   await assertThrows(async () => await nrkRadio.getSerieData("trygd"));
-// });
+Deno.test("Verify getting series data for 'trygd' does not works", async () => {
+  const result = await nrkRadio.getSerieData("trygd");
+  assertEquals(result, null);
+});
 
 Deno.test("Verify getting episodeId 'l_0bc5e55a-46b5-48a5-85e5-5a46b5d8a562' for 'trygdekontoret' works", async () => {
   const result = await nrkRadio.getEpisode("trygdekontoret", "l_0bc5e55a-46b5-48a5-85e5-5a46b5d8a562");