Skip to content

(DRAFT) Implement urlFallback #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valeriibudko wants to merge 2 commits into
base: master
Choose a base branch
from
Open

(DRAFT) Implement urlFallback #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bee5c12
Implement urlFallback
valeriibudko May 6, 2025
1e2187a
Implement urlFallback
valeriibudko May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 49 additions & 16 deletions api/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,66 @@ export const fetchWorks = async (body) => {
const { t } = body
const split = t?.split('-')
const isUndefined = split?.some((item) => item === undefined)
const url = new URL(

const urlPrimary = new URL(
`/v3/search/works${!isUndefined || t ? `?t=${t}` : ''}`,
process.env.API_URL
).href
const { data: dataWorks } = await apiRequest(url, {
body,
method: 'POST',
})

return dataWorks
const urlFallback = new URL(
`/v3/search/works${!isUndefined || t ? `?t=${t}` : ''}`,
process.env.API_URL_01
).href

try {
const { data: dataWorks } = await apiRequest(urlPrimary, {
method: 'POST',
body,
})
return dataWorks
} catch (err) {
console.warn('Primary API failed')
console.error(`Primary API failed (${urlPrimary}), retrying fallback…`, err)
const { data: dataWorks } = await apiRequest(urlFallback, {
method: 'POST',
body,
})
return dataWorks
}
}

export const fetchAggregations = async (body) => {
const url = new URL(`/v3/search/works/aggregate`, process.env.API_URL).href
const { data: aggregations } = await apiRequest(url, {
body: {
...body,
q: body.q || '',
},
method: 'POST',
})
return aggregations
const urlPrimary = new URL(`/v3/search/works/aggregate`, process.env.API_URL).href
const urlFallback = new URL(`/v3/search/works/aggregate`, process.env.API_URL_01).href

try {
const { data: aggregations } = await apiRequest(urlPrimary, {
body: {
...body,
q: body.q || '',
},
method: 'POST',
})
return aggregations
} catch (err) {
console.warn('Primary API failed')
console.error(
`Primary API failed (${urlPrimary}), retrying fallback for aggregate …`,
err
)
const { data: aggregations } = await apiRequest(urlFallback, {
body: {
...body,
q: body.q || '',
},
method: 'POST',
})
return aggregations
}
}

export const downloadResultsInCSV = async (body) => {
const url = new URL(`/v3/search/works`, process.env.API_URL).href

await apiRequest(url, {
body,
method: 'POST',
Expand Down
2 changes: 2 additions & 0 deletions env.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ const local = {

const development = {
API_URL: 'https://api-dev.core.ac.uk/internal',
API_URL_01: 'https://api-dev.core.ac.uk/internal',
}

const production = {
API_URL: 'https://api.core.ac.uk/internal',
API_URL_01: 'https://api01.core.ac.uk/internal',
}

const validate = (config) =>
Expand Down