From 78612f3be89625cf103cafc236edb89e17c3ec8c Mon Sep 17 00:00:00 2001
From: gregor <gregor.schulz@holi.social>
Date: Fri, 21 Mar 2025 16:26:44 +0100
Subject: [PATCH] refactor: clean architecture
---
.../geo/GeoApiClient.test.ts | 0
.../geo/GeoApiClient.ts | 8 +-
.../geo/GeoApiClient.types.ts | 0
.../geo/tests/fixtures.ts | 0
app/adapters/jasd/JasdGateway.ts | 89 ++++++++
.../jasd/tests/fixtures.ts | 75 ++++++-
.../jasd/types}/appapi.dto.types.ts | 12 +-
.../jasd/types}/openapi.dto.types.ts | 0
app/domain/HoliEvent.ts | 24 +++
app/fetch_event.ts | 73 -------
app/fetch_event_test.ts | 58 -----
app/fetch_events.ts | 153 --------------
app/fetch_events_test.ts | 118 -----------
app/server.ts | 102 +++++----
app/usecases/QueryEvent.test.ts | 59 ++++++
app/usecases/QueryEvent.ts | 66 ++++++
app/usecases/QueryEvents.test.ts | 200 ++++++++++++++++++
app/usecases/QueryEvents.ts | 77 +++++++
.../dependencies/FetchesJasdActivity.ts | 7 +
.../dependencies/FetchesJasdEvents.ts | 13 ++
app/usecases/dependencies/Logs.ts | 5 +
app/usecases/dependencies/ResolvesCity.ts | 3 +
.../dependencies/ResolvesCoordinates.ts | 5 +
23 files changed, 692 insertions(+), 455 deletions(-)
rename app/{providers => adapters}/geo/GeoApiClient.test.ts (100%)
rename app/{providers => adapters}/geo/GeoApiClient.ts (86%)
rename app/{providers => adapters}/geo/GeoApiClient.types.ts (100%)
rename app/{providers => adapters}/geo/tests/fixtures.ts (100%)
create mode 100644 app/adapters/jasd/JasdGateway.ts
rename app/{providers => adapters}/jasd/tests/fixtures.ts (87%)
rename app/{providers/jasd => adapters/jasd/types}/appapi.dto.types.ts (90%)
rename app/{providers/jasd => adapters/jasd/types}/openapi.dto.types.ts (100%)
create mode 100644 app/domain/HoliEvent.ts
delete mode 100644 app/fetch_event.ts
delete mode 100644 app/fetch_event_test.ts
delete mode 100644 app/fetch_events.ts
delete mode 100644 app/fetch_events_test.ts
create mode 100644 app/usecases/QueryEvent.test.ts
create mode 100644 app/usecases/QueryEvent.ts
create mode 100644 app/usecases/QueryEvents.test.ts
create mode 100644 app/usecases/QueryEvents.ts
create mode 100644 app/usecases/dependencies/FetchesJasdActivity.ts
create mode 100644 app/usecases/dependencies/FetchesJasdEvents.ts
create mode 100644 app/usecases/dependencies/Logs.ts
create mode 100644 app/usecases/dependencies/ResolvesCity.ts
create mode 100644 app/usecases/dependencies/ResolvesCoordinates.ts
diff --git a/app/providers/geo/GeoApiClient.test.ts b/app/adapters/geo/GeoApiClient.test.ts
similarity index 100%
rename from app/providers/geo/GeoApiClient.test.ts
rename to app/adapters/geo/GeoApiClient.test.ts
diff --git a/app/providers/geo/GeoApiClient.ts b/app/adapters/geo/GeoApiClient.ts
similarity index 86%
rename from app/providers/geo/GeoApiClient.ts
rename to app/adapters/geo/GeoApiClient.ts
index 8eadc1c..42153cd 100644
--- a/app/providers/geo/GeoApiClient.ts
+++ b/app/adapters/geo/GeoApiClient.ts
@@ -1,10 +1,8 @@
import { GeoAPIResponse, GeolocationCoordinates } from './GeoApiClient.types.ts'
+import { ResolvesCity } from '../../usecases/dependencies/ResolvesCity.ts'
+import { ResolvesCoordinates } from '../../usecases/dependencies/ResolvesCoordinates.ts'
-export interface ResolvesCoordinates {
- resolveCoordinates(geolocationId: string): Promise<GeolocationCoordinates>
-}
-
-export class GeoApiClient implements ResolvesCoordinates {
+export class GeoApiClient implements ResolvesCoordinates, ResolvesCity {
constructor(private readonly endpointUrl: string) {
}
diff --git a/app/providers/geo/GeoApiClient.types.ts b/app/adapters/geo/GeoApiClient.types.ts
similarity index 100%
rename from app/providers/geo/GeoApiClient.types.ts
rename to app/adapters/geo/GeoApiClient.types.ts
diff --git a/app/providers/geo/tests/fixtures.ts b/app/adapters/geo/tests/fixtures.ts
similarity index 100%
rename from app/providers/geo/tests/fixtures.ts
rename to app/adapters/geo/tests/fixtures.ts
diff --git a/app/adapters/jasd/JasdGateway.ts b/app/adapters/jasd/JasdGateway.ts
new file mode 100644
index 0000000..c3c5ac3
--- /dev/null
+++ b/app/adapters/jasd/JasdGateway.ts
@@ -0,0 +1,89 @@
+import { Activity, AppApiEvent, AppApiResponse } from './types/appapi.dto.types.ts'
+import { FetchesJasdEvents } from '../../usecases/dependencies/FetchesJasdEvents.ts'
+import { Logs } from '../../usecases/dependencies/Logs.ts'
+import { FetchesJasdActivity } from '../../usecases/dependencies/FetchesJasdActivity.ts'
+import { logger } from '../../logging.ts'
+import NotFound = Deno.errors.NotFound
+
+export class JasdGateway implements FetchesJasdEvents, FetchesJasdActivity {
+ private readonly APP_API_BASE_URL_V1 = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1'
+ private readonly APP_API_BASE_URL_V2 = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v2'
+ private readonly APP_FILES_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files'
+
+ constructor(private readonly logger: Logs) {
+ }
+
+ private buildQueryUrl(
+ limit: number,
+ offset: number,
+ localOnly: boolean,
+ location?: string,
+ ): URL {
+ const url = new URL(`${this.APP_API_BASE_URL_V2}/search`)
+ url.searchParams.append('page', offset.toString())
+ url.searchParams.append('size', limit.toString())
+ url.searchParams.append('sort', 'period.start,asc,ignorecase')
+ url.searchParams.append('includeExpiredActivities', 'false')
+ url.searchParams.append('permanent', 'false')
+
+ if (localOnly) {
+ url.searchParams.append('online', 'false')
+ }
+
+ if (location) {
+ url.searchParams.append('location', location)
+ }
+
+ return url
+ }
+
+ async fetchActivity(id: string): Promise<Activity> {
+ const url = new URL(`${this.APP_API_BASE_URL_V1}/activities/${id}`)
+
+ logger.debug(`Fetching event from ${url}`)
+ const response = await fetch(url)
+
+ try {
+ const json = await response.json() as Activity
+ if (!json) {
+ throw new NotFound('Not found')
+ }
+ return json
+
+ // deno-lint-ignore no-explicit-any
+ } catch (e: any) {
+ logger.error(
+ `Error fetching event ${url}: ${e.message}`,
+ )
+ throw e
+ }
+ }
+
+ async fetchEvents(
+ limit: number,
+ offset: number,
+ localOnly: boolean,
+ location?: string,
+ ): Promise<{ events: AppApiEvent[]; totalCount: number }> {
+ const url = this.buildQueryUrl(limit, offset, localOnly, location)
+ this.logger.debug(`Fetching events from ${url}`)
+
+ try {
+ const response = await fetch(url)
+ const data = await response.json() as AppApiResponse
+
+ const events = data.content
+ .flat()
+ .filter((event) => !event.activity.period.permanent)
+ .filter((event) => !!event)
+
+ return {
+ events,
+ totalCount: data.totalElements,
+ }
+ } catch (error) {
+ this.logger.error(`Error fetching events from ${url}`, error)
+ throw error
+ }
+ }
+}
diff --git a/app/providers/jasd/tests/fixtures.ts b/app/adapters/jasd/tests/fixtures.ts
similarity index 87%
rename from app/providers/jasd/tests/fixtures.ts
rename to app/adapters/jasd/tests/fixtures.ts
index 195dab3..d652a33 100644
--- a/app/providers/jasd/tests/fixtures.ts
+++ b/app/adapters/jasd/tests/fixtures.ts
@@ -1,5 +1,7 @@
// deno-lint-ignore-file no-explicit-any
-export const RealTimedEvent = {
+import { Activity } from '../types/appapi.dto.types.ts'
+
+export const LocalTimedEvent = {
'name': 'RealTimedEvent',
'description':
'<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
@@ -118,7 +120,7 @@ export const RealTimedEvent = {
},
}
-export const RealPermanentEvent = {
+export const LocalPermanentEvent = {
'name': 'RealPermanentEvent',
'description':
'<p>Kindergruppen (Kita und Grundschulklassen) erleben im Laufe eines Jahres die Natur. Die Kinder erfahren den Wechsel der Jahreszeiten, lernen Tiere und Pflanzen kennen und erleben die Natur mit allen Sinnen. Eine fest gebuchte naturpädagogische Fachkraft leitet von August bis Juni (Kita-/Schuljahr) eine Kindergruppe nach 8 ausgewählten Themen unseres Angebotes. Als Veranstaltungsort können Sie den Höltigbaum wählen, oder wir kommen in Ihre Einrichtung.</p><p>Das Projekt ist als „Hamburg lernt Nachhaltigkeit“-Maßnahme der Behörde für Umwelt, Klima, Energie und Agrarwirtschaft anerkannt. Wir führen das Projekt in ganz Hamburg durch.</p><p>Die Größe ist je Kitagruppe auf 12 Kinder beschränkt. Bitte sprechen Sie uns an!</p><p>Kosten: auf Nachfrage</p><p>Information und Anmeldung: <a target="_blank" rel="noopener noreferrer nofollow" href="mailto:umweltbildung@haus-der-wilden-weiden.de">umweltbildung@haus-der-wilden-weiden.de</a>, Tel. 040 / 18 04 48 60 13</p>',
@@ -419,6 +421,75 @@ export const OnlinePermanentEvent = {
},
}
+export const LocalTimedActivity: Activity = {
+ 'id': 1234,
+ 'createdBy': 'f5186f93-5a19-4643-b019-927232e45665',
+ 'lastModifiedBy': 'f5186f93-5a19-4643-b019-927232e45665',
+ 'createdAt': '2023-09-01T08:29:54.704843+02:00',
+ 'modifiedAt': '2023-09-01T08:29:54.704843+02:00',
+ 'name': 'Einstiegskurs Löten',
+ 'description':
+ '<p>Beim Reparieren elektrischer Geräte kommt früher oder später oft der Punkt, an dem gelötet werden muss. In diesem Workshop können Sie lernen und üben, richtig mit Lötkolben und Zinn umzugehen. Es ist kein Vorwissen nötig. Wenn die Grundlagen geklärt sind, können wir uns gemeinsam zu verschiedenen Anwendungsfeldern vortasten - je nachdem wofür Sie sich besonders interessiert. Dafür können Sie auch eigene Lötprojekte mitbringen (Beispiele: Kabel mit Wackelkontakt, z.B. von Kopfhörern oder Audiokabeln, kleine Geräte diverser Art wie Akku-Fahrradbeleuchtung, Lichterketten oder auch Stirnlampen/Taschenlampen).</p>',
+ 'sustainableDevelopmentGoals': [
+ 12,
+ 13,
+ ],
+ 'impactArea': 'LOCAL',
+ 'contact': {
+ 'lastName': 'Binternagel',
+ 'firstName': 'Manuel',
+ 'position': '',
+ 'email': 'manuel.binternagel@leipzig.de',
+ 'phone': '03411236000',
+ 'image': '99197284-a2e5-45fc-b8a2-8f21debb22a5.png',
+ },
+ 'location': {
+ 'address': {
+ 'name': 'Volkshochschule',
+ 'street': 'Löhrstr.',
+ 'streetNo': '3-7',
+ 'supplement': null,
+ 'zipCode': '04105',
+ 'city': 'Leipzig',
+ 'state': 'Sachsen',
+ 'country': 'DE',
+ },
+ 'online': false,
+ 'privateLocation': null,
+ 'url':
+ 'https://www.vhs-leipzig.de/p/normale-kurse/kunst-kultur-kreativitaet/kreatives-gestalten/metall-und-schmuckgestaltung/einstiegskurs-loeten-495-C-C2A1001K',
+ 'coordinate': {
+ 'type': 'Point',
+ 'coordinates': [
+ 51.3470085,
+ 12.3732656,
+ ],
+ },
+ },
+ 'thematicFocus': [
+ 'SUSTAINABLE_PROCUREMENT',
+ 'SUSTAINABLE_LIFESTYLE',
+ ],
+ 'activityType': 'EVENT',
+ 'externalId': null,
+ 'registerUrl': null,
+ 'approvedUntil': null,
+ 'period': {
+ 'permanent': false,
+ 'start': '2023-09-25T00:00:00+02:00',
+ 'end': '2023-09-25T00:00:00+02:00',
+ },
+ 'logo': '8bf39e2d-ef0e-465f-a81c-5bc7516eb90b.png',
+ 'image': 'activities/act6.jpg',
+ 'bannerImageMode': null,
+ 'organisation': {
+ 'id': 1517,
+ 'name': 'Volkshochschule Leipzig',
+ 'logo': '75240286-d282-4fa4-9dfe-5b822eec0dee.png',
+ 'image': '496d800f-15f4-4aac-bd36-33f85b85ea85.png',
+ },
+}
+
export const emptyPageResponse = {
'content': [],
'pageable': {
diff --git a/app/providers/jasd/appapi.dto.types.ts b/app/adapters/jasd/types/appapi.dto.types.ts
similarity index 90%
rename from app/providers/jasd/appapi.dto.types.ts
rename to app/adapters/jasd/types/appapi.dto.types.ts
index c70601a..12fffe7 100644
--- a/app/providers/jasd/appapi.dto.types.ts
+++ b/app/adapters/jasd/types/appapi.dto.types.ts
@@ -17,7 +17,7 @@ type Address = {
type Location = {
address: Address
online: boolean
- privateLocation: boolean
+ privateLocation: boolean | null
url: string
coordinate: Coordinate
}
@@ -77,6 +77,10 @@ type ImpactArea = 'LOCAL' | 'REGIONAL' | 'NATIONAL' | 'INTERNATIONAL' | string
export type Activity = {
id: number
+ createdBy?: string | null
+ lastModifiedBy?: string | null
+ createdAt?: string | null
+ modifiedAt?: string | null
name: string
description: string
sustainableDevelopmentGoals: number[]
@@ -86,13 +90,13 @@ export type Activity = {
thematicFocus: ThematicFocus[]
activityType: ActivityType
externalId: string | null
- registerUrl: string
+ registerUrl: string | null
approvedUntil: string | null
period: Period
logo: string | null
image: string | null
- socialMediaContacts: SocialMediaContact[]
- bannerImageMode: string
+ socialMediaContacts?: SocialMediaContact[]
+ bannerImageMode: string | null
organisation: Organisation
}
diff --git a/app/providers/jasd/openapi.dto.types.ts b/app/adapters/jasd/types/openapi.dto.types.ts
similarity index 100%
rename from app/providers/jasd/openapi.dto.types.ts
rename to app/adapters/jasd/types/openapi.dto.types.ts
diff --git a/app/domain/HoliEvent.ts b/app/domain/HoliEvent.ts
new file mode 100644
index 0000000..8e8153b
--- /dev/null
+++ b/app/domain/HoliEvent.ts
@@ -0,0 +1,24 @@
+export interface HoliEventLocation {
+ street?: string
+ streetNo?: string
+ zipCode?: string
+ city?: string
+}
+
+export interface HoliEventDetails {
+ description: string
+ externalLink?: string
+ meetingLink?: string
+}
+
+export interface HoliEvent {
+ id: string
+ title: string
+ organisationName: string
+ startDate: string | null
+ endDate: string | null
+ location: HoliEventLocation
+ isRemote: boolean
+ imageUrl: string
+ eventDetails: HoliEventDetails
+}
diff --git a/app/fetch_event.ts b/app/fetch_event.ts
deleted file mode 100644
index b4e55ca..0000000
--- a/app/fetch_event.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { HoliEvent } from './fetch_events.ts'
-import { logger } from './logging.ts'
-import { Activity } from './providers/jasd/appapi.dto.types.ts'
-import NotFound = Deno.errors.NotFound
-
-const APP_API_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1'
-const APP_FILES_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files'
-
-export type FetchEventInput = {
- id: string
-}
-
-export type HoliEventResponse = {
- data: HoliEvent
-}
-
-export const toHoliEvent = (activity: Activity): HoliEvent | null => {
- return {
- id: activity.id.toString(),
- title: activity.name,
- organisationName: activity.organisation.name,
- startDate: activity.period.start,
- endDate: activity.period.end,
- location: {
- city: activity.location.address.city,
- street: activity.location.address.street,
- streetNo: activity.location.address.streetNo,
- zipCode: activity.location.address.zipCode,
- },
- isRemote: activity.location.online,
- // todo gregor: imageproxy-fi the url
- imageUrl: APP_FILES_BASE_URL + '/' + activity.image,
- eventDetails: {
- description: activity.description,
- externalLink: activity.location.url,
- meetingLink: activity.registerUrl,
- },
- }
-}
-
-export const fetchEvent = async (input: FetchEventInput) => {
- const url = new URL(`${APP_API_BASE_URL}/activities/${input.id}`)
- const startDate = Date.now()
-
- logger.debug(`fetching event from ${url}`)
- const response = await fetch(url)
-
- if (!response.ok) {
- throw new NotFound('Not found')
- }
-
- try {
- const json = await response.json()
- const holiEvent = toHoliEvent(json)
-
- if (!holiEvent) {
- throw new NotFound('Not found')
- }
-
- return {
- data: holiEvent,
- }
- // deno-lint-ignore no-explicit-any
- } catch (e: any) {
- logger.error(
- `Error performing request to ${url}: ${e.message}`,
- )
- throw e
- } finally {
- const duration = Date.now() - startDate
- logger.info(`fetching event took ${duration} ms`)
- }
-}
diff --git a/app/fetch_event_test.ts b/app/fetch_event_test.ts
deleted file mode 100644
index 1f0b17d..0000000
--- a/app/fetch_event_test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { RealTimedEvent } from './providers/jasd/tests/fixtures.ts'
-import { fetchEvent } from './fetch_event.ts'
-import { returnsNext, stub } from '@std/testing/mock'
-import { describe, it } from '@std/testing/bdd'
-import { assertEquals, assertRejects } from '@std/assert'
-import NotFound = Deno.errors.NotFound
-
-describe('fetchEvent', () => {
- it('throws when no event can be fetched', () => {
- const fakeFetch = stub(
- globalThis,
- 'fetch',
- returnsNext([Promise.resolve(new Response(null, { status: 404, statusText: 'Not Found' }))]),
- )
-
- assertRejects(() => fetchEvent({ id: 'iDoesNotExist' }), NotFound)
-
- fakeFetch.restore()
- })
-
- it('works for a jasd api response', async () => {
- const fakeFetch = stub(
- globalThis,
- 'fetch',
- returnsNext([Promise.resolve(new Response(JSON.stringify(RealTimedEvent.activity)))]),
- )
-
- const expectedEvent = {
- data: {
- id: '4610',
- endDate: '2025-03-26T00:00:00+01:00',
- eventDetails: {
- description:
- '<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
- externalLink: 'https://www.allerweltskino.de',
- meetingLink: 'https://www.allerweltskino.de',
- },
- imageUrl: 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files/activities/act5.jpg',
- isRemote: false,
- location: {
- city: 'Köln',
- street: 'Bahnhofstr.',
- streetNo: '41',
- zipCode: '50674',
- },
- organisationName: 'Allerweltskino e.V.',
- startDate: '2025-03-26T00:00:00+01:00',
- title: 'RealTimedEvent',
- },
- }
-
- const result = await fetchEvent({ id: '4160' })
-
- assertEquals(result, expectedEvent)
-
- fakeFetch.restore()
- })
-})
diff --git a/app/fetch_events.ts b/app/fetch_events.ts
deleted file mode 100644
index 0a657b2..0000000
--- a/app/fetch_events.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { logger } from './logging.ts'
-import { AppApiEvent, AppApiResponse } from './providers/jasd/appapi.dto.types.ts'
-
-//const OPEN_API_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/openapi/v1'
-const APP_API_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v2'
-const APP_FILES_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files'
-
-export type HoliEventLocation = {
- street?: string
- streetNo?: string
- zipCode?: string
- city?: string
-}
-
-export type HoliEventDetails = {
- description: string
- externalLink?: string
- meetingLink?: string
-}
-
-export type HoliEvent = {
- id: string
- title: string
- organisationName: string
- startDate: string | null
- endDate: string | null
- location: HoliEventLocation
- isRemote: boolean
- imageUrl: string
- eventDetails: HoliEventDetails
-}
-
-export type HoliEventsResponse = {
- totalResults: number
- data: HoliEvent[]
-}
-
-const toHoliEvent = (event: AppApiEvent): HoliEvent => {
- return {
- id: event.activity.id.toString(),
- title: event.name,
- organisationName: event.activity.organisation.name,
- startDate: event.activity.period.start,
- endDate: event.activity.period.end,
- location: {
- city: event.location.address.city,
- street: event.location.address.street,
- streetNo: event.location.address.streetNo,
- zipCode: event.location.address.zipCode,
- },
- isRemote: event.activity.location.online,
- // todo gregor: imageproxy-fi the url
- imageUrl: APP_FILES_BASE_URL + '/' + event.activity.image,
- eventDetails: {
- description: event.description,
- externalLink: event.activity.location.url,
- meetingLink: event.activity.registerUrl,
- },
- }
-}
-
-const buildJasdAppApiQueryUrl = (
- limit: number,
- offset: number,
- localOnly: boolean,
- location?: string,
-): URL => {
- const url = new URL(`${APP_API_BASE_URL}/search`)
- url.searchParams.append('page', offset.toString())
- url.searchParams.append('size', limit.toString())
- url.searchParams.append('sort', 'period.start,asc,ignorecase')
- // filtering outdated and permanent events here helps us a lot
- // and provides only OnlineTimedEvent and RealTimedEvent which have start and end dates
- url.searchParams.append('includeExpiredActivities', 'false')
- url.searchParams.append('permanent', 'false')
-
- if (localOnly) {
- url.searchParams.append('online', 'false')
- // true is returning only online events
- // undefined is returning all
- }
-
- if (location) {
- url.searchParams.append('location', location)
- }
-
- return url
-}
-
-type EventsPage = {
- events: HoliEvent[]
- onLastPage: boolean
- totalResults: number
-}
-
-const fetchEventsPage = async (
- url: URL,
-): Promise<EventsPage> => {
- const startDate = Date.now()
-
- logger.debug(`fetching events from ${url}`)
- try {
- const response = await fetch(url, {
- // gregor: we don't need to send the api key to the App api
- // only the OpenApi endpoints require auth
- // headers: { 'x-api-key': Deno.env.get('JASD_DEVELOPER_API_KEY')! },
- })
- const json = await response.json() as AppApiResponse
-
- const holiEvents = json.content
- .flat()
- .filter((event) => !event.activity.period.permanent)
- .map(toHoliEvent)
- .filter((holiEvent) => !!holiEvent)
-
- return {
- events: holiEvents,
- onLastPage: json.last,
- totalResults: json.totalElements,
- }
- // deno-lint-ignore no-explicit-any
- } catch (e: any) {
- logger.error(
- `Error performing request to ${url}: ${e.message}`,
- )
- throw e
- } finally {
- const duration = Date.now() - startDate
- logger.info(`fetching projects took ${duration} ms`)
- }
-}
-
-export type FetchEventsInput = {
- limit: number
- offset: number
- localOnly: boolean
- geolocationId?: string
-}
-
-export const fetchEvents = async (
- input: FetchEventsInput,
-): Promise<HoliEventsResponse> => {
- //todo gregor: connect to geo api gateway
- const city = undefined
-
- const url = buildJasdAppApiQueryUrl(input.limit, input.offset, input.localOnly, city)
- const fetchResult = await fetchEventsPage(url)
-
- return {
- totalResults: fetchResult.totalResults,
- data: fetchResult.events,
- }
-}
diff --git a/app/fetch_events_test.ts b/app/fetch_events_test.ts
deleted file mode 100644
index ad7caf0..0000000
--- a/app/fetch_events_test.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { assertEquals } from '@std/assert'
-import { describe, it } from '@std/testing/bdd'
-import { returnsNext, stub } from '@std/testing/mock'
-import { fetchEvents } from './fetch_events.ts'
-import { aPageResponse, emptyPageResponse, OnlineTimedEvent, RealTimedEvent } from './providers/jasd/tests/fixtures.ts'
-
-export type ResponsePayload = Record<string, unknown> | Error
-
-export const fakeFetch = (response: ResponsePayload) => {
- return stub(
- globalThis,
- 'fetch',
- returnsNext([Promise.resolve(new Response(JSON.stringify(response)))]),
- )
-}
-
-describe('fetchEvents', () => {
- it('can make sense of an empty response', async () => {
- using _ = fakeFetch(emptyPageResponse)
-
- const result = await fetchEvents({ offset: 0, limit: 1, localOnly: false })
-
- assertEquals(result, {
- data: [],
- totalResults: 0,
- })
- })
-
- it('can fetch an event', async () => {
- using _ = fakeFetch(aPageResponse([RealTimedEvent], true, true))
-
- const result = await fetchEvents({ offset: 0, limit: 1, localOnly: false })
-
- assertEquals(result, {
- data: [
- {
- id: '4610',
- title: 'RealTimedEvent',
- organisationName: 'Allerweltskino e.V.',
- startDate: '2025-03-26T00:00:00+01:00',
- endDate: '2025-03-26T00:00:00+01:00',
- location: {
- city: 'Köln',
- street: 'Bahnhofstr.',
- streetNo: '41',
- zipCode: '50674',
- },
- isRemote: false,
- imageUrl: 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files/activities/act5.jpg',
- eventDetails: {
- description:
- '<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
- externalLink: 'https://www.allerweltskino.de',
- meetingLink: 'https://www.allerweltskino.de',
- },
- },
- ],
- totalResults: 1,
- })
- })
-
- it('satisfies the requested limit of 2', async () => {
- //be aware the current implementation filters permanent events, so this is more of a hypothetical scenario
- const firstPageResponse = Promise.resolve(
- new Response(JSON.stringify(aPageResponse(
- [[
- OnlineTimedEvent,
- OnlineTimedEvent,
- OnlineTimedEvent,
- ]],
- true,
- true,
- 3,
- ))),
- )
-
- using fetchFake = stub(
- globalThis,
- 'fetch',
- returnsNext([firstPageResponse]),
- )
-
- const result = await fetchEvents({ offset: 0, limit: 2, localOnly: false })
-
- assertEquals(result.data[0].title, 'OnlineTimedEvent', 'its the OnlineTimedEvent')
- assertEquals(result.data[2].title, 'OnlineTimedEvent', 'its the OnlineTimedEvent')
- assertEquals(fetchFake.calls.length, 1, 'only fetches one page')
- })
-
- it('returns the totalResults of all potentially fetchable events', async () => {
- const eventsFirstPage = [
- RealTimedEvent,
- ]
- const eventsSecondPage = [
- RealTimedEvent,
- ]
- const totalElements = 2
-
- const firstPageResponse = Promise.resolve(
- new Response(
- JSON.stringify(aPageResponse([eventsFirstPage], true, false, totalElements)),
- ),
- )
- const secondPageResponse = Promise.resolve(
- new Response(JSON.stringify(aPageResponse([eventsSecondPage], false, false, totalElements))),
- )
-
- using _ = stub(
- globalThis,
- 'fetch',
- returnsNext([firstPageResponse, secondPageResponse]),
- )
-
- const result = await fetchEvents({ offset: 0, limit: 1, localOnly: false })
-
- assertEquals(result.totalResults, 2)
- })
-})
diff --git a/app/server.ts b/app/server.ts
index 52a8fe8..1df75f8 100644
--- a/app/server.ts
+++ b/app/server.ts
@@ -1,8 +1,9 @@
import { logger } from './logging.ts'
-import { fetchEvents, FetchEventsInput, HoliEventsResponse } from './fetch_events.ts'
-import { fetchEvent, FetchEventInput, HoliEventResponse } from './fetch_event.ts'
-import { GeoApiClient } from './providers/geo/GeoApiClient.ts'
+import { GeoApiClient } from './adapters/geo/GeoApiClient.ts'
import { createSchema, createYoga } from './deps.ts'
+import { QueryEvents, QueryEventsInput, QueryEventsOutput } from './usecases/QueryEvents.ts'
+import { JasdGateway } from './adapters/jasd/JasdGateway.ts'
+import { QueryEvent, QueryEventInput, QueryEventOutput } from './usecases/QueryEvent.ts'
const SCHEMA = `
type Location {
@@ -57,7 +58,7 @@ export type EventRequest = {
id: string
}
-const validateEventsRequestInput = (request: EventsRequest): FetchEventsInput => {
+const validateQueryEventsInput = (request: EventsRequest): QueryEventsInput => {
logger.debug('validating request: ' + JSON.stringify(request))
let limit = request.limit ?? 5
@@ -73,76 +74,71 @@ const validateEventsRequestInput = (request: EventsRequest): FetchEventsInput =>
}
}
-const validateEventRequestInput = (request: EventRequest): FetchEventInput => {
+const validateQueryEventInput = (request: EventRequest): QueryEventInput => {
logger.debug('validating request: ' + JSON.stringify(request))
return {
id: request.id,
}
}
-const createResolvers = (config: ServerConfig) => ({
+const createResolvers = (config: ServerConfig, useCases: UseCases) => ({
Query: {
- events: (
+ event: (
// deno-lint-ignore no-explicit-any
_parent: any,
- parameters: EventsRequest,
+ parameters: EventRequest,
// next line is required for the resolver to work
// deno-lint-ignore no-unused-vars
context: GraphQLContext,
- ): Promise<HoliEventsResponse> => {
+ ): Promise<QueryEventOutput> => {
if (config.fake) {
- return Promise.resolve({ totalResults: 0, data: [] })
+ return Promise.resolve({ data: {} })
} else {
- return fetchEvents(
- validateEventsRequestInput(parameters),
- )
+ const input = useCases.QueryEvent.validateInput(parameters)
+ return useCases.QueryEvent.useCase.execute(input)
}
},
- event: (
+ events: (
// deno-lint-ignore no-explicit-any
_parent: any,
- parameters: EventRequest,
+ parameters: EventsRequest,
// next line is required for the resolver to work
// deno-lint-ignore no-unused-vars
context: GraphQLContext,
- ): Promise<HoliEventResponse> => {
+ ): Promise<QueryEventsOutput> => {
if (config.fake) {
- return Promise.resolve({ data: {} })
+ return Promise.resolve({ totalResults: 0, data: [] })
} else {
- return fetchEvent(
- validateEventRequestInput(parameters),
- )
+ const input = useCases.QueryEvents.validateInput(parameters)
+ return useCases.QueryEvents.useCase.execute(input)
}
},
},
})
-export const DEFAULT_PORT = 8006
-
-export type ServerConfig = {
- port: number
- fake: boolean // For local development. If set, the API returns dummy data
- imageProxyBaseUrl: string
- geoAPIEndpointUrl: string
-}
+type UseCaseNames = 'QueryEvents' | 'QueryEvent'
+type UseCases = Record<UseCaseNames, { useCase: UseCase; validateInput: ValidateInputFn }>
+// deno-lint-ignore no-explicit-any
+type UseCase = { execute: (input: any) => any }
+// deno-lint-ignore no-explicit-any
+type ValidateInputFn = (params: any) => any
-const isAlive = () => new Response(`${true}`)
+export const startServer = (config: ServerConfig): Deno.HttpServer<Deno.NetAddr> => {
+ const geoApi = new GeoApiClient(config.geoAPIEndpointUrl)
+ const jasdEventsGateway = new JasdGateway(logger)
-type GraphQLContext = {
- request?: { headers: Headers }
- params?: {
- extensions?: {
- headers?: {
- [key: string]: string
- }
- }
+ const useCases = {
+ QueryEvent: {
+ validateInput: validateQueryEventInput,
+ useCase: new QueryEvent(jasdEventsGateway, logger),
+ },
+ QueryEvents: {
+ validateInput: validateQueryEventsInput,
+ useCase: new QueryEvents(jasdEventsGateway, geoApi, logger),
+ },
}
-}
-
-export const startServer = (config: ServerConfig): Deno.HttpServer<Deno.NetAddr> => {
- const _ = new GeoApiClient(config.geoAPIEndpointUrl)
- const resolvers = createResolvers(config)
+ const resolvers = createResolvers(config, useCases)
const gqlServer = createYoga({
schema: createSchema({ resolvers, typeDefs: SCHEMA }),
@@ -169,3 +165,25 @@ export const startServer = (config: ServerConfig): Deno.HttpServer<Deno.NetAddr>
},
})
}
+
+export const DEFAULT_PORT = 8006
+
+export type ServerConfig = {
+ port: number
+ fake: boolean // For local development. If set, the API returns dummy data
+ imageProxyBaseUrl: string
+ geoAPIEndpointUrl: string
+}
+
+const isAlive = () => new Response(`${true}`)
+
+type GraphQLContext = {
+ request?: { headers: Headers }
+ params?: {
+ extensions?: {
+ headers?: {
+ [key: string]: string
+ }
+ }
+ }
+}
diff --git a/app/usecases/QueryEvent.test.ts b/app/usecases/QueryEvent.test.ts
new file mode 100644
index 0000000..3e059c7
--- /dev/null
+++ b/app/usecases/QueryEvent.test.ts
@@ -0,0 +1,59 @@
+import { describe, it } from '@std/testing/bdd'
+import { assertEquals, assertRejects } from '@std/assert'
+import NotFound = Deno.errors.NotFound
+import { QueryEvent } from './QueryEvent.ts'
+import { LocalTimedActivity } from '../adapters/jasd/tests/fixtures.ts'
+import { Activity } from '../adapters/jasd/types/appapi.dto.types.ts'
+
+describe('QueryEvent', () => {
+ it('throws when no event can be fetched', () => {
+ const jasdGatewayMock = {
+ fetchActivity() {
+ return Promise.reject(new Deno.errors.NotFound())
+ },
+ }
+
+ const sut = new QueryEvent(jasdGatewayMock, console)
+
+ assertRejects(() => sut.execute({ id: 'iDoesNotExist' }), NotFound)
+ })
+
+ it('works for a jasd api response', async () => {
+ const jasdGatewayMock = {
+ fetchActivity(): Promise<Activity> {
+ return Promise.resolve(LocalTimedActivity)
+ },
+ }
+
+ const expectedEvent = {
+ data: {
+ endDate: '2023-09-25T00:00:00+02:00',
+ eventDetails: {
+ description:
+ '<p>Beim Reparieren elektrischer Geräte kommt früher oder später oft der Punkt, an dem gelötet werden muss. In diesem Workshop können Sie lernen und üben, richtig mit Lötkolben und Zinn umzugehen. Es ist kein Vorwissen nötig. Wenn die Grundlagen geklärt sind, können wir uns gemeinsam zu verschiedenen Anwendungsfeldern vortasten - je nachdem wofür Sie sich besonders interessiert. Dafür können Sie auch eigene Lötprojekte mitbringen (Beispiele: Kabel mit Wackelkontakt, z.B. von Kopfhörern oder Audiokabeln, kleine Geräte diverser Art wie Akku-Fahrradbeleuchtung, Lichterketten oder auch Stirnlampen/Taschenlampen).</p>',
+ externalLink:
+ 'https://www.vhs-leipzig.de/p/normale-kurse/kunst-kultur-kreativitaet/kreatives-gestalten/metall-und-schmuckgestaltung/einstiegskurs-loeten-495-C-C2A1001K',
+ meetingLink: undefined,
+ },
+ id: '1234',
+ imageUrl: 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files/activities/act6.jpg',
+ isRemote: false,
+ location: {
+ city: 'Leipzig',
+ street: 'Löhrstr.',
+ streetNo: '3-7',
+ zipCode: '04105',
+ },
+ organisationName: 'Volkshochschule Leipzig',
+ startDate: '2023-09-25T00:00:00+02:00',
+ title: 'Einstiegskurs Löten',
+ },
+ }
+
+ const sut = new QueryEvent(jasdGatewayMock, console)
+
+ const result = await sut.execute({ id: '4160' })
+
+ assertEquals(result, expectedEvent)
+ })
+})
diff --git a/app/usecases/QueryEvent.ts b/app/usecases/QueryEvent.ts
new file mode 100644
index 0000000..c9db2bc
--- /dev/null
+++ b/app/usecases/QueryEvent.ts
@@ -0,0 +1,66 @@
+import { HoliEvent } from '../domain/HoliEvent.ts'
+import { Logs } from './dependencies/Logs.ts'
+import { Activity } from '../adapters/jasd/types/appapi.dto.types.ts'
+import { FetchesJasdActivity } from './dependencies/FetchesJasdActivity.ts'
+
+export interface QueryEventInput {
+ id: string
+}
+
+export interface QueryEventOutput {
+ data: HoliEvent
+}
+
+const APP_FILES_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files'
+
+export class QueryEvent {
+ constructor(
+ private readonly jasdEventGateway: FetchesJasdActivity,
+ private readonly logger: Logs,
+ ) {}
+
+ async execute(input: QueryEventInput): Promise<QueryEventOutput> {
+ this.logger.debug(`Executing QueryEvent use case with input: ${JSON.stringify(input)}`)
+ const startTime = Date.now()
+
+ //https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v2/activities/1234
+ //https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/activities/1234
+ try {
+ const jasdActivity = await this.jasdEventGateway.fetchActivity(
+ input.id,
+ )
+
+ const holiEvent = this.toDomainEvent(jasdActivity)
+ return { data: holiEvent }
+ } catch (error) {
+ this.logger.error('Error executing QueryEvent use case', error)
+ throw error
+ } finally {
+ const duration = Date.now() - startTime
+ this.logger.info(`QueryEvent use case executed in ${duration}ms`)
+ }
+ }
+
+ private toDomainEvent(activity: Activity): HoliEvent {
+ return {
+ id: activity.id.toString(),
+ title: activity.name,
+ organisationName: activity.organisation.name,
+ startDate: activity.period.start,
+ endDate: activity.period.end,
+ location: {
+ city: activity.location.address.city,
+ street: activity.location.address.street,
+ streetNo: activity.location.address.streetNo,
+ zipCode: activity.location.address.zipCode,
+ },
+ isRemote: activity.location.online,
+ imageUrl: `${APP_FILES_BASE_URL}/${activity.image}`,
+ eventDetails: {
+ description: activity.description,
+ externalLink: activity.location.url,
+ meetingLink: activity.registerUrl ?? undefined,
+ },
+ }
+ }
+}
diff --git a/app/usecases/QueryEvents.test.ts b/app/usecases/QueryEvents.test.ts
new file mode 100644
index 0000000..cf26aee
--- /dev/null
+++ b/app/usecases/QueryEvents.test.ts
@@ -0,0 +1,200 @@
+import { assertEquals } from '@std/assert'
+import { describe, it } from '@std/testing/bdd'
+import { returnsNext, stub } from '@std/testing/mock'
+
+import { QueryEvents } from './QueryEvents.ts'
+import { AppApiEvent } from '../adapters/jasd/types/appapi.dto.types.ts'
+
+export type ResponsePayload = Record<string, unknown> | Error
+
+export const fakeFetch = (response: ResponsePayload) => {
+ return stub(
+ globalThis,
+ 'fetch',
+ returnsNext([Promise.resolve(new Response(JSON.stringify(response)))]),
+ )
+}
+
+describe('QueryEvents', () => {
+ const geoApiAMock = {
+ resolveCityName() {
+ return Promise.resolve('Hamburg')
+ },
+ }
+
+ it('can make sense of an empty response', async () => {
+ const jasdGatewayMock = {
+ fetchEvents() {
+ return Promise.resolve({ events: [], totalCount: 0 })
+ },
+ }
+
+ const sut = new QueryEvents(jasdGatewayMock, geoApiAMock, console)
+
+ const result = await sut.execute({ offset: 0, limit: 1, localOnly: false })
+
+ assertEquals(result, {
+ data: [],
+ totalResults: 0,
+ })
+ })
+
+ it('can return a jsad event', async () => {
+ const jasdGatewayMock = {
+ fetchEvents(): Promise<{ events: AppApiEvent[]; totalCount: number }> {
+ return Promise.resolve({
+ events: [{
+ 'name': 'RealTimedEvent',
+ 'description':
+ '<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
+ 'resultType': 'ACTIVITY',
+ 'activity': {
+ 'id': 4610,
+ 'name': 'RealTimedEvent',
+ 'description':
+ '<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
+ 'sustainableDevelopmentGoals': [
+ 4,
+ 17,
+ ],
+ 'impactArea': 'LOCAL',
+ 'contact': {
+ 'lastName': 'Flock',
+ 'firstName': 'Dardin',
+ 'position': '',
+ 'email': 'somedude@ontheinternets.de',
+ 'phone': '',
+ 'image': null,
+ },
+ 'location': {
+ 'address': {
+ 'name': 'Off Broadway Filmtheater',
+ 'street': 'Bahnhofstr.',
+ 'streetNo': '41',
+ 'supplement': 'Hinterhof',
+ 'zipCode': '50674',
+ 'city': 'Köln',
+ 'state': 'Nordrhein-Westfalen',
+ 'country': null,
+ },
+ 'online': false,
+ 'privateLocation': false,
+ 'url': 'https://www.allerweltskino.de',
+ 'coordinate': {
+ 'type': 'Point',
+ 'coordinates': [
+ 50.9296771,
+ 6.93787246,
+ ],
+ },
+ },
+ 'thematicFocus': [
+ 'SUSTAINABLE_BUILDING',
+ 'INTERNATIONAL_RESPONSIBILITY',
+ 'GENDER_EQUITY',
+ 'URBAN_DEVELOPMENT',
+ 'SUSTAINABLE_BUSINESS',
+ 'SUSTAINABLE_FINANCE',
+ 'CULTURAL_SOCIAL_CHANGE',
+ 'AGRICULTURE',
+ 'BIODIVERSITY',
+ 'SUSTAINABLE_LIFESTYLE',
+ 'MOBILITY',
+ 'HUMAN_RIGHTS',
+ 'TOURISM',
+ 'SOCIAL_JUSTICE',
+ 'PARTICIPATION',
+ 'PEACE',
+ 'SUSTAINABLE_GOVERNANCE',
+ 'CIRCULAR_ECONOMY',
+ 'CLIMATE_PROTECTION',
+ ],
+ 'activityType': 'EVENT',
+ 'externalId': null,
+ 'registerUrl': 'https://www.allerweltskino.de',
+ 'approvedUntil': null,
+ 'period': {
+ 'permanent': false,
+ 'start': '2025-03-26T00:00:00+01:00',
+ 'end': '2025-03-26T00:00:00+01:00',
+ },
+ 'logo': '1f32e2bd-0557-408b-a4aa-90f264e8034e.png',
+ 'image': 'activities/act5.jpg',
+ 'socialMediaContacts': [
+ {
+ 'type': 'INSTAGRAM',
+ 'contact': 'https://www.instagram.com/allerweltskino',
+ },
+ {
+ 'type': 'FACEBOOK',
+ 'contact': 'https://www.facebook.com/pages/Allerweltskino/',
+ },
+ ],
+ 'bannerImageMode': 'cover',
+ 'organisation': {
+ 'id': 1809,
+ 'name': 'Allerweltskino e.V.',
+ 'logo': null,
+ 'image': 'a41d2e24-6aee-4462-88e4-96bfb2c5e56e.png',
+ },
+ },
+ 'location': {
+ 'address': {
+ 'name': 'Off Broadway Filmtheater',
+ 'street': 'Bahnhofstr.',
+ 'streetNo': '41',
+ 'supplement': 'Hinterhof',
+ 'zipCode': '50674',
+ 'city': 'Köln',
+ 'state': 'Nordrhein-Westfalen',
+ 'country': null,
+ },
+ 'online': false,
+ 'privateLocation': false,
+ 'url': 'https://www.allerweltskino.de',
+ 'coordinate': {
+ 'type': 'Point',
+ 'coordinates': [
+ 50.9296771,
+ 6.93787246,
+ ],
+ },
+ },
+ }],
+ totalCount: 1,
+ })
+ },
+ }
+
+ const sut = new QueryEvents(jasdGatewayMock, geoApiAMock, console)
+
+ const result = await sut.execute({ offset: 0, limit: 1, localOnly: false })
+
+ assertEquals(result, {
+ data: [
+ {
+ id: '4610',
+ title: 'RealTimedEvent',
+ organisationName: 'Allerweltskino e.V.',
+ startDate: '2025-03-26T00:00:00+01:00',
+ endDate: '2025-03-26T00:00:00+01:00',
+ location: {
+ city: 'Köln',
+ street: 'Bahnhofstr.',
+ streetNo: '41',
+ zipCode: '50674',
+ },
+ isRemote: false,
+ imageUrl: 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files/activities/act5.jpg',
+ eventDetails: {
+ description:
+ '<p>Jeden Dienstag (bis auf eine Sommer- und Winterpause) zeigt der Verein Allerweltskino e.V. im Kölner Filmtheater Off Broadway einen Nachhaltigkeitsfilm. Das Programm ist im Internet abrufbar (siehe Kasten rechts).</p>',
+ externalLink: 'https://www.allerweltskino.de',
+ meetingLink: 'https://www.allerweltskino.de',
+ },
+ },
+ ],
+ totalResults: 1,
+ })
+ })
+})
diff --git a/app/usecases/QueryEvents.ts b/app/usecases/QueryEvents.ts
new file mode 100644
index 0000000..c4bd220
--- /dev/null
+++ b/app/usecases/QueryEvents.ts
@@ -0,0 +1,77 @@
+import { FetchesJasdEvents } from './dependencies/FetchesJasdEvents.ts'
+import { ResolvesCity } from './dependencies/ResolvesCity.ts'
+import { HoliEvent } from '../domain/HoliEvent.ts'
+import { Logs } from './dependencies/Logs.ts'
+import { AppApiEvent } from '../adapters/jasd/types/appapi.dto.types.ts'
+
+export interface QueryEventsInput {
+ limit: number
+ offset: number
+ localOnly: boolean
+ geolocationId?: string
+}
+
+export interface QueryEventsOutput {
+ data: HoliEvent[]
+ totalResults: number
+}
+
+const APP_FILES_BASE_URL = 'https://gemeinschaftswerk-nachhaltigkeit.de/app/api/v1/files'
+
+export class QueryEvents {
+ constructor(
+ private readonly jasdEventGateway: FetchesJasdEvents,
+ private readonly geoApi: ResolvesCity,
+ private readonly logger: Logs,
+ ) {}
+
+ async execute(input: QueryEventsInput): Promise<QueryEventsOutput> {
+ this.logger.debug(`Executing QueryEvents use case with input: ${JSON.stringify(input)}`)
+ const startTime = Date.now()
+
+ try {
+ const location = input.geolocationId ? await this.geoApi.resolveCityName(input.geolocationId) : undefined
+
+ const jasdEvents = await this.jasdEventGateway.fetchEvents(
+ input.limit,
+ input.offset,
+ input.localOnly,
+ location,
+ )
+ const holiEvents = jasdEvents.events.map(this.toDomainEvent)
+ return {
+ data: holiEvents,
+ totalResults: jasdEvents.totalCount,
+ }
+ } catch (error) {
+ this.logger.error('Error executing QueryEvents use case', error)
+ throw error
+ } finally {
+ const duration = Date.now() - startTime
+ this.logger.info(`QueryEvents use case executed in ${duration}ms`)
+ }
+ }
+
+ private toDomainEvent(event: AppApiEvent): HoliEvent {
+ return {
+ id: event.activity.id.toString(),
+ title: event.name,
+ organisationName: event.activity.organisation.name,
+ startDate: event.activity.period.start,
+ endDate: event.activity.period.end,
+ location: {
+ city: event.location.address.city,
+ street: event.location.address.street,
+ streetNo: event.location.address.streetNo,
+ zipCode: event.location.address.zipCode,
+ },
+ isRemote: event.activity.location.online,
+ imageUrl: `${APP_FILES_BASE_URL}/${event.activity.image}`,
+ eventDetails: {
+ description: event.description,
+ externalLink: event.activity.location.url,
+ meetingLink: event.activity.registerUrl ?? undefined,
+ },
+ }
+ }
+}
diff --git a/app/usecases/dependencies/FetchesJasdActivity.ts b/app/usecases/dependencies/FetchesJasdActivity.ts
new file mode 100644
index 0000000..76f9626
--- /dev/null
+++ b/app/usecases/dependencies/FetchesJasdActivity.ts
@@ -0,0 +1,7 @@
+import { Activity } from '../../adapters/jasd/types/appapi.dto.types.ts'
+
+export interface FetchesJasdActivity {
+ fetchActivity(
+ id: string,
+ ): Promise<Activity>
+}
diff --git a/app/usecases/dependencies/FetchesJasdEvents.ts b/app/usecases/dependencies/FetchesJasdEvents.ts
new file mode 100644
index 0000000..d06164e
--- /dev/null
+++ b/app/usecases/dependencies/FetchesJasdEvents.ts
@@ -0,0 +1,13 @@
+import { AppApiEvent } from '../../adapters/jasd/types/appapi.dto.types.ts'
+
+export interface FetchesJasdEvents {
+ fetchEvents(
+ limit: number,
+ offset: number,
+ localOnly: boolean,
+ location?: string,
+ ): Promise<{
+ events: AppApiEvent[]
+ totalCount: number
+ }>
+}
diff --git a/app/usecases/dependencies/Logs.ts b/app/usecases/dependencies/Logs.ts
new file mode 100644
index 0000000..4ce1abc
--- /dev/null
+++ b/app/usecases/dependencies/Logs.ts
@@ -0,0 +1,5 @@
+export interface Logs {
+ debug(message: string): void
+ info(message: string): void
+ error(message: string, error?: unknown): void
+}
diff --git a/app/usecases/dependencies/ResolvesCity.ts b/app/usecases/dependencies/ResolvesCity.ts
new file mode 100644
index 0000000..fa38fd1
--- /dev/null
+++ b/app/usecases/dependencies/ResolvesCity.ts
@@ -0,0 +1,3 @@
+export interface ResolvesCity {
+ resolveCityName(geolocationId?: string): Promise<string | undefined>
+}
diff --git a/app/usecases/dependencies/ResolvesCoordinates.ts b/app/usecases/dependencies/ResolvesCoordinates.ts
new file mode 100644
index 0000000..4441d91
--- /dev/null
+++ b/app/usecases/dependencies/ResolvesCoordinates.ts
@@ -0,0 +1,5 @@
+import { GeolocationCoordinates } from '../../adapters/geo/GeoApiClient.types.ts'
+
+export interface ResolvesCoordinates {
+ resolveCoordinates(geolocationId: string): Promise<GeolocationCoordinates>
+}
--
GitLab