diff --git a/shared b/shared index de027ef..bddcaa7 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit de027ef18079d416d696dbc312f535d2cc46b309 +Subproject commit bddcaa7804d4987f6cb84dc19d07359c1c16a8c7 diff --git a/src/services/openai.service.ts b/src/services/openai.service.ts index 57e1716..169df60 100644 --- a/src/services/openai.service.ts +++ b/src/services/openai.service.ts @@ -34,6 +34,7 @@ export const generateEvents = async ( "location": "Finsbury Park Pavilion", "date": "2025-06-15T19:00:00.000Z", "price": 15, + "distance": 10, "url": "https://example.com/jazz-night" }, ... @@ -43,7 +44,7 @@ export const generateEvents = async ( const systemPrompt: string = `You are a local guide who is an expert on ${location} and all the interesting events in that area. You will respond - with the specified events near this location in the valid format.`; + with the specified events near this location in the valid format with the distance to the event provided in kilometers.`; try { const formatParser = zodTextFormat( diff --git a/testing/dummyData/event.samples.ts b/testing/dummyData/event.samples.ts index ab8994f..092730c 100644 --- a/testing/dummyData/event.samples.ts +++ b/testing/dummyData/event.samples.ts @@ -9,6 +9,7 @@ export const testEvents: Event[] = [ location: 'Finsbury Park', date: '2025-06-15T19:00:00.000Z', price: 25, + distance: 10, url: 'https://example.com/festival', }, { @@ -18,6 +19,7 @@ export const testEvents: Event[] = [ location: 'Finsbury Park', date: '2025-06-15T19:00:00.000Z', price: 25, + distance: 10, url: 'https://example.com/festival', }, { @@ -27,6 +29,7 @@ export const testEvents: Event[] = [ location: 'Finsbury Park', date: '2025-06-15T19:00:00.000Z', price: 25, + distance: 10, url: 'https://example.com/festival', }, { @@ -36,6 +39,7 @@ export const testEvents: Event[] = [ location: 'Finsbury Park', date: '2025-06-15T19:00:00.000Z', price: 15, + distance: 10, url: 'https://example.com/jazz', }, { @@ -45,6 +49,7 @@ export const testEvents: Event[] = [ location: 'Finsbury Park', date: '2025-07-10T08:00:00.000Z', price: 30, + distance: 10, url: 'https://example.com/marathon', }, ]; diff --git a/testing/dummyData/realData.samples.ts b/testing/dummyData/realData.samples.ts index 32d7aff..56da6fc 100644 --- a/testing/dummyData/realData.samples.ts +++ b/testing/dummyData/realData.samples.ts @@ -10,6 +10,7 @@ export const realData: Array = [ 'date': '2025-06-04T23:00:00.000Z', 'price': 1000, 'url': 'https://www.greatevent.com', + 'distance': 37.85, }, { 'mode': 'music', @@ -20,6 +21,7 @@ export const realData: Array = [ 'date': '2025-07-11T12:00:00.000Z', 'price': 0, 'url': 'https://www.timeout.com/london/music/wireless-2', + 'distance': 10.23, }, { 'mode': 'music', @@ -31,550 +33,6 @@ export const realData: Array = [ 'price': 54.5, 'url': 'https://www.chooseyourevent.co.uk/event/293905/finsbury-park-fontaines-d-c-2025', - }, - { - 'mode': 'music', - 'name': 'PARTYNEXTDOOR and Summer Walker Live', - 'description': - 'A live performance by PARTYNEXTDOOR and Summer Walker as part of the Wireless Festival.', - 'location': 'Finsbury Park, London', - 'date': '2025-07-11T12:00:00.000Z', - 'price': 0, - 'url': - 'https://allevents.in/london/partynextdoor-summer-walker-in-london/3300027865588400', - }, - { - 'mode': 'music', - 'name': 'Stereophonics Live at Finsbury Park', - 'description': 'A major concert event featuring the Stereophonics.', - 'location': 'Finsbury Park, London', - 'date': '2025-07-04T12:00:00.000Z', - 'price': 0, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'music', - 'name': 'Krankbrother Festival', - 'description': - 'A large-scale music festival featuring various artists and genres.', - 'location': 'Finsbury Park, London', - 'date': '2025-08-01T12:00:00.000Z', - 'price': 0, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'music', - 'name': '#FNBY Finsbury Fridays', - 'description': - 'A weekly Friday night party featuring resident DJs spinning the latest hits.', - 'location': - 'Orleans Bar, 259 Seven Sisters Road, Finsbury Park, London N4 2DD', - 'date': '2025-05-09T22:00:00.000Z', - 'price': 3.96, - 'url': - 'https://www.eventbrite.co.uk/e/fnby-finsbury-fridays-tickets-1115999808469', - }, - { - 'mode': 'music', - 'name': 'Wireless Festival', - 'description': - 'A major music festival featuring top artists across various genres.', - 'location': 'Finsbury Park, London', - 'date': '2025-07-11T12:00:00.000Z', - 'price': 85, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'music', - 'name': 'Stereophonics Live', - 'description': 'Live performance by the renowned band Stereophonics.', - 'location': 'Finsbury Park, London', - 'date': '2025-07-04T18:00:00.000Z', - 'price': 50, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'music', - 'name': 'Fontaines D.C. Concert', - 'description': 'Concert by the Irish post-punk band Fontaines D.C.', - 'location': 'Finsbury Park, London', - 'date': '2025-07-05T18:00:00.000Z', - 'price': 45, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'charity', - 'name': 'Hackney Half Marathon', - 'description': 'A half marathon event supporting various charities.', - 'location': 'Homerton Rd, London E9 5PF', - 'date': '2025-05-18T08:00:00.000Z', - 'price': 95, - 'url': 'https://www.crosslightadvice.org/events', - }, - { - 'mode': 'charity', - 'name': 'Finsbury Park Half Marathon', - 'description': - 'Half marathon event in Finsbury Park supporting local charities.', - 'location': 'Finsbury Park, Endymion Rd, Harringay, London, N4 1EE', - 'date': '2025-06-16T08:00:00.000Z', - 'price': 28, - 'url': 'https://www.crosslightadvice.org/events', - }, - { - 'mode': 'charity', - 'name': 'Saucony London 10K', - 'description': '10K run through central London supporting various causes.', - 'location': '101 Piccadilly, W1J 7JT', - 'date': '2025-07-13T08:00:00.000Z', - 'price': 75, - 'url': 'https://www.crosslightadvice.org/events', - }, - { - 'mode': 'charity', - 'name': 'GEAR 10K', - 'description': "10K run in King's Lynn supporting local charities.", - 'location': "Tuesday Market Place, King's Lynn, PE30 1JJ", - 'date': '2025-05-05T08:00:00.000Z', - 'price': 28, - 'url': 'https://www.crosslightadvice.org/events', - }, - { - 'mode': 'charity', - 'name': 'London to Amsterdam Cycle', - 'description': - 'Cycling event from London to Amsterdam supporting various charities.', - 'location': 'London to Amsterdam', - 'date': '2025-06-01T08:00:00.000Z', - 'price': 1200, - 'url': 'https://www.crosslightadvice.org/events', - }, - { - 'mode': 'sports', - 'name': 'Finsbury Park 5K, 10K, Half Marathon', - 'description': - 'Running event offering multiple distances in Finsbury Park.', - 'location': 'Endymion Rd, Finsbury Park, London', - 'date': '2025-04-30T08:00:00.000Z', - 'price': 25, - 'url': 'https://us.trip.com/events/4600149-2025-finsbury-park-collection/', - }, - { - 'mode': 'sports', - 'name': 'Black Trail Runners Social Run', - 'description': 'Social run event organized by Black Trail Runners.', - 'location': 'Finsbury Park Station, London', - 'date': '2025-01-26T10:00:00.000Z', - 'price': 0, - 'url': 'https://us.trip.com/events/4600149-2025-finsbury-park-collection/', - }, - { - 'mode': 'sports', - 'name': 'Royal Parks Half Marathon', - 'description': 'Half marathon through central London and four Royal Parks.', - 'location': 'Hyde Park, London', - 'date': '2025-10-12T08:00:00.000Z', - 'price': 60, - 'url': 'https://en.wikipedia.org/wiki/Royal_Parks_Half_Marathon', - }, - { - 'mode': 'other', - 'name': 'Family Fun Fair', - 'description': 'A fun fair event suitable for families.', - 'location': 'Finsbury Park, London', - 'date': '2025-03-29T12:00:00.000Z', - 'price': 10, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'other', - 'name': "Zippo's Circus", - 'description': 'A traditional circus event featuring various performances.', - 'location': 'Finsbury Park, London', - 'date': '2025-10-08T12:00:00.000Z', - 'price': 20, - 'url': - 'https://www.haringey.gov.uk/leisure-parks-culture/parks-greenspaces/park-events/finsbury-park-large-events/upcoming-large-events-finsbury-park', - }, - { - 'mode': 'other', - 'name': 'Finsbury Park Comedy Night ft Paul Sinha', - 'description': 'Comedy night featuring Paul Sinha and other comedians.', - 'location': 'The Swimmer at the Grafton Arms, London', - 'date': '2025-01-16T19:00:00.000Z', - 'price': 15, - 'url': 'https://us.trip.com/events/4600149-2025-finsbury-park-collection/', - }, - { - 'mode': 'other', - 'name': "GALENTINE'S: Paint & Yap", - 'description': "A painting event celebrating Galentine's Day.", - 'location': 'Finsbury Park Painting Club, London', - 'date': '2025-02-11T18:00:00.000Z', - 'price': 25, - 'url': 'https://us.trip.com/events/4600149-2025-finsbury-park-collection/', - }, - { - 'mode': 'other', - 'name': 'Outbreak Festival', - 'description': 'music festival featuring various artists.', - 'location': 'London', - 'date': '2025-06-13T12:00:00.000Z', - 'price': 50, - 'url': 'https://en.wikipedia.org/wiki/Outbreak_Festival', - }, - { - 'mode': 'music', - 'name': "Open Mic Collective at The World's End", - 'description': - 'A community open mic night welcoming all performers and spectators.', - 'location': "The World's End, 21-23 Stroud Green Road, London N4 3EF", - 'date': '2025-05-05T19:00:00.000Z', - 'price': 0, - 'url': - 'https://www.eventbrite.co.uk/e/open-mic-collective-the-worlds-end-finsbury-park-tickets-1252795217219', - }, - { - 'mode': 'music', - 'name': 'Fontaines D.C. Live at Finsbury Park', - 'description': - 'Live performance by Fontaines D.C. with supporting acts Amyl and The Sniffers, Kneecap, and Blondshell.', - 'location': 'Finsbury Park, Seven Sisters Road, London N4 2DH', - 'date': '2025-07-05T12:30:00.000Z', - 'price': 54.5, - 'url': - 'https://www.chooseyourevent.co.uk/event/293905/finsbury-park-fontaines-d-c-2025', - }, - { - 'mode': 'music', - 'name': 'Wireless Festival 2025', - 'description': - 'Annual music festival featuring artists like Drake, PARTYNEXTDOOR, Summer Walker, Burna Boy, and Boy Better Know.', - 'location': 'Finsbury Park, London, UK', - 'date': '2025-07-11T00:00:00.000Z', - 'price': 0, - 'url': 'https://www.songkick.com/venues/43161-finsbury-park', - }, - { - 'mode': 'music', - 'name': 'Stereophonics Live at Finsbury Park', - 'description': - 'Live performance by Stereophonics with supporting act Blossoms.', - 'location': 'Finsbury Park, London, UK', - 'date': '2025-07-04T00:00:00.000Z', - 'price': 0, - 'url': 'https://www.songkick.com/venues/43161-finsbury-park', - }, - { - 'mode': 'music', - 'name': 'Slayer and Mastodon at Finsbury Park', - 'description': - 'Live performances by Slayer, Mastodon, Anthrax, Amon Amarth, Hatebreed, and Neckbreakker.', - 'location': 'Finsbury Park, London, UK', - 'date': '2025-07-06T00:00:00.000Z', - 'price': 0, - 'url': 'https://www.songkick.com/venues/43161-finsbury-park', - }, - { - 'mode': 'charity', - 'name': 'Big Fun Walk 2025', - 'description': - 'A fundraising walk organized by North London Hospice to support hospice services.', - 'location': - 'Starting from East Finchley, passing through Finsbury Park, and ending at Westminster.', - 'date': '2025-05-18T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'Summer Race The Neighbours 2025', - 'description': - 'A 10K run through East Finchley organized by North London Hospice.', - 'location': 'East Finchley, London, UK', - 'date': '2025-06-29T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'North London Hospice X Finsbury Park Running Series 2025', - 'description': - 'A series of running events including 5K, 10K, and Half Marathon to support North London Hospice.', - 'location': 'Finsbury Park, London, UK', - 'date': '2025-06-15T00:00:00.000Z', - 'price': 10, - 'url': - 'https://northlondonhospice.org/events/north-london-hospice-x-finsbury-park-running-series-2025/', - }, - { - 'mode': 'charity', - 'name': 'Triffic Trail: Trent Park – charity of the Year', - 'description': 'A trail run event supporting North London Hospice.', - 'location': 'Trent Park, London, UK', - 'date': '2025-06-22T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'Skydive Day 2025', - 'description': - 'A fundraising skydive event organized by North London Hospice.', - 'location': 'Location to be confirmed.', - 'date': '2025-09-21T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'sports', - 'name': 'Royal Parks Half Marathon 2025', - 'description': - "A half marathon through four of London's Royal Parks supporting North London Hospice.", - 'location': 'London, UK', - 'date': '2025-10-12T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'sports', - 'name': 'Bath Half 2026', - 'description': 'A half marathon event supporting North London Hospice.', - 'location': 'Bath, UK', - 'date': '2026-03-15T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'other', - 'name': 'Museum of Homelessness Open Season', - 'description': - 'An exhibition featuring untold stories from the national collection for homelessness.', - 'location': - 'Museum of Homelessness, The Manor House Lodge, Inside Finsbury Park, Seven Sisters Road, London, N4 2DE', - 'date': '2025-04-17T12:30:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-07', - }, - { - 'mode': 'other', - 'name': "Illustrating Children's Books Course for Adults", - 'description': - "A 10-lesson course teaching the steps to illustrate children's books.", - 'location': 'The Green Shed, 1 Tetherdown, Muswell Hill, London N10 1ND', - 'date': '2025-04-30T10:00:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-07', - }, - { - 'mode': 'other', - 'name': 'Gi Fundamentals Course (BJJ Brazilian Jiu Jitsu)', - 'description': 'A course on Brazilian Jiu Jitsu fundamentals.', - 'location': 'Alexandra Park School, London, UK', - 'date': '2025-05-06T19:00:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-07', - }, - { - 'mode': 'other', - 'name': 'Geekstraveganza – Boardgame Meetup', - 'description': 'Regular board game meetup sessions.', - 'location': 'Karamel, 4 Coburg Road, Wood Green, London, UK', - 'date': '2025-05-27T13:00:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-27', - }, - { - 'mode': 'other', - 'name': 'Crouch End Festival 2025', - 'description': - 'A community arts festival featuring art exhibitions, drama, dance, film, poetry, and music.', - 'location': 'Crouch End, London, UK', - 'date': '2025-06-12T00:00:00.000Z', - 'price': 0, - 'url': 'https://en.wikipedia.org/wiki/Crouch_End', - }, - { - 'mode': 'sports', - 'name': 'National League Play-Off Final', - 'description': 'The Final to see who goes up to league two', - 'location': 'Wembley, London', - 'date': 'Good Question', - 'price': 0, - 'url': 'No one cares this much', - }, - { - 'mode': 'music', - 'name': "Open Mic Collective @ The World's End", - 'description': - 'A community open mic night welcoming all performance types, including music, dance, poetry, and more.', - 'location': "The World's End, 21-23 Stroud Green Road, London N4 3EF", - 'date': '2025-05-05T19:00:00.000Z', - 'price': 0, - 'url': - 'https://www.eventbrite.co.uk/e/open-mic-collective-the-worlds-end-finsbury-park-tickets-1252795217219', - }, - { - 'mode': 'music', - 'name': 'Outbreak Festival 2025', - 'description': - 'A music festival featuring artists like Turnstile, Alex G, and Danny Brown.', - 'location': 'London (specific venue TBA)', - 'date': '2025-06-13T00:00:00.000Z', - 'price': 0, - 'url': 'https://en.wikipedia.org/wiki/Outbreak_Festival', - }, - { - 'mode': 'music', - 'name': 'Fontaines D.C. 2025', - 'description': - 'A live performance by Fontaines D.C. with supporting acts Amyl and The Sniffers, Kneecap, and Blondshell.', - 'location': 'Finsbury Park, Seven Sisters Road, London N4 2DH', - 'date': '2025-07-05T12:30:00.000Z', - 'price': 54.5, - 'url': - 'https://www.chooseyourevent.co.uk/event/293905/finsbury-park-fontaines-d-c-2025', - }, - { - 'mode': 'music', - 'name': 'Wireless Festival 2025', - 'description': - 'A three-day music festival featuring artists like Drake, PARTYNEXTDOOR, Summer Walker, and Burna Boy.', - 'location': 'Finsbury Park, Seven Sisters Road, London N4 2DH', - 'date': '2025-07-11T00:00:00.000Z', - 'price': 0, - 'url': 'https://en.wikipedia.org/wiki/Wireless_Festival', - }, - { - 'mode': 'music', - 'name': 'Stereophonics and Blossoms Live', - 'description': 'A live concert featuring Stereophonics and Blossoms.', - 'location': 'Finsbury Park, Seven Sisters Road, London N4 2DH', - 'date': '2025-07-04T00:00:00.000Z', - 'price': 0, - 'url': 'https://www.songkick.com/venues/43161-finsbury-park', - }, - { - 'mode': 'charity', - 'name': 'Big Fun Walk 2025', - 'description': - 'A fundraising walk organized by North London Hospice to support hospice services.', - 'location': - "Starting from East Finchley and ending at Storey's Gate, London", - 'date': '2025-05-18T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'Summer Race The Neighbours 2025', - 'description': - 'A 10K run through East Finchley organized by North London Hospice.', - 'location': 'East Finchley, London', - 'date': '2025-06-29T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'North London Hospice X Finsbury Park Running Series 2025', - 'description': - 'A series of running events including 5K, 10K, and Half Marathon to support North London Hospice.', - 'location': 'Finsbury Park, London', - 'date': '2025-06-15T00:00:00.000Z', - 'price': 10, - 'url': - 'https://northlondonhospice.org/events/north-london-hospice-x-finsbury-park-running-series-2025/', - }, - { - 'mode': 'charity', - 'name': 'Triffic Trail: Trent Park – charity of the Year', - 'description': 'A trail run event supporting North London Hospice.', - 'location': 'Trent Park, London', - 'date': '2025-06-22T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'charity', - 'name': 'Skydive Day 2025', - 'description': - 'A fundraising skydive event organized by North London Hospice.', - 'location': 'Location TBA', - 'date': '2025-09-21T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'sports', - 'name': 'Royal Parks Half Marathon 2025', - 'description': - "A half marathon through four of London's Royal Parks supporting North London Hospice.", - 'location': 'London', - 'date': '2025-10-12T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'sports', - 'name': 'Kilimanjaro Trek', - 'description': - 'A fundraising trek to the summit of Kilimanjaro organized by North London Hospice.', - 'location': 'Kilimanjaro, Tanzania', - 'date': '2025-01-01T00:00:00.000Z', - 'price': 0, - 'url': 'https://northlondonhospice.org/support-us/our-fundraising-events/', - }, - { - 'mode': 'other', - 'name': 'Museum of Homelessness Open Season', - 'description': - 'An exhibition featuring untold stories from the national collection for homelessness.', - 'location': - 'The Manor House Lodge, Inside Finsbury Park, Seven Sisters Road, London N4 2DE', - 'date': '2025-04-17T12:30:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-29', - }, - { - 'mode': 'other', - 'name': 'Gi Fundamentals Course (BJJ Brazilian Jiu Jitsu)', - 'description': 'A Brazilian Jiu Jitsu fundamentals course.', - 'location': 'Alexandra Park School, London', - 'date': '2025-05-06T19:00:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-07', - }, - { - 'mode': 'other', - 'name': 'Geekstraveganza – Boardgame Meetup', - 'description': 'A regular board game meetup.', - 'location': 'Karamel, 4 Coburg Road, Wood Green, London', - 'date': '2025-05-27T13:00:00.000Z', - 'price': 0, - 'url': - 'https://alexandraparkneighbours.org.uk/newevents/list/on/2025-05-27', - }, - { - 'mode': 'other', - 'name': 'Crouch End Festival 2025', - 'description': - 'A community arts festival featuring art exhibitions, drama, dance, film, poetry, and music.', - 'location': 'Crouch End, London', - 'date': '2025-06-12T00:00:00.000Z', - 'price': 0, - 'url': 'https://en.wikipedia.org/wiki/Crouch_End', + 'distance': 65.91, }, ];