chore(j-s): Use lawyer registry from api (#17434)

* Refactor lawyer registry

* Simplify code

* Handle errors from API

* Improve type safety

* Add error handling to get single lawyer

* Refactor

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

apps/judicial-system/web/messages/Core/errors.ts

@@ -94,6 +94,12 @@ export const errors = defineMessages({
     description:
       'Notaður sem villuskilaboð þegar ekki gengur að sækja lögmanna skrá',
   },
+  fetchLawyer: {
+    id: 'judicial.system.core:errors.fetch_lawyer',
+    defaultMessage: 'Upp kom villa við að sækja lögmann úr lögmanna skrá',
+    description:
+      'Notaður sem villuskilaboð þegar ekki gengur að sækja lögmann úr lögmanna skrá',
+  },
   copyLink: {
     id: 'judicial.system.core:errors.copy_link',
     defaultMessage: 'Ekki tókst að afrita hlekk',

apps/judicial-system/web/src/utils/hooks/useLawyers/useLawyers.ts

@@ -5,18 +5,25 @@ import { toast } from '@island.is/island-ui/core'
 import { type Lawyer } from '@island.is/judicial-system/types'
 import { errors as errorMessages } from '@island.is/judicial-system-web/messages'
 
+const LAWYER_REGISTRY_URL = '/api/defender/lawyerRegistry'
+
 export const useGetLawyers = (): Lawyer[] => {
   const { formatMessage } = useIntl()
-  const { data, error } = useSWR<Lawyer[]>(
-    '/api/lawyers/getLawyers',
-    (url: string) => fetch(url).then((res) => res.json()),
-    {
-      revalidateIfStale: false,
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-      errorRetryCount: 2,
-    },
-  )
+  const fetcher = (url: string): Promise<Lawyer[]> =>
+    fetch(url).then((res) => {
+      if (!res.ok) {
+        throw new Error('Failed to get lawyers from lawyer registry')
+      }
+
+      return res.json()
+    })
+
+  const { data, error } = useSWR<Lawyer[]>(LAWYER_REGISTRY_URL, fetcher, {
+    revalidateIfStale: false,
+    revalidateOnFocus: false,
+    revalidateOnReconnect: false,
+    errorRetryCount: 2,
+  })
 
   if (error) {
     toast.error(formatMessage(errorMessages.fetchLawyers))
@@ -30,12 +37,22 @@ export const useGetLawyer = (
   nationalId?: string | null,
   shouldFetch?: boolean,
 ): Lawyer | undefined => {
-  const fetchWithNationalId = (url: string, nationalId: string) =>
-    fetch(`${url}?nationalId=${nationalId}`).then((res) => res.json())
+  const { formatMessage } = useIntl()
+
+  const fetcher = (url: string): Promise<Lawyer> =>
+    fetch(url).then((res) => {
+      if (!res.ok) {
+        throw new Error(
+          `Failed to get lawyer with nationalId ${nationalId} from lawyer registry`,
+        )
+      }
 
-  const { data } = useSWR<Lawyer>(
-    nationalId && shouldFetch ? [`/api/lawyers/getLawyer`, nationalId] : null,
-    fetchWithNationalId,
+      return res.json()
+    })
+
+  const { data, error } = useSWR<Lawyer>(
+    nationalId && shouldFetch ? `${LAWYER_REGISTRY_URL}/${nationalId}` : null,
+    fetcher,
     {
       revalidateIfStale: false,
       revalidateOnFocus: false,
@@ -44,5 +61,10 @@ export const useGetLawyer = (
     },
   )
 
+  if (error) {
+    toast.error(formatMessage(errorMessages.fetchLawyer))
+    return undefined
+  }
+
   return data
 }