fix(jobnet-search): fallback to search endpoint on detail 404 for external ads (#432) (#435)

* fix(jobnet-search): fallback to search endpoint on detail 404 for external ads (#432) * fix(jobnet-search): mark external detail fallback degraded and omit unknown fields * changelog: add the #432 entry for the external-ad fallback Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013fqqLgQSnwgWkv98twQhHi --------- Co-authored-by: Mads Lorentzen <madslorentzen17@gmail.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-18 09:06:24 +00:00 · 2026-09-07 18:38:15 +02:00
parent ab5732138a
commit f8c606fb3d
3 changed files with 210 additions and 27 deletions
@@ -1,6 +1,7 @@
 import { defineCommand, option } from "@bunli/core"
 import { z } from "zod"
 import { apiFetch, normalizeJobId, writeError, stripHtml } from "../helpers.js"
+import type { JobAdRaw, SearchApiResponse } from "./search.js"

 export interface DetailApiResponse {
  id: string
@@ -8,13 +9,14 @@ export interface DetailApiResponse {
  body: string
  publicationDateTime: string
  unpublicationDateTime: string | null
-  approvalStatus: string
-  views: number
+  approvalStatus: string | null
+  views: number | null
  createdDateTime: string
  updatedDateTime: string
-  isAnonymousEmployer: boolean
+  isAnonymousEmployer: boolean | null
  hasLogo: boolean
  logoUrl: string | null
+  isExternal?: boolean
  employer: {
    cvrNumber: string | null
    pNumber: string | null
@@ -22,7 +24,7 @@ export interface DetailApiResponse {
    hasCompanyLogo: boolean
  }
  job: {
-    type: string
+    type: string | null
    address: {
      streetName: string | null
      city: string | null
@@ -31,21 +33,21 @@ export interface DetailApiResponse {
      countryCode: string
      countryName: string
    }
-    noFixedWorkplace: boolean
-    isLimitedPeriod: boolean
-    isDisabilityFriendly: boolean
-    isPartTime: boolean
+    noFixedWorkplace: boolean | null
+    isLimitedPeriod: boolean | null
+    isDisabilityFriendly: boolean | null
+    isPartTime: boolean | null
    employmentDate: string | null
    conceptUriDa: string | null
    preferredLabelDa: string | null
    driversLicenses: unknown[]
    classifications: unknown[]
    shifts: unknown[]
-    isFavorite: boolean
+    isFavorite: boolean | null
  }
  application: {
    deadlineDate: string | null
-    availablePositions: number
+    availablePositions: number | null
    contactPersons: Array<{
      firstNames: string | null
      lastName: string | null
@@ -53,12 +55,73 @@ export interface DetailApiResponse {
    }>
    url: string | null
    urlText: string | null
-    isApplicationDeadlineASAP: boolean
+    isApplicationDeadlineASAP: boolean | null
  }
  organisationTypeId: number | null
  user: string | null
 }

+/**
+ * Maps a raw JobAd from the search endpoint to a DetailApiResponse.
+ * Used as a fallback when /FindJob/JobAdDetails/<id> returns 404 for external ads (#432).
+ */
+export function mapSearchAdToDetail(raw: JobAdRaw & { jobAdUrl?: string | null; jobAnnouncementTypeName?: string | null }): DetailApiResponse {
+  const street = raw.workPlaceAddress ? raw.workPlaceAddress.trim() : null
+  return {
+    id: raw.jobAdId,
+    title: raw.title,
+    body: raw.description ?? "",
+    publicationDateTime: raw.publicationDate ?? "",
+    unpublicationDateTime: null,
+    approvalStatus: null,
+    views: null,
+    createdDateTime: raw.publicationDate ?? "",
+    updatedDateTime: raw.publicationDate ?? "",
+    isAnonymousEmployer: null,
+    hasLogo: Boolean(raw.hasLogo),
+    logoUrl: raw.logoUrl ?? null,
+    isExternal: true,
+    employer: {
+      cvrNumber: raw.cvr ?? null,
+      pNumber: null,
+      name: raw.hiringOrgName ?? "",
+      hasCompanyLogo: Boolean(raw.hasLogo),
+    },
+    job: {
+      type: raw.jobAnnouncementTypeName ?? (raw.workHourPartTime != null ? (raw.workHourPartTime ? "PartTime" : "FullTime") : null),
+      address: {
+        streetName: street && street.length > 0 ? street : null,
+        city: raw.postalDistrictName ?? raw.municipality ?? null,
+        postalCode: raw.postalCode ? String(raw.postalCode) : null,
+        municipality: raw.municipality ?? null,
+        countryCode: raw.country === "Danmark" ? "DK" : (raw.country || "DK"),
+        countryName: raw.country || "Danmark",
+      },
+      noFixedWorkplace: null,
+      isLimitedPeriod: null,
+      isDisabilityFriendly: null,
+      isPartTime: raw.workHourPartTime != null ? Boolean(raw.workHourPartTime) : null,
+      employmentDate: null,
+      conceptUriDa: raw.conceptUriDa ?? null,
+      preferredLabelDa: raw.occupation ?? null,
+      driversLicenses: [],
+      classifications: [],
+      shifts: [],
+      isFavorite: raw.isFavorite != null ? Boolean(raw.isFavorite) : null,
+    },
+    application: {
+      deadlineDate: raw.applicationDeadline ?? null,
+      availablePositions: null,
+      contactPersons: [],
+      url: raw.jobAdUrl && raw.jobAdUrl.trim().length > 0 ? raw.jobAdUrl.trim() : null,
+      urlText: null,
+      isApplicationDeadlineASAP: raw.applicationDeadlineStatus ? raw.applicationDeadlineStatus === "NotDisclosed" : null,
+    },
+    organisationTypeId: null,
+    user: null,
+  }
+}
+
 /**
 * Normalize a raw detail response before any output format sees it.
 *
@@ -99,30 +162,53 @@ export const detail = defineCommand({
      process.exit(1)
    }

+    let data: DetailApiResponse | null = null
+
    try {
-      const data = prepareDetail(
+      data = prepareDetail(
        await apiFetch<DetailApiResponse>(`/FindJob/JobAdDetails/${id}`, {
          incrementViews: "false",
        }),
      )
-
-      if (signal.aborted) return
-
-      if (flags.format === "json") {
-        console.log(JSON.stringify(data, null, 2))
-      } else if (flags.format === "table") {
-        outputTable(data)
-      } else {
-        outputPlain(data)
-      }
    } catch (err) {
      const message = err instanceof Error ? err.message : String(err)
      if (message.includes("404") || message.includes("Not Found")) {
-        writeError("Job ad not found", "NOT_FOUND")
+        // Fallback for external ads: JobAdDetails returns 404 for ads with isExternal: true,
+        // but /FindJob/Search returns the full ad object including HTML description (#432).
+        try {
+          const searchResult = await apiFetch<SearchApiResponse>("/FindJob/Search", {
+            searchString: id,
+            resultsPerPage: "5",
+            pageNumber: "1",
+            orderType: "PublicationDate",
+          })
+          const match = searchResult.jobAds?.find((ad) => ad.jobAdId === id)
+          if (match) {
+            process.stderr.write("note: detail endpoint returned 404; retrieved external posting summary from search endpoint\n")
+            data = prepareDetail(mapSearchAdToDetail(match))
+          }
+        } catch {
+          // If fallback search fails, fall through to NOT_FOUND
+        }
+
+        if (!data) {
+          writeError("Job ad not found", "NOT_FOUND")
+          process.exit(1)
+        }
      } else {
        writeError(message, "API_ERROR")
+        process.exit(1)
      }
-      process.exit(1)
+    }
+
+    if (signal.aborted || !data) return
+
+    if (flags.format === "json") {
+      console.log(JSON.stringify(data, null, 2))
+    } else if (flags.format === "table") {
+      outputTable(data)
+    } else {
+      outputPlain(data)
    }
  },
 })
@@ -131,13 +217,13 @@ function outputTable(data: DetailApiResponse): void {
  console.log(`ID:          ${data.id}`)
  console.log(`Title:       ${data.title}`)
  console.log(`Employer:    ${data.employer.name}`)
-  console.log(`Type:        ${data.job.type}`)
+  console.log(`Type:        ${data.job.type ?? "-"}`)
  console.log(`City:        ${data.job.address.city ?? "-"}`)
  console.log(`Postal:      ${data.job.address.postalCode ?? "-"}`)
  console.log(`Country:     ${data.job.address.countryName}`)
  console.log(`Published:   ${data.publicationDateTime}`)
  console.log(`Deadline:    ${data.application.deadlineDate ?? "-"}`)
-  console.log(`Positions:   ${data.application.availablePositions}`)
+  console.log(`Positions:   ${data.application.availablePositions ?? "-"}`)
  console.log(`Apply URL:   ${data.application.url ?? "-"}`)
 }

@@ -152,7 +238,7 @@ export function formatDetailPlain(data: DetailApiResponse): string {
    `Location: ${data.job.address.city ?? "-"}, ${data.job.address.countryName}`,
    `Published: ${data.publicationDateTime}`,
    `Deadline: ${data.application.deadlineDate ?? "-"}`,
-    `Positions: ${data.application.availablePositions}`,
+    `Positions: ${data.application.availablePositions ?? "-"}`,
  ]

  if (data.application.url) {