fix

Author: mluukkai

backend/src/db/db.ts

@@ -22,8 +22,8 @@ async function fillDb(statutes: StatuteKey[], judgments: JudgmentKey[]): Promise
     let i = 0;
     for (const key of statutes) {
       ++i;
-      const url = buildFinlexUrl(key)
-      console.log('URL', url)
+      const { uri } = buildFinlexUrl(key)
+      console.log('URL', uri)
       await setSingleStatute(buildFinlexUrl(key));
       if (i % 100 === 0) {
         console.log(`Inserted ${i} statutes (${statutes.length})`)
@@ -376,12 +376,12 @@ async function closePool() {
 
 async function setupTestDatabase(): Promise<void> {
   await createTables();
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/9/fin@")
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/9/swe@")
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/4/fin@")
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/4/swe@")
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/5/fin@")
-  await setSingleStatute("https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/5/swe@")
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/9/fin@", uriOld: ''})
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/9/swe@", uriOld: ''})
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/4/fin@", uriOld: ''})
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/4/swe@", uriOld: ''})
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/5/fin@", uriOld: ''})
+  await setSingleStatute({ uri: "https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated/2023/5/swe@", uriOld: ''})
   await setSingleJudgment("https://www.finlex.fi/fi/oikeuskaytanto/korkein-hallinto-oikeus/ennakkopaatokset/2005/13")
   await setSingleJudgment("https://www.finlex.fi/sv/rattspraxis/hogsta-forvaltningsdomstolen/prejudikat/2005/13")
   await setSingleJudgment("https://www.finlex.fi/fi/oikeuskaytanto/korkein-oikeus/ennakkopaatokset/2023/5")

backend/src/db/load.ts

@@ -40,13 +40,17 @@ function parseFinlexUrl(url: string): { docYear: number; docNumber: string; docL
   }
 }
 
-function buildFinlexUrl(statute: StatuteKey): string {
-  // const baseUrl = 'https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated';
-  // return `${baseUrl}/${statute.year}/${statute.number}/${statute.language}@${statute.version ? statute.version : ''}`;
+function buildFinlexUrl(statute: StatuteKey): { uri: string, uriOld: string }  {
+  const oldBaseUrl = 'https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute-consolidated';
   const baseUrl = 'https://opendata.finlex.fi/finlex/avoindata/v1/akn/fi/act/statute'
-  return `${baseUrl}/${statute.year}/${statute.number}/${statute.language}@`;
+  return {
+    uri: `${baseUrl}/${statute.year}/${statute.number}/${statute.language}@`,
+    uriOld: `${oldBaseUrl}/${statute.year}/${statute.number}/${statute.language}@${statute.version ? statute.version : ''}`
+  };
 }
 
+
+
 function parseJudgmentUrl(url: string): JudgmentKey {
   const u = new URL(url)
   const parts = u.pathname.split("/").filter(p => p !== "")
@@ -323,10 +327,29 @@ async function setImages(statuteUuid: string, docYear: number, docNumber: string
   }
 }
 
-async function setSingleStatute(uri: string) {
-  const result = await axios.get(`${uri}`, {
-    headers: { 'Accept': 'application/xml', 'Accept-Encoding': 'gzip' }
-  })
+async function fetchStatute(uri: string) {
+  try {
+    const result = await axios.get(`${uri}`, {
+      headers: { 'Accept': 'application/xml', 'Accept-Encoding': 'gzip' }
+    })
+    return result
+  } catch {
+    return null
+  }
+}
+
+async function setSingleStatute(uris : { uri: string, uriOld: string}) {
+  const { uri, uriOld } = uris
+  let result = await fetchStatute(uri)
+  if (!result) {
+    result = await fetchStatute(uriOld)
+    if (!result) {
+      console.log(' --> not found: ', uri)
+      console.log('          --> : ', uriOld)
+      return null
+    }
+  }
+
   const docTitle = await parseTitlefromXML(result)
   const imageLinks = await parseImagesfromXML(result)
   const keywordList = await parseKeywordsfromXML(result)