Error loading courses. Please try again.
'); } }); @@ -369,4 +381,53 @@ router.post('/api/scrape-event-results/:courseId', async (req, res) => { } }); +// Search Tjing for courses +router.get('/api/tjing/search', async (req, res) => { + const { q } = req.query; + if (!q || q.trim().length === 0) { + return res.json({ results: [] }); + } + + const result = await searchTjingCourses(q.trim()); + if (result.error) { + logger.warn({ q, err: result.error }, 'Tjing search error'); + return res.status(502).json({ error: result.error }); + } + + res.json({ results: result.data }); +}); + +// Import a course from Tjing +router.post('/api/tjing/import/:tjingId', async (req, res) => { + const { tjingId } = req.params; + + const result = await getTjingCourse(tjingId); + if (result.error) { + logger.warn({ tjingId, err: result.error }, 'Tjing import error'); + return res.status(502).json({ error: result.error }); + } + + const courseData = result.data; + + try { + const courseId = await saveCourseToDB({ + name: courseData.name, + link: `https://tjing.se/courses/${tjingId}`, + city: courseData.address || '' + }); + + let layoutsImported = 0; + for (const layout of courseData.layouts) { + await getOrCreateLayout(courseId, layout.name, layout.par); + layoutsImported++; + } + + logger.info({ courseId, name: courseData.name, layoutsImported }, 'Imported course from Tjing'); + res.json({ courseId, layoutsImported }); + } catch (err) { + logger.error({ err, tjingId }, 'Failed to save Tjing course to DB'); + res.status(500).json({ error: 'Failed to save course to database' }); + } +}); + module.exports = router; diff --git a/src/scrapers/tjing.js b/src/scrapers/tjing.js new file mode 100644 index 0000000..157a9b9 --- /dev/null +++ b/src/scrapers/tjing.js @@ -0,0 +1,111 @@ +const logger = require('../logger'); + +const TJING_API = 'https://api.tjing.se/graphql'; +const FETCH_TIMEOUT_MS = 8000; + +async function tjingFetch(query) { + const controller = new AbortController(); + const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS); + + let response; + try { + response = await fetch(TJING_API, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ query }), + signal: controller.signal + }); + } catch (err) { + if (err.name === 'AbortError') { + return { error: 'Tjing API request timed out' }; + } + return { error: `Network error: ${err.message}` }; + } finally { + clearTimeout(timer); + } + + if (!response.ok) { + return { error: `Tjing API returned ${response.status}` }; + } + + let data; + try { + data = await response.json(); + } catch (err) { + return { error: 'Invalid JSON from Tjing API' }; + } + + if (data.errors && data.errors.length > 0) { + return { error: data.errors[0].message }; + } + + return { data: data.data }; +} + +async function searchTjingCourses(searchTerm) { + const query = `{ + courses(first: 10, filter: { search: "${searchTerm.replace(/"/g, '\\"')}" }) { + id + name + address + type + } + }`; + + const result = await tjingFetch(query); + if (result.error) return result; + + return { data: result.data.courses || [] }; +} + +async function getTjingCourse(courseId) { + const query = `{ + course(courseId: "${courseId.replace(/"/g, '\\"')}") { + id + name + address + layouts { + id + name + published + latestVersion { + holes { + number + par + } + } + } + } + }`; + + const result = await tjingFetch(query); + if (result.error) return result; + + const course = result.data.course; + if (!course) { + return { error: 'Course not found' }; + } + + // Calculate total par per layout from holes + const layouts = (course.layouts || []) + .filter(l => l.published && l.latestVersion && l.latestVersion.holes.length > 0) + .map(l => ({ + name: l.name, + par: l.latestVersion.holes.reduce((sum, h) => sum + h.par, 0), + holes: l.latestVersion.holes.length + })); + + return { + data: { + name: course.name, + address: course.address, + tjingId: course.id, + layouts + } + }; +} + +module.exports = { + searchTjingCourses, + getTjingCourse +}; diff --git a/views/pages/courses.ejs b/views/pages/courses.ejs index 8b94723..d13646e 100644 --- a/views/pages/courses.ejs +++ b/views/pages/courses.ejs @@ -1,43 +1,33 @@ <% var body = ` -Filters the list below as you type.
+Find and import Swedish courses from tjing.se.
+ +No courses found. Click "Scrape Courses" to load Swedish courses from PDGA.
+<% if (!courses || courses.length === 0) { %> +No courses found. Use "Import from Tjing" or scrape courses from PDGA.
<% } else { %> -| Course Name | -City | -Last Updated | -Actions | -
|---|---|---|---|
|
- <%= course.name %>
- <%= course.city %>
- |
- <%= course.city %> | -<%= lastUpdated %> | -- '); event.stopPropagation();" title="Scrape layouts for this course"> - | -
|
-
-
- Click to load layouts...
- |
- |||