feat: improve search experience

ci: publish release

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -24,6 +24,7 @@ report-junit.xml
 # NixOS flake
 result
 hsperfdata_root
+.direnv/
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

.prettierignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

.syncpackrc.cjs

@@ -2,7 +2,13 @@
 
 /** @type {import('syncpack').RcFile} */
 const config = {
-  semverRange: '',
+  semverGroups: [
+    {
+      range: '',
+      dependencies: ['**'],
+      packages: ['**'],
+    }
+  ],
   source: ['package.json', '**/package.json'],
   indent: '  ',
   sortFirst: [
@@ -49,7 +55,7 @@ const config = {
     {
       label: 'Packages should use workspace version',
       dependencies: ['@openstapps/**'],
-      dependencyTypes: ['prod', 'dev'],
+      dependencyTypes: ['prod', 'dev', 'peer'],
       packages: ['**'],
       pinVersion: 'workspace:*',
     },

.tool-versions

@@ -0,0 +1,3 @@
+nodejs 18.19.1
+pnpm 8.15.4
+python 3.11.5

backend/backend/CHANGELOG.md

@@ -1,5 +1,61 @@
 # @openstapps/backend
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+
+## 3.3.1
+
+### Patch Changes
+
+- 67ab1fd6: fix for geo.point mapping
+
+## 3.3.0
+
+### Minor Changes
+
+- 688bc5f2: v3.3.0 changes
+
+### Patch Changes
+
+- Updated dependencies [688bc5f2]
+  - @openstapps/core@3.3.0
+  - @openstapps/core-tools@3.3.0
+  - @openstapps/logger@3.0.0
+
+## 3.2.0
+
+### Minor Changes
+
+- 912ae422: Add the ability to filter by existence of a field
+
+### Patch Changes
+
+- 689ac68b: pin alpine version to 3.18 and add healthchecks
+- e8d72683: Backend unit tests break every year
+- Updated dependencies [912ae422]
+  - @openstapps/core@4.0.0
+  - @openstapps/core-tools@3.0.0
+  - @openstapps/logger@3.0.0
+
+## 3.1.2
+
+### Patch Changes
+
+- Fix backend rejecting plugins
+- Fix backend sliently falling back to default configs
+
+## 3.1.1
+
+### Patch Changes
+
+- Fix version history offered by backend
+- Updated dependencies
+  - @openstapps/core@3.1.1
+
 ## 3.1.0
 
 ### Minor Changes

backend/backend/Dockerfile

@@ -9,4 +9,6 @@ ENV NODE_ENV=production
 WORKDIR /app
 
 EXPOSE 3000
+HEALTHCHECK --interval=10s --timeout=10s --start-period=10s --retries=12 CMD curl -s --fail --request POST --data '{}' --header 'Content-Type: application/json' http://localhost:3000/ >/dev/null || exit 1
+
 ENTRYPOINT ["node", "app.js"]

backend/backend/config/b-tu/elasticsearchrc.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 /**
  * This is the database configuration for the technical university of berlin
  *
@@ -10,8 +8,7 @@ const config = {
     database: {
       name: 'elasticsearch',
       query: {
-        minMatch: '60%',
+        fields: ["name"]
-        queryType: 'query_string',
       },
     },
   },

backend/backend/config/default/app/language-setting.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCLanguageSetting}  */

backend/backend/config/default/app/menu.js

@@ -1,4 +1,3 @@
-// @ts-check
 /** @type {import('@openstapps/core').SCAppConfigurationMenuCategory[]} */
 const menus = [
   {

backend/backend/config/default/app/user-group-setting.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCSettingInputType, SCThingOriginType, SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCUserGroupSetting} */

backend/backend/config/default/backend/aggregations.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCThingType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCBackendAggregationConfiguration[]} */

backend/backend/config/default/backend/boostings.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {
   month,
   sommerRange,
@@ -40,7 +39,7 @@ const boostings = {
       type: SCThingType.AcademicEvent,
     },
     {
-      factor: 1.6,
+      factor: 2,
       type: SCThingType.Building,
     },
     {
@@ -86,7 +85,7 @@ const boostings = {
   ],
   place: [
     {
-      factor: 2,
+      factor: 3,
       type: SCThingType.Building,
     },
     {

backend/backend/config/default/backend/index.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCThingType} from '@openstapps/core';
 import aggregations from './aggregations.js';
 import boostings from './boostings.js';
@@ -17,7 +16,7 @@ export const backend = {
   hiddenTypes: [SCThingType.DateSeries, SCThingType.Diff, SCThingType.Floor],
   mappingIgnoredTags: ['minlength', 'pattern', 'see', 'tjs-format'],
   maxMultiSearchRouteQueries: 5,
-  maxRequestBodySize: 512 * 1024,
+  maxRequestBodySize: 2e6,
   name: 'Goethe-Universität Frankfurt am Main',
   namespace: '909a8cbc-8520-456c-b474-ef1525f14209',
   sortableFields: [

backend/backend/config/default/backendrc.js

@@ -1,4 +1,3 @@
-// @ts-check
 import app from './app/index.js';
 import {backend, internal} from './backend/index.js';
 

backend/backend/config/default/elasticsearchrc.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 /**
  * This is the default configuration for elasticsearch (a database)
  *
@@ -11,20 +9,29 @@
  *
  * To get more information about the meaning of specific fields, please use your IDE to read the TSDoc documentation.
  *
- * @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js')}
+ * @type {import('../../src/storage/elasticsearch/types/elasticsearch-config.js').ElasticsearchConfigFile}
  */
 const config = {
   internal: {
     database: {
       name: 'elasticsearch',
-      version: '5.6',
+      version: '8.4.2',
       query: {
-        minMatch: '75%',
+        type: 'best_fields',
-        queryType: 'dis_max',
+        fields: [
-        matchBoosting: 1.3,
+          'identifiers^20',
-        fuzziness: 'AUTO',
+          'name^10',
-        cutoffFrequency: 0,
+          'translations.*.name^10',
-        tieBreaker: 0,
+          'alternateNames^10',
+          'translations.*.alternateNames^10',
+          'description^2',
+          'translations.*.description^2',
+          'categories^5',
+        ],
+      },
+      searchAsYouTypeQuery: {
+        type: 'phrase_prefix',
+        fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
       },
     },
   },

backend/backend/config/default/tools/markdown.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {readFile} from 'fs/promises';
 import {SCAboutPageContentType} from '@openstapps/core';
 

backend/backend/config/default/tools/semester-acronym.js

@@ -1,4 +1,3 @@
-// @ts-check
 /**
  * Generates a range of numbers that represent consecutive calendar months
  *

backend/backend/config/default/tools/version.js

@@ -1,5 +1,6 @@
-// @ts-check
+import {readFile, readdir} from 'fs/promises';
-import {readFile} from 'fs/promises';
+import url from 'url';
+import path from 'path';
 
 /**
  * @example version(1, import.meta.url)
@@ -23,20 +24,14 @@ export async function version(options, base) {
 }
 
 /**
- * @param infos {Record<string, import('@openstapps/core').SCAppVersionInfo['published']>}
  * @param base {string} Base path of the file as `import.meta.url`
  * @returns {Promise<import('@openstapps/core').SCAppVersionInfo[]>}
  */
-export async function versions(infos, base) {
+export async function versions(base) {
-  return Promise.all(
+  const directory = await readdir(path.dirname(url.fileURLToPath(base)));
-    Object.entries(infos).map(([versionName, published]) =>
+  const versions = [
-      version(
+    ...new Set(directory.filter(it => it.endsWith('.md')).map(it => it.replace(/\.\w+\.md$/, ''))),
-        {
+  ].sort((a, b) => -a.localeCompare(b, undefined, {numeric: true}));
-          published,
+
-          version: versionName,
+  return Promise.all(versions.map(versionName => version({version: versionName}, base)));
-        },
-        base,
-      ),
-    ),
-  ).then(it => it.sort(({version: a}, {version: b}) => -a.localeCompare(b, undefined, {numeric: true})));
 }

backend/backend/config/f-u/about-pages/about.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCAboutPageContentType} from '@openstapps/core';
 import {markdown} from '../../default/tools/markdown.js';
 

backend/backend/config/f-u/about-pages/imprint.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {SCAboutPageContentType} from '@openstapps/core';
 
 /** @type {import('@openstapps/core').SCAboutPage} */

backend/backend/config/f-u/about-pages/index.js

@@ -1,4 +1,3 @@
-// @ts-check
 import about from './about.js';
 import imprint from './imprint.js';
 import privacy from './privacy.js';

backend/backend/config/f-u/about-pages/privacy.js

@@ -1,4 +1,3 @@
-// @ts-check
 import {markdown} from '../../default/tools/markdown.js';
 
 /** @type {import('@openstapps/core').SCAboutPage} */

backend/backend/config/f-u/backendrc.js

@@ -1,4 +1,3 @@
-// @ts-check
 import aboutPages from './about-pages/index.js';
 import defaultApp from '../default/app/index.js';
 import {backend as defaultBackend, internal as defaultInternal} from '../default/backend/index.js';

backend/backend/config/f-u/version-history/2.4.0.de.md

@@ -1,4 +1,4 @@
-# Goethe-Uni App 3.1
+# Goethe-Uni App 2.4
 
 Wir freuen uns euch mehr in der Goethe-Uni App
 bieten zu können.

backend/backend/config/f-u/version-history/2.4.0.en.md

@@ -1,4 +1,4 @@
-# Goethe-Uni App 3.1
+# Goethe-Uni App 2.4
 
 The Goethe-Uni App got even better!
 

backend/backend/config/f-u/version-history/2.5.0.de.md

@@ -0,0 +1,15 @@
+# Goethe-Uni App 2.5
+
+Die Goethe-Uni App ist noch besser geworden!
+
+## Komplett neue Kartenansicht
+
+Wir haben die Karte überarbeitet, um eine klarere und schnellere Übersicht zu bieten.
+
+## Deutschlandticket mit an Bord
+
+Wenn du das Upgrade des Semesterticket zum Deutschlandticket gemacht hast und eingeloggt bist, findet es sich jetzt auch in der App.
+
+## Bibliotheksdienste sind wieder voll funktionsfähig
+
+Aufgrund einiger Adhoc-Änderungen im Bibliothekssystem haben wir die App so angepasst, dass sie damit umgehen kann.

backend/backend/config/f-u/version-history/2.5.0.en.md

@@ -0,0 +1,15 @@
+# Goethe-Uni App 2.5
+
+The Goethe-Uni App got even better!
+
+## Completely new map view
+
+We overhauled the map to offer you a clearer and faster and overview.
+
+## Deutschlandticket included
+
+If you upgraded your Semesterticket to a Deutschlandticket it will now reside in the App if you are logged in.
+
+## Library services are fully functional again
+
+Due to some adhoc changes in the library system we adjusted the app to handle them properly.

backend/backend/config/f-u/version-history/index.js

@@ -1,12 +1,6 @@
-// @ts-check
 import {versions} from '../../default/tools/version.js';
 
 /** @type {import('@openstapps/core').SCAppVersionInfo[]} */
-const versionHistory = await versions(
+const versionHistory = await versions(import.meta.url);
-  {
-    '3.1.0': {},
-  },
-  import.meta.url,
-);
 
 export default versionHistory;

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.1.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -64,7 +64,7 @@
     "express-prom-bundle": "6.6.0",
     "express-promise-router": "4.1.1",
     "got": "12.6.0",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "morgan": "1.10.0",
     "nock": "13.3.1",
     "node-cache": "5.1.2",
@@ -98,9 +98,9 @@
     "sinon": "15.0.4",
     "sinon-express-mock": "2.2.1",
     "supertest": "6.3.3",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

backend/backend/src/config.ts

@@ -2,6 +2,7 @@ import {cosmiconfig, PublicExplorer} from 'cosmiconfig';
 import {SCConfigFile} from '@openstapps/core';
 import path from 'path';
 import deepmerge from 'deepmerge';
+import {Logger} from '@openstapps/logger';
 
 const fallbackNamespace = 'default';
 const configPath = 'config';
@@ -23,31 +24,25 @@ function configLoader(moduleName: string): PublicExplorer {
  * Find and load a config file
  */
 async function findConfig<T>(moduleName: string, namespace = fallbackNamespace): Promise<T> {
-  return configLoader(moduleName)
+  const config = await configLoader(moduleName).search(path.posix.join('.', configPath, namespace));
-    .search(path.posix.join('.', configPath, namespace))
-    .then(it => it!.config as T)
-    .catch(() =>
-      configLoader(moduleName)
-        .search(path.posix.join('.', configPath, fallbackNamespace))
-        .then(it => it!.config),
-    );
-}
 
-/**
+  if (config) {
- * Loads a config file
+    Logger.info(`Using ${namespace} config for ${moduleName}`);
- */
+    return config.config;
-async function loadConfig<T>(moduleName: string): Promise<T> {
+  } else {
-  const namespace = process.env.NODE_APP_INSTANCE;
+    Logger.info(`Using ${fallbackNamespace} config for ${moduleName}`);
-  const database = process.env.NODE_CONFIG_ENV;
+    return configLoader(moduleName)
-
+      .search(path.posix.join('.', configPath, fallbackNamespace))
-  const config = await findConfig<T>(moduleName, namespace);
+      .then(it => it!.config);
-  if (database) {
-    const databaseConfig = await findConfig<T>(database, namespace);
-    return deepmerge(config, databaseConfig);
   }
-
-  return config;
 }
 
-export const backendConfig = await loadConfig<SCConfigFile>('backend');
+const namespace = process.env.NODE_APP_INSTANCE;
-export const prometheusConfig = await loadConfig<unknown>('prometheus');
+const database = process.env.NODE_CONFIG_ENV;
+
+export const prometheusConfig = await findConfig<unknown>('prometheus', namespace);
+
+const backendConfigWithoutDatabase = await findConfig<SCConfigFile>('backend', namespace);
+export const backendConfig = database
+  ? deepmerge(backendConfigWithoutDatabase, await findConfig<never>(database, namespace))
+  : backendConfigWithoutDatabase;

backend/backend/src/storage/database.ts

@@ -13,15 +13,34 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
+import {
+  SCConfigFile,
+  SCPlace,
+  SCPlaceWithoutReferences,
+  SCSearchQuery,
+  SCSearchResponse,
+  SCThingWithCategoriesWithoutReferences,
+  SCThings,
+  SCUuid,
+} from '@openstapps/core';
 import {MailQueue} from '../notification/mail-queue.js';
 import {Bulk} from './bulk-storage.js';
+import {FeatureCollection, Point, Polygon} from 'geojson';
 
 /**
  * Creates an instance of a database
  */
 export type DatabaseConstructor = new (config: SCConfigFile, mailQueue?: MailQueue) => Database;
 
+export type SupplementaryGeoJSON = FeatureCollection<Point | Polygon, SupplementaryGeoJSONThing>;
+export type SupplementaryGeoJSONThing = Pick<
+  Extract<SCThings, SCPlace>,
+  Exclude<
+    keyof SCPlaceWithoutReferences | keyof SCThingWithCategoriesWithoutReferences<never, never>,
+    'geo' | 'origin' | 'translations'
+  >
+>;
+
 /**
  * Defines what one database class needs to have defined
  */
@@ -82,4 +101,9 @@ export interface Database {
    * @param params Parameters which form a search query to search the backend data
    */
   search(parameters: SCSearchQuery): Promise<SCSearchResponse>;
+
+  /**
+   * Get geo info for display on a map
+   */
+  geo(): Promise<SupplementaryGeoJSON>;
 }

backend/backend/src/storage/elasticsearch/elasticsearch.ts

@@ -20,13 +20,15 @@ import {
   IndicesGetAliasResponse,
   SearchHit,
   SearchResponse,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
 } from '@elastic/elasticsearch/lib/api/types.js';
 import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
 import {Logger} from '@openstapps/logger';
 import moment from 'moment';
 import {MailQueue} from '../../notification/mail-queue.js';
 import {Bulk} from '../bulk-storage.js';
-import {Database} from '../database.js';
+import {Database, SupplementaryGeoJSON, SupplementaryGeoJSONThing} from '../database.js';
 import {parseAggregations} from './aggregations.js';
 import * as Monitoring from './monitoring.js';
 import {buildQuery} from './query/query.js';
@@ -46,6 +48,10 @@ import {
 } from './util/index.js';
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';
+import {Feature, Point, Polygon} from 'geojson';
+import {parseSuggestions} from './util/parse-suggestions.js';
+import {buildScoringFunctions} from './query/boost/scoring-functions.js';
+import {buildFilter} from './query/filter.js';
 
 /**
  * A database interface for elasticsearch
@@ -84,7 +90,10 @@ export class Elasticsearch implements Database {
    * @param config an assembled config file
    * @param mailQueue a mail queue for monitoring
    */
-  constructor(private readonly config: SCConfigFile, mailQueue?: MailQueue) {
+  constructor(
+    private readonly config: SCConfigFile,
+    mailQueue?: MailQueue,
+  ) {
     if (config.internal.database === undefined || typeof config.internal.database.version !== 'string') {
       throw new TypeError('Database version is undefined. Check your config file');
     }
@@ -351,6 +360,39 @@ export class Elasticsearch implements Database {
     throw new Error('You tried to PUT an non-existing object. PUT is only supported on existing objects.');
   }
 
+  public async searchAsYouType(parameters: SCSearchQuery): Promise<SCSearchResponse> {
+    const result = await this.client.search({
+      _source: 'name',
+      query: {
+        function_score: {
+          functions: buildScoringFunctions(this.config.internal.boostings, parameters.context),
+          query: {
+            bool: {
+              must: {
+                multi_match: {
+                  query: parameters.query,
+                  type: 'bool_prefix',
+                  fields: ['name.completion', 'name.completion._2gram', 'name.completion._3gram'],
+                },
+              },
+              should: [],
+              filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
+            },
+          },
+          score_mode: 'max',
+          boost_mode: 'multiply',
+        },
+      },
+      index: ACTIVE_INDICES_ALIAS,
+      allow_no_indices: true,
+      size: 5,
+    });
+
+    const suggestions = result.hits.hits.map(it => (it._source as any).name);
+    console.log(suggestions);
+    console.log(result.took);
+  }
+
   /**
    * Search all indexed data
    * @param parameters search query
@@ -360,18 +402,23 @@ export class Elasticsearch implements Database {
       throw new TypeError('Database is undefined. You have to configure the query build');
     }
 
-    const esConfig: ElasticsearchConfig = {
+    const esConfig = this.config.internal.database as object as ElasticsearchConfig;
-      name: this.config.internal.database.name as 'elasticsearch',
-      version: this.config.internal.database.version as string,
-      query: this.config.internal.database.query as
-        | ElasticsearchQueryDisMaxConfig
-        | ElasticsearchQueryQueryStringConfig
-        | undefined,
-    };
 
     const response: SearchResponse<SCThings> = await this.client.search({
       aggs: aggregations,
       query: buildQuery(parameters, this.config, esConfig),
+      suggest:
+        parameters.query === undefined
+          ? undefined
+          : {
+              text: parameters.query,
+              terms: {
+                term: {
+                  field: 'name',
+                  suggest_mode: 'missing',
+                },
+              },
+            },
       from: parameters.from,
       index: ACTIVE_INDICES_ALIAS,
       allow_no_indices: true,
@@ -391,6 +438,7 @@ export class Elasticsearch implements Database {
         response.aggregations === undefined
           ? []
           : parseAggregations(response.aggregations as Record<AggregateName, AggregationsMultiTermsBucket>),
+      suggestions: response.suggest === undefined ? undefined : parseSuggestions(response.suggest),
       pagination: {
         count: response.hits.hits.length,
         offset: typeof parameters.from === 'number' ? parameters.from : 0,
@@ -402,4 +450,49 @@ export class Elasticsearch implements Database {
       },
     };
   }
+
+  async geo(): Promise<SupplementaryGeoJSON> {
+    const searchResponse = await this.client.search<Extract<SCThings, {geo: unknown}>>({
+      body: {
+        query: {
+          exists: {
+            field: 'geo',
+          },
+        },
+      },
+      from: 0,
+      allow_no_indices: true,
+      index: ACTIVE_INDICES_ALIAS,
+      size: 1,
+    });
+
+    return {
+      type: 'FeatureCollection',
+      features: searchResponse.hits.hits
+        .map(thing => {
+          return thing._source?.geo
+            ? ({
+                id: Number(thing._source.identifiers?.['OSM']) || undefined,
+                type: 'Feature',
+                geometry: thing._source.geo.polygon ?? thing._source.geo.point,
+                properties: {
+                  name: thing._source.name,
+                  sameAs: thing._source.sameAs,
+                  image: thing._source.image,
+                  alternateNames: thing._source.alternateNames,
+                  description: thing._source.description,
+                  identifiers: thing._source.identifiers,
+                  categories: thing._source.categories,
+                  categorySpecificValues: thing._source.categorySpecificValues,
+                  openingHours: thing._source.openingHours,
+                  address: thing._source.address,
+                  uid: thing._source.uid,
+                  type: thing._source.type,
+                },
+              } satisfies Feature<Polygon | Point, SupplementaryGeoJSONThing>)
+            : undefined;
+        })
+        .filter(noUndefined),
+    };
+  }
 }

backend/backend/src/storage/elasticsearch/query/filters/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceFilter(
 ): QueryDslSpecificQueryContainer<'geo_distance'> {
   const geoObject: QueryDslGeoDistanceQuery = {
     distance: `${filter.arguments.distance}m`,
-    [`${filter.arguments.field}.point.coordinates`]: {
+    [`${filter.arguments.field}.point`]: {
       lat: filter.arguments.position[1],
       lon: filter.arguments.position[0],
     },

backend/backend/src/storage/elasticsearch/query/filters/geo.ts

@@ -19,14 +19,29 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
  * Converts a geo filter to elasticsearch syntax
  * @param filter A search filter for the retrieval of the data
  */
-export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'geo_shape'> {
+export function buildGeoFilter(filter: SCGeoFilter): QueryDslSpecificQueryContainer<'bool'> {
   return {
-    geo_shape: {
+    bool: {
-      ignore_unmapped: true,
+      should: [
-      [`${filter.arguments.field}.polygon`]: {
+        {
-        shape: filter.arguments.shape,
+          geo_shape: {
-        relation: filter.arguments.spatialRelation,
+            ignore_unmapped: true,
-      },
+            [`${filter.arguments.field}.polygon`]: {
+              shape: filter.arguments.shape,
+              relation: filter.arguments.spatialRelation,
+            },
+          },
+        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
+        {
+          geo_shape: {
+            ignore_unmapped: true,
+            [`${filter.arguments.field}.point`]: {
+              shape: filter.arguments.shape,
+              relation: filter.arguments.spatialRelation,
+            },
+          },
+        } satisfies QueryDslSpecificQueryContainer<'geo_shape'>,
+      ],
     },
   };
 }

backend/backend/src/storage/elasticsearch/query/filters/value.ts

@@ -21,16 +21,31 @@ import {QueryDslSpecificQueryContainer} from '../../types/util.js';
  */
 export function buildValueFilter(
   filter: SCSearchValueFilter,
-): QueryDslSpecificQueryContainer<'term'> | QueryDslSpecificQueryContainer<'terms'> {
+):
-  return Array.isArray(filter.arguments.value)
+  | QueryDslSpecificQueryContainer<'exists'>
-    ? {
+  | QueryDslSpecificQueryContainer<'term'>
-        terms: {
+  | QueryDslSpecificQueryContainer<'terms'> {
-          [`${filter.arguments.field}.raw`]: filter.arguments.value,
+  switch (typeof filter.arguments.value) {
+    case 'undefined': {
+      return {
+        exists: {
+          field: filter.arguments.field,
         },
-      }
+      };
-    : {
+    }
+    case 'string': {
+      return {
         term: {
           [`${filter.arguments.field}.raw`]: filter.arguments.value,
         },
       };
+    }
+    case 'object': {
+      return {
+        terms: {
+          [`${filter.arguments.field}.raw`]: filter.arguments.value,
+        },
+      };
+    }
+  }
 }

backend/backend/src/storage/elasticsearch/query/query.ts

@@ -30,84 +30,21 @@ export const buildQuery = function buildQuery(
   defaultConfig: SCConfigFile,
   elasticsearchConfig: ElasticsearchConfig,
 ): QueryDslQueryContainer {
-  // if config provides a minMatch parameter, we use query_string instead of a match query
+  return {
-  let query;
-  if (elasticsearchConfig.query === undefined) {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: '90%',
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'query_string') {
-    query = {
-      query_string: {
-        analyzer: 'search_german',
-        default_field: 'name',
-        minimum_should_match: elasticsearchConfig.query.minMatch,
-        query: typeof parameters.query === 'string' ? parameters.query : '*',
-      },
-    };
-  } else if (elasticsearchConfig.query.queryType === 'dis_max') {
-    if (typeof parameters.query === 'string' && parameters.query !== '*') {
-      query = {
-        dis_max: {
-          boost: 1.2,
-          queries: [
-            {
-              match: {
-                name: {
-                  boost: elasticsearchConfig.query.matchBoosting,
-                  fuzziness: elasticsearchConfig.query.fuzziness,
-                  query: parameters.query,
-                },
-              },
-            },
-            {
-              query_string: {
-                default_field: 'name',
-                minimum_should_match: elasticsearchConfig.query.minMatch,
-                query: parameters.query,
-              },
-            },
-          ],
-          tie_breaker: elasticsearchConfig.query.tieBreaker,
-        },
-      };
-    }
-  } else {
-    throw new Error(
-      'Unsupported query type. Check your config file and reconfigure your elasticsearch query',
-    );
-  }
-
-  const functionScoreQuery: QueryDslQueryContainer = {
     function_score: {
       functions: buildScoringFunctions(defaultConfig.internal.boostings, parameters.context),
       query: {
         bool: {
-          minimum_should_match: 0, // if we have no should, nothing can match
+          must:
-          must: [],
+            parameters.query === undefined || parameters.query === '' || parameters.query === '*'
+              ? {match_all: {}}
+              : {multi_match: {...elasticsearchConfig.query, query: parameters.query}},
           should: [],
+          filter: parameters.filter === undefined ? undefined : buildFilter(parameters.filter),
         },
       },
-      score_mode: 'multiply',
+      score_mode: 'max',
+      boost_mode: 'multiply',
     },
   };
-
-  const mustMatch = functionScoreQuery.function_score?.query?.bool?.must;
-
-  if (Array.isArray(mustMatch)) {
-    if (query !== undefined) {
-      mustMatch.push(query);
-    }
-
-    if (parameters.filter !== undefined) {
-      mustMatch.push(buildFilter(parameters.filter));
-    }
-  }
-
-  return functionScoreQuery;
 };

backend/backend/src/storage/elasticsearch/query/sort/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
       mode: 'avg',
       order: sort.order,
       unit: 'm',
-      [`${sort.arguments.field}.point.coordinates`]: {
+      [`${sort.arguments.field}.point`]: {
         lat: sort.arguments.position[1],
         lon: sort.arguments.position[0],
       },

backend/backend/src/storage/elasticsearch/types/elasticsearch-config.ts

@@ -13,68 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
+import {QueryDslMultiMatchQuery} from '@elastic/elasticsearch/lib/api/types.js';
- * A configuration for using the Dis Max Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-dis-max-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryDisMaxConfig {
-  /**
-   * Relative (to a total number of documents) or absolute number to exclude meaningless matches that frequently appear
-   */
-  cutoffFrequency: number;
-
-  /**
-   * The maximum allowed Levenshtein Edit Distance (or number of edits)
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/common-options.html#fuzziness
-   */
-  fuzziness: number | string;
-
-  /**
-   * Increase the importance (relevance score) of a field
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/mapping-boost.html
-   */
-  matchBoosting: number;
-
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'dis_max' which is a union of its subqueries
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-dis-max-query.html
-   */
-  queryType: 'dis_max';
-
-  /**
-   * Changes behavior of default calculation of the score when multiple results match
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-multi-match-query.html#tie-breaker
-   */
-  tieBreaker: number;
-}
-
-/**
- * A configuration for using Query String Query
- *
- * See https://www.elastic.co/guide/en/elasticsearch/reference/5.5/query-dsl-query-string-query.html for further
- * explanation of what the parameters mean
- */
-export interface ElasticsearchQueryQueryStringConfig {
-  /**
-   * Minimal number (or percentage) of words that should match in a query
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-minimum-should-match.html
-   */
-  minMatch: string;
-
-  /**
-   * Type of the query - in this case 'query_string' which uses a query parser in order to parse content
-   * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-query-string-query.html
-   */
-  queryType: 'query_string';
-}
 
 /**
  * An config file for the elasticsearch database interface
@@ -105,7 +44,12 @@ export interface ElasticsearchConfig {
   /**
    * Configuration for using queries
    */
-  query?: ElasticsearchQueryDisMaxConfig | ElasticsearchQueryQueryStringConfig;
+  query: Omit<QueryDslMultiMatchQuery, 'query'>;
+
+  /**
+   *
+   */
+  searchAsYouTypeQuery: Omit<QueryDslMultiMatchQuery, 'query'>;
 
   /**
    * Version of the used elasticsearch

backend/backend/src/storage/elasticsearch/util/parse-suggestions.ts

@@ -0,0 +1,28 @@
+import {
+  SearchSuggest,
+  SearchTermSuggest,
+  SearchTermSuggestOption,
+  SuggestionName,
+} from '@elastic/elasticsearch/lib/api/types.js';
+import {SCSearchSuggestions} from '@openstapps/core';
+
+/**
+ * Parse ES Suggestions to SC Search Suggestions
+ */
+export function parseSuggestions(suggest: Record<SuggestionName, SearchSuggest[]>): SCSearchSuggestions {
+  const termsSuggestions =
+    suggest.terms === undefined
+      ? []
+      : (suggest.terms as SearchTermSuggest[])
+          ?.map(
+            ({text, options}) =>
+              [
+                text,
+                (options as SearchTermSuggestOption[] | undefined)?.map(({text}) => text) ?? [],
+              ] as const,
+          )
+          .filter(([, suggestions]) => suggestions.length > 0) ?? [];
+  return {
+    terms: termsSuggestions.length === 0 ? undefined : Object.fromEntries(termsSuggestions),
+  };
+}

backend/backend/test/common.ts

@@ -22,7 +22,7 @@ import http from 'http';
 import {MailQueue} from '../src/notification/mail-queue.js';
 import {Bulk, BulkStorage} from '../src/storage/bulk-storage.js';
 import getPort from 'get-port';
-import {Database} from '../src/storage/database.js';
+import {Database, SupplementaryGeoJSON} from '../src/storage/database.js';
 import {v4} from 'uuid';
 import {backendConfig} from '../src/config.js';
 import {getIndexUID} from '../src/storage/elasticsearch/util/index.js';
@@ -58,7 +58,6 @@ export async function startApp(): Promise<Express> {
  * An elasticsearch mock
  */
 export class ElasticsearchMock implements Database {
-  // @ts-expect-error never read
   private bulk: Bulk | undefined;
 
   private storageMock = new Map<string, SCThings>();
@@ -67,6 +66,10 @@ export class ElasticsearchMock implements Database {
     // Nothing to do here
   }
 
+  geo(): Promise<SupplementaryGeoJSON> {
+    throw new Error('Method not implemented.');
+  }
+
   bulkCreated(bulk: Bulk): Promise<void> {
     this.bulk = bulk;
     return Promise.resolve(undefined);

backend/backend/test/routes/bulk-route.spec.ts

@@ -14,6 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 import {
+  SCBook,
   SCBulkAddRoute,
   SCBulkDoneRoute,
   SCBulkRequest,
@@ -23,29 +24,30 @@ import {
 import {expect} from 'chai';
 import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
-import {readFile} from 'fs/promises';
 import {v4} from 'uuid';
+import bookFile from '@openstapps/core/test/resources/indexable/Book.2.json' assert {type: 'json'};
 
-const book = JSON.parse(
+const book = bookFile.instance as SCBook;
-  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.2.json', 'utf8'),
-).instance;
 
 describe('Bulk routes', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
 
-  const request: SCBulkRequest = {
+  let request: SCBulkRequest;
-    expiration: bulk.expiration,
+  let bulkRoute: SCBulkRoute;
-    source: bulk.source,
+  let bulkAddRoute: SCBulkAddRoute;
-    type: bulk.type,
+  let bulkDoneRoute: SCBulkDoneRoute;
-  };
-  const bulkRoute = new SCBulkRoute();
-  const bulkAddRoute = new SCBulkAddRoute();
-  const bulkDoneRoute = new SCBulkDoneRoute();
 
-  // afterEach(async function() {
+  before(function () {
-  // TODO: Delete saved bulks
+    request = {
-  // });
+      expiration: bulk.expiration,
+      source: bulk.source,
+      type: bulk.type,
+    };
+    bulkRoute = new SCBulkRoute();
+    bulkAddRoute = new SCBulkAddRoute();
+    bulkDoneRoute = new SCBulkDoneRoute();
+  });
 
   it('should create bulk', async function () {
     const {status, body, error} = await testApp

backend/backend/test/routes/index-route.spec.ts

@@ -21,7 +21,12 @@ import {expect} from 'chai';
 describe('Index route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-  const indexRoute = new SCIndexRoute();
+
+  let indexRoute: SCIndexRoute;
+
+  before(function () {
+    indexRoute = new SCIndexRoute();
+  });
 
   it('should respond with both app and backend configuration', async function () {
     const request: SCIndexRequest = {};

backend/backend/test/routes/plugin-register-route.spec.ts

@@ -30,15 +30,11 @@ import chaiAsPromised from 'chai-as-promised';
 import {DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
 import {backendConfig} from '../../src/config.js';
-import {readFile} from 'fs/promises';
+import registerRequest from '@openstapps/core/test/resources/PluginRegisterRequest.1.json' assert {type: 'json'};
 
 // for using promises in expectations (to.eventually.be...)
 use(chaiAsPromised);
 
-const registerRequest = JSON.parse(
-  await readFile('node_modules/@openstapps/core/test/resources/PluginRegisterRequest.1.json', 'utf8'),
-);
-
 // cast it because of "TS2322: Type 'string' is not assignable to type '"add"'"
 export const registerAddRequest: SCPluginAdd = registerRequest.instance as SCPluginAdd;
 

backend/backend/test/routes/route.spec.ts

@@ -47,8 +47,8 @@ describe('Create route', async function () {
   const statusCodeSuccess = 222;
   const bodySuccess = {foo: true};
   const sandbox = sinon.createSandbox();
-  const validationError = new SCValidationErrorResponse([]);
+  let validationError: SCValidationErrorResponse;
-  const internalServerError = new SCInternalServerErrorResponse();
+  let internalServerError: SCInternalServerErrorResponse;
 
   beforeEach(function () {
     app = express();
@@ -64,6 +64,9 @@ describe('Create route', async function () {
     handler = (_request, _app) => {
       return Promise.resolve(bodySuccess);
     };
+
+    validationError = new SCValidationErrorResponse([]);
+    internalServerError = new SCInternalServerErrorResponse();
   });
 
   afterEach(function () {

backend/backend/test/routes/search-route.spec.ts

@@ -29,14 +29,21 @@ import {backendConfig} from '../../src/config.js';
 describe('Search route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-  const searchRoute = new SCSearchRoute();
+  let searchRoute: SCSearchRoute;
-  const multiSearchRoute = new SCMultiSearchRoute();
+  let multiSearchRoute: SCMultiSearchRoute;
-  const syntaxError = new SCSyntaxErrorResponse('Foo Message');
+  let syntaxError: SCSyntaxErrorResponse;
-  const methodNotAllowedError = new SCMethodNotAllowedErrorResponse();
+  let methodNotAllowedError: SCMethodNotAllowedErrorResponse;
-  const tooManyRequestsError = new SCTooManyRequestsErrorResponse();
+  let tooManyRequestsError: SCTooManyRequestsErrorResponse;
+
+  before(function () {
+    searchRoute = new SCSearchRoute();
+    multiSearchRoute = new SCMultiSearchRoute();
+    syntaxError = new SCSyntaxErrorResponse('Foo Message');
+    methodNotAllowedError = new SCMethodNotAllowedErrorResponse();
+    tooManyRequestsError = new SCTooManyRequestsErrorResponse();
+  });
 
   it('should reject GET, PUT with a valid search query', async function () {
-    // const expectedParams = JSON.parse(JSON.stringify(defaultParams));
     const {status} = await testApp.get('/search').set('Accept', 'application/json').send({
       query: 'Some search terms',
     });

backend/backend/test/routes/thing-update-route.spec.ts

@@ -13,23 +13,25 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import {SCThingUpdateRoute} from '@openstapps/core';
+import {SCBook, SCThingUpdateRoute} from '@openstapps/core';
 import chaiAsPromised from 'chai-as-promised';
 import {bulkStorageMock, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {expect, use} from 'chai';
 import {testApp} from '../tests-setup.js';
-import {readFile} from 'fs/promises';
+import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
 
 use(chaiAsPromised);
 
-const book = JSON.parse(
+const book = bookFile.instance as SCBook;
-  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
-).instance;
 
 describe('Thing update route', async function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
-  const thingUpdateRoute = new SCThingUpdateRoute();
+  let thingUpdateRoute: SCThingUpdateRoute;
+
+  before(function () {
+    thingUpdateRoute = new SCThingUpdateRoute();
+  });
 
   it('should update a thing', async function () {
     const thingUpdateRouteurlPath = thingUpdateRoute.urlPath

backend/backend/test/storage/elasticsearch/elasticsearch.spec.ts

@@ -39,7 +39,6 @@ import {Elasticsearch} from '../../../src/storage/elasticsearch/elasticsearch.js
 import {bulk, DEFAULT_TEST_TIMEOUT, getTransport, getIndex} from '../../common.js';
 import fs from 'fs';
 import {backendConfig} from '../../../src/config.js';
-import {readFile} from 'fs/promises';
 import {
   ACTIVE_INDICES_ALIAS,
   getIndexUID,
@@ -50,6 +49,11 @@ import {
 } from '../../../src/storage/elasticsearch/util/index.js';
 import cron from 'node-cron';
 import {query} from './query.js';
+import messageFile from '@openstapps/core/test/resources/indexable/Message.1.json' assert {type: 'json'};
+import bookFile from '@openstapps/core/test/resources/indexable/Book.1.json' assert {type: 'json'};
+
+const message = messageFile.instance as SCMessage;
+const book = bookFile.instance as SCBook;
 
 use(chaiAsPromised);
 
@@ -60,13 +64,6 @@ function searchResponse<T>(...hits: SearchHit<T>[]): SearchResponse<T> {
   return {hits: {hits}, took: 0, timed_out: false, _shards: {total: 1, failed: 0, successful: 1}};
 }
 
-const message = JSON.parse(
-  await readFile('node_modules/@openstapps/core/test/resources/indexable/Message.1.json', 'utf8'),
-);
-const book = JSON.parse(
-  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
-);
-
 describe('Elasticsearch', function () {
   // increase timeout for the suite
   this.timeout(DEFAULT_TEST_TIMEOUT);
@@ -74,8 +71,15 @@ describe('Elasticsearch', function () {
 
   before(function () {
     // eslint-disable-next-line no-console
-    console.log('before');
     sandbox.stub(fs, 'readFileSync').returns('{}');
+    sandbox.stub(backendConfig.internal.boostings.default[0], 'fields').value({
+      'academicTerms.acronym': {
+        'SS 2023': 1.05,
+        'WS 2023/24': 1.1,
+        'SoSe 2023': 1.05,
+        'WiSe 2023/24': 1.1,
+      },
+    });
   });
   after(function () {
     sandbox.restore();
@@ -445,7 +449,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: '',
           _score: 0,
-          _source: message as SCMessage,
+          _source: message,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(foundObject));
 
@@ -475,7 +479,7 @@ describe('Elasticsearch', function () {
         const object: SearchHit<SCMessage> = {
           _id: '',
           _index: oldIndex,
-          _source: message as SCMessage,
+          _source: message,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse<SCMessage>(object));
         sandbox.stub(es, 'prepareBulkWrite').resolves(index);
@@ -489,7 +493,7 @@ describe('Elasticsearch', function () {
         sandbox.stub(es.client, 'create').resolves({result: 'not_found'} as CreateResponse);
 
         await es.init();
-        return expect(es.post(message as SCMessage, bulk)).to.rejectedWith('creation');
+        return expect(es.post(message, bulk)).to.rejectedWith('creation');
       });
 
       it('should create a new object', async function () {
@@ -502,7 +506,7 @@ describe('Elasticsearch', function () {
         });
 
         await es.init();
-        await es.post(message as SCMessage, bulk);
+        await es.post(message, bulk);
 
         expect(createStub.called).to.be.true;
         expect(caughtParameter.document).to.be.eql({
@@ -527,7 +531,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message as SCMessage,
+          _source: message,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse());
 
@@ -541,7 +545,7 @@ describe('Elasticsearch', function () {
           _id: '',
           _index: getIndex(),
           _score: 0,
-          _source: message as SCMessage,
+          _source: message,
         };
         sandbox.stub(es.client, 'search').resolves(searchResponse(object));
         // @ts-expect-error unused
@@ -564,13 +568,13 @@ describe('Elasticsearch', function () {
         _id: '123',
         _index: getIndex(),
         _score: 0,
-        _source: message as SCMessage,
+        _source: message,
       };
       const objectBook: SearchHit<SCBook> = {
         _id: '321',
         _index: getIndex(),
         _score: 0,
-        _source: book as SCBook,
+        _source: book,
       };
       const fakeEsAggregations = {
         '@all': {

backend/backend/test/storage/elasticsearch/query.spec.ts

@@ -466,7 +466,7 @@ describe('Query', function () {
       const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
         geo_distance: {
           'distance': '1000m',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 8.123,
             lon: 50.123,
           },
@@ -479,18 +479,39 @@ describe('Query', function () {
     it('should build geo filter for shapes and points', function () {
       const filter = buildFilter(searchFilters.geoPoint);
       const expectedFilter = {
-        geo_shape: {
+        bool: {
-          'geo.polygon': {
+          should: [
-            relation: undefined,
+            {
-            shape: {
+              geo_shape: {
-              type: 'envelope',
+                'geo.polygon': {
-              coordinates: [
+                  relation: undefined,
-                [50.123, 8.123],
+                  shape: {
-                [50.123, 8.123],
+                    coordinates: [
-              ],
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
             },
-          },
+            {
-          'ignore_unmapped': true,
+              geo_shape: {
+                'geo.point': {
+                  relation: undefined,
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
+            },
+          ],
         },
       };
 
@@ -500,18 +521,39 @@ describe('Query', function () {
     it('should build geo filter for shapes only', function () {
       const filter = buildFilter(searchFilters.geoShape);
       const expectedFilter = {
-        geo_shape: {
+        bool: {
-          'geo.polygon': {
+          should: [
-            relation: 'contains',
+            {
-            shape: {
+              geo_shape: {
-              type: 'envelope',
+                'geo.polygon': {
-              coordinates: [
+                  relation: 'contains',
-                [50.123, 8.123],
+                  shape: {
-                [50.123, 8.123],
+                    coordinates: [
-              ],
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
             },
-          },
+            {
-          'ignore_unmapped': true,
+              geo_shape: {
+                'geo.point': {
+                  relation: 'contains',
+                  shape: {
+                    coordinates: [
+                      [50.123, 8.123],
+                      [50.123, 8.123],
+                    ],
+                    type: 'envelope',
+                  },
+                },
+                'ignore_unmapped': true,
+              },
+            },
+          ],
         },
       };
 
@@ -594,7 +636,7 @@ describe('Query', function () {
           'mode': 'avg',
           'order': 'desc',
           'unit': 'm',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 50.123,
             lon: 8.123,
           },

backend/backend/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "@openstapps/tsconfig",
   "compilerOptions": {
     "resolveJsonModule": true,
-    "useUnknownInCatchVariables": false,
+    "useUnknownInCatchVariables": false
-    "allowJs": true
+  },
-  }
+  "exclude": ["lib", "app.js"]
 }

backend/database/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/database
 
+## 3.2.0
+
+### Patch Changes
+
+- 689ac68b: pin alpine version to 3.18 and add healthchecks
+
 ## 3.0.0
 
 ### Patch Changes

backend/database/Dockerfile

@@ -14,4 +14,6 @@ RUN chown elasticsearch:elasticsearch config/elasticsearch.yml
 
 USER elasticsearch
 
+HEALTHCHECK --interval=10s --timeout=10s --start-period=60s --retries=12 CMD curl --fail -s http://localhost:9200/ >/dev/null || exit 1
+
 CMD ["/usr/share/elasticsearch/bin/elasticsearch"]

backend/database/config/elasticsearch.yml

@@ -3,3 +3,4 @@ discovery.type: "single-node"
 cluster.routing.allocation.disk.threshold_enabled: false
 network.bind_host: 0.0.0.0
 xpack.security.enabled: false
+ingest.geoip.downloader.enabled: false

backend/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstapps/database",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "private": true,
   "files": [
     "config",

backend/proxy/config/default.cjs

@@ -16,7 +16,7 @@
 
 // ESM is not supported, and cts is not detected, so we use type-checked cjs instead.
 /** @type {import('../src/common').ConfigFile} */
-const configFile = {
+module.exports = {
   activeVersions: ['1\\.0\\.\\d+', '2\\.0\\.\\d+'],
   hiddenRoutes: ['/bulk'],
   logFormat: 'default',
@@ -31,5 +31,3 @@ const configFile = {
     dhparam: '/etc/nginx/certs/dhparam.pem',
   },
 };
-
-export default configFile;

backend/proxy/package.json

@@ -50,8 +50,8 @@
     "dockerode": "3.3.5",
     "is-cidr": "4.0.2",
     "mustache": "4.2.0",
-    "semver": "7.3.8",
+    "semver": "7.6.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "devDependencies": {
     "@openstapps/api-cli": "workspace:*",
@@ -65,7 +65,7 @@
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
     "@types/proxyquire": "1.3.28",
-    "@types/semver": "7.3.13",
+    "@types/semver": "7.5.8",
     "@types/sha1": "1.1.3",
     "@types/sinon": "10.0.14",
     "@types/sinon-chai": "3.2.9",
@@ -75,7 +75,7 @@
     "mocha-junit-reporter": "2.2.0",
     "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0"
   },
   "tsup": {

backend/proxy/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "@openstapps/tsconfig",
-  "exclude": ["./config/", "./lib/"]
+  "exclude": ["config", "lib", "app.js"]
 }

configuration/eslint-config/copyright-header-rule.js

@@ -1,4 +1,3 @@
-// @ts-check
 const fs = require("fs");
 const path = require("node:path");
 const child_process = require("child_process");

configuration/eslint-config/copyright-header-rule.spec.js

@@ -1,4 +1,3 @@
-// @ts-check
 "use strict"
 
 const rule = require('./copyright-header-rule')

configuration/eslint-config/index.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 /** @type {import('eslint').Linter.Config} */
 const config = {
   root: true,

configuration/eslint-config/package.json

@@ -18,16 +18,15 @@
   "devDependencies": {
     "@openstapps/tsconfig": "workspace:*",
     "@types/node": "18.15.3",
-    "eslint": "8.43.0",
+    "eslint": "8.57.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "5.60.1",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "5.60.1",
+    "@typescript-eslint/parser": "7.2.0",
-    "eslint": "8.43.0",
+    "eslint": "8.57.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-jsdoc": "46.4.2",
+    "eslint-plugin-jsdoc": "48.2.1",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-unicorn": "51.0.1"
-    "eslint-plugin-unicorn": "47.0.0"
   }
 }

configuration/prettier-config/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/prettier-config
 
+## 3.2.0
+
+### Patch Changes
+
+- dbb55850: Update Prettier to 3.1.1
+
 ## 3.0.0
 
 ### Major Changes
@@ -30,7 +36,7 @@
 
   ```js
   #!/usr/bin/env node
-  import './lib/app.js';
+  import "./lib/app.js";
   ```
 
 - 64caebaf: Migrate to ESM
@@ -69,11 +75,14 @@
 - 64caebaf: Migrated changelogs to changeset format
 
   ```js
-  import fs from 'fs';
+  import fs from "fs";
 
-  const path = 'packages/logger/CHANGELOG.md';
+  const path = "packages/logger/CHANGELOG.md";
 
-  fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
+  fs.writeFileSync(
+    path,
+    fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
+  );
   ```
 
 - 98546a97: Migrate away from @openstapps/configuration
@@ -115,7 +124,7 @@
 
   ```js
   #!/usr/bin/env node
-  import './lib/app.js';
+  import "./lib/app.js";
   ```
 
 - 64caebaf: Migrate to ESM
@@ -154,11 +163,14 @@
 - 64caebaf: Migrated changelogs to changeset format
 
   ```js
-  import fs from 'fs';
+  import fs from "fs";
 
-  const path = 'packages/logger/CHANGELOG.md';
+  const path = "packages/logger/CHANGELOG.md";
 
-  fs.writeFileSync(path, fs.readFileSync(path, 'utf8').replace(/^#+\s+\[/gm, '## ['));
+  fs.writeFileSync(
+    path,
+    fs.readFileSync(path, "utf8").replace(/^#+\s+\[/gm, "## ["),
+  );
   ```
 
 - 98546a97: Migrate away from @openstapps/configuration

configuration/prettier-config/index.js

@@ -0,0 +1,15 @@
+/** @type {import('prettier').Config} */
+const config = {
+  tabWidth: 2,
+  printWidth: 110,
+  useTabs: false,
+  semi: true,
+  singleQuote: true,
+  quoteProps: 'consistent',
+  trailingComma: 'all',
+  bracketSpacing: false,
+  arrowParens: 'avoid',
+  endOfLine: 'lf'
+}
+
+export default config;

configuration/prettier-config/index.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/prettierrc",
-  "tabWidth": 2,
-  "printWidth": 110,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "quoteProps": "consistent",
-  "trailingComma": "all",
-  "bracketSpacing": false,
-  "arrowParens": "avoid",
-  "endOfLine": "lf"
-}

configuration/prettier-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/prettier-config",
   "description": "StApps Prettier Config",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/prettier-config.git",
@@ -9,16 +9,19 @@
   "contributors": [
     "Rainer Killinger <mail-openstapps@killinger.co>"
   ],
-  "main": "index.json",
+  "main": "index.js",
   "files": [
-    "index.json",
+    "index.js",
     "CHANGELOG.md",
     "README.md"
   ],
   "scripts": {
-    "test": "npx prettier --config index.json --check \"test/*.js\""
+    "test": "prettier --config index.js --check \"test/*.js\""
+  },
+  "devDependencies": {
+    "prettier": "3.1.1"
   },
   "peerDependencies": {
-    "prettier": "2.8.6"
+    "prettier": "3.1.1"
   }
 }

configuration/projectmanagement/package.json

@@ -43,8 +43,8 @@
     "@openstapps/logger": "workspace:*",
     "@slack/web-api": "6.8.1",
     "commander": "10.0.0",
-    "date-fns": "2.30.0",
+    "date-fns": "3.6.0",
-    "glob": "10.2.7",
+    "glob": "10.3.10",
     "mustache": "4.2.0"
   },
   "devDependencies": {
@@ -53,7 +53,7 @@
     "@openstapps/tsconfig": "workspace:*",
     "@types/chai": "4.3.5",
     "@types/chai-as-promised": "7.1.5",
-    "@types/glob": "8.0.1",
+    "@types/glob": "8.1.0",
     "@types/mocha": "10.0.1",
     "@types/mustache": "4.2.2",
     "@types/node": "18.15.3",
@@ -63,9 +63,9 @@
     "chai-as-promised": "7.1.1",
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

configuration/projectmanagement/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "@openstapps/tsconfig"
+  "extends": "@openstapps/tsconfig",
+  "exclude": ["lib", "app.js"]
 }

configuration/tsconfig/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/tsconfig
 
+## 3.3.0
+
+### Minor Changes
+
+- 688bc5f2: v3.3.0 changes
+
 ## 3.0.0
 
 ### Major Changes
@@ -30,7 +36,7 @@
 
   ```js
   #!/usr/bin/env node
-  import './lib/app.js';
+  import "./lib/app.js";
   ```
 
 - 64caebaf: Migrate to ESM
@@ -105,7 +111,7 @@
 
   ```js
   #!/usr/bin/env node
-  import './lib/app.js';
+  import "./lib/app.js";
   ```
 
 - 64caebaf: Migrate to ESM

configuration/tsconfig/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/tsconfig",
   "description": "The tsconfig for the openstapps project",
-  "version": "3.0.0",
+  "version": "3.3.0",
   "type": "commonjs",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/eslint-config.git",

configuration/tsconfig/tsconfig.json

@@ -14,19 +14,26 @@
     "noFallthroughCasesInSwitch": true,
     "isolatedModules": true,
     "allowJs": true,
+    "checkJs": true,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
     "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noUnusedLocals": true,
+    "noUnusedLocals": false,
-    "noUnusedParameters": true,
+    "noUnusedParameters": false,
     "outDir": "../../../lib/",
-    "lib": ["ES2022", "DOM"],
+    "lib": [
+      "ES2022",
+      "DOM"
+    ],
     "strict": true,
     "target": "ES2022"
   },
   "ts-node": {
     "transpileOnly": true
   },
-  "exclude": ["../../../app.js", "../../../lib/"]
+  "exclude": [
+    "../../../app.js",
+    "../../../lib/"
+  ]
 }

examples/minimal-connector/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @openstapps/minimal-connector
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/api@3.3.2
+
+## 3.3.0
+
+### Patch Changes
+
+- Updated dependencies [688bc5f2]
+  - @openstapps/api@3.3.0
+  - @openstapps/core@3.3.0
+  - @openstapps/logger@3.0.0
+
+## 3.2.0
+
+### Patch Changes
+
+- Updated dependencies [912ae422]
+  - @openstapps/core@3.2.0
+  - @openstapps/api@3.2.0
+  - @openstapps/logger@3.0.0
+
+## 3.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @openstapps/api@3.1.1
+  - @openstapps/core@3.1.1
+
 ## 3.1.0
 
 ### Patch Changes

examples/minimal-connector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-connector",
   "description": "This is a minimal connector which serves as an example",
-  "version": "3.1.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -53,9 +53,9 @@
     "mocha": "10.2.0",
     "mocha-junit-reporter": "2.2.0",
     "nock": "13.3.1",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

examples/minimal-connector/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "@openstapps/tsconfig"
+  "extends": "@openstapps/tsconfig",
+  "exclude": ["lib", "app.js"]
 }

examples/minimal-deployment/docker-compose.yml

@@ -1,44 +1,62 @@
 version: '3.7'
+
+x-development-variables: &development-variables
+  NODE_ENV: "development"
+  ALLOW_NO_TRANSPORT: "true"
+
 services:
   database:
-    image: registry.gitlab.com/openstapps/openstapps/database:2.0.0
+    image: registry.gitlab.com/openstapps/openstapps/database:3.0.0
-    volumes:
+    # If you need persistence for debugging purposes uncomment the following lines
-      - ./database:/usr/share/elasticsearch/data
+    #volumes:
+    #  - ./database:/usr/share/elasticsearch/data
     expose:
-      - "9200"
+      - 9200
+    ports:
+      - 127.0.0.1:9200:9200
+    environment:
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
+      - discovery.type=single-node
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
     restart: unless-stopped
 
   backend:
-    image: registry.gitlab.com/openstapps/openstapps/backend:3.0.0-next.0
+    image: registry.gitlab.com/openstapps/openstapps/backend:3.1.0
     environment:
+      <<: *development-variables
       ES_ADDR: "http://database:9200"
       NODE_CONFIG_ENV: "elasticsearch"
-      ALLOW_NO_TRANSPORT: "true"
+      NODE_APP_INSTANCE: "f-u"
+      PROMETHEUS_MIDDLEWARE: "false"
     expose:
       - 3000
     ports:
-      - 3000:3000
+      - 127.0.0.1:3000:3000
-    links:
-      - "database"
     labels:
-      - stapps.version=1.0.0
+      - stapps.version=4.1.0
     restart: unless-stopped
     depends_on:
       - database
-
-  api:
-    image: registry.gitlab.com/openstapps/openstapps/api:3.0.0-next.0
     links:
-      - "backend"
+      - database
 
-  minimal-connector:
+  # api:
-    image: registry.gitlab.com/openstapps/minimal-connector:core-0.23
+  #   image: registry.gitlab.com/openstapps/openstapps/api:3.0.0
-    container_name: minimal-connector-0.23
+  #   links:
-    command: ["http://backend:3000", "minimal-connector", "f-u"]
+  #     - backend
 
-  app:
+  # minimal-connector:
-    image: registry.gitlab.com/openstapps/app/executable:core-0.23
+  #   image: registry.gitlab.com/openstapps/minimal-connector:core-0.23
-    expose:
+  #   container_name: minimal-connector-0.23
-      - 8100
+  #   command: ["http://backend:3000", "minimal-connector", "f-u"]
-    ports:
+
-      - 8100:8100
+  # app:
+  #   image: registry.gitlab.com/openstapps/app/executable:core-0.23
+  #   expose:
+  #     - 8100
+  #   ports:
+  #     - 8100:8100

examples/minimal-plugin/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @openstapps/minimal-plugin
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api-plugin@3.3.2
+- @openstapps/api@3.3.2
+
+## 3.3.0
+
+### Patch Changes
+
+- Updated dependencies [688bc5f2]
+  - @openstapps/api@3.3.0
+  - @openstapps/core@3.3.0
+  - @openstapps/api-plugin@3.3.0
+  - @openstapps/core-tools@3.3.0
+  - @openstapps/logger@3.0.0
+
+## 3.2.0
+
+### Patch Changes
+
+- Updated dependencies [912ae422]
+  - @openstapps/core@3.2.0
+  - @openstapps/api@3.2.0
+  - @openstapps/api-plugin@3.2.0
+  - @openstapps/core-tools@3.0.0
+  - @openstapps/logger@3.0.0
+
+## 3.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @openstapps/api@3.1.1
+  - @openstapps/api-plugin@3.1.1
+  - @openstapps/core@3.1.1
+
 ## 3.1.0
 
 ### Patch Changes

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "3.1.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",
@@ -35,7 +35,7 @@
     "@openstapps/logger": "workspace:*",
     "commander": "10.0.0",
     "express": "4.18.2",
-    "ts-node": "10.9.1"
+    "ts-node": "10.9.2"
   },
   "devDependencies": {
     "@openstapps/eslint-config": "workspace:*",
@@ -44,7 +44,7 @@
     "@types/express": "4.17.17",
     "@types/node": "18.15.3",
     "tsup": "6.7.0",
-    "typescript": "5.1.6"
+    "typescript": "5.4.2"
   },
   "tsup": {
     "entry": [

examples/minimal-plugin/tsconfig.json

@@ -1,3 +1,4 @@
 {
-  "extends": "@openstapps/tsconfig"
+  "extends": "@openstapps/tsconfig",
+  "exclude": ["lib", "app.js"]
 }

flake.lock

@@ -1,12 +1,30 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701336116,
+        "lastModified": 1709747860,
-        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
+        "narHash": "sha256-RT4zuBy579m+l8VyIQFOR66WXfcs4g1jntZUHjh6eoI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
+        "rev": "58ae79ea707579c40102ddf62d84b902a987c58b",
         "type": "github"
       },
       "original": {
@@ -18,8 +36,24 @@
     },
     "root": {
       "inputs": {
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,77 +1,71 @@
 {
   description = "A Nix-flake-based development environment for OpenStApps";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+  inputs = {
-  outputs = { self, nixpkgs }:
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    let
+    flake-utils.url = "github:numtide/flake-utils";
-      buildToolsVersion = "30.0.3";
+  };
-      overlays = [
+  outputs = {
-        (final: prev: rec {
+    self,
-          nodejs = prev.nodejs-18_x;
+    nixpkgs,
-          pnpm = prev.nodePackages.pnpm;
+    flake-utils,
-          chrome = prev.google-chrome;
+  }: let
-          firefox = prev.firefox;
+    aapt2buildToolsVersion = "33.0.2";
-          webkit = prev.epiphany; # Safari-ish browser
+  in
-          android = prev.androidenv.composeAndroidPackages {
+    flake-utils.lib.eachDefaultSystem (system: let
-            buildToolsVersions = [ "${buildToolsVersion}" ];
+      pkgs = import nixpkgs {
-            platformVersions = [ "33" ];
+        inherit system;
-          };
+        overlays = [
-          cypress = prev.cypress.overrideAttrs(cyPrev: rec {
+          (final: prev: rec {
-            version = "13.2.0";
+            fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
-            src = prev.fetchzip {
+            android = prev.androidenv.composeAndroidPackages {
-              url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
+              buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
-              hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
+              platformVersions = ["33"];
             };
-          });
+            cypress = prev.cypress.overrideAttrs (cyPrev: rec {
-        })
+              version = "13.2.0";
-      ];
+              src = prev.fetchzip {
-      # TODO: aarch64-linux, x68_64-darwin, aarch64-darwin
+                url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-      supportedSystems = [ "x86_64-linux" ];
+                hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
-      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+              };
-        pkgs = import nixpkgs {
+            });
-          inherit overlays system;
+            nodejs = prev.nodejs_18;
-          config = {
+          })
-            allowUnfree = true;
+        ];
-            android_sdk.accept_license = true;
+        config = {
-          };
+          allowUnfree = true;
+          android_sdk.accept_license = true;
         };
-      });
+      };
-    in
+      androidFhs = pkgs.buildFHSUserEnv {
-    {
+        name = "android-env";
-      devShells = forEachSupportedSystem ({ pkgs }:
+        targetPkgs = pkgs: with pkgs; [];
-      let
+        runScript = "bash";
-        python = (pkgs.python311.withPackages(ps: with ps; [ brotli fonttools ] ++ (with fonttools.optional-dependencies; [ ufo lxml unicode woff ])));
+        profile = ''
-      in
+          export ALLOW_NINJA_ENV=true
-      {
+          export USE_CCACHE=1
-        default = (pkgs.buildFHSUserEnv {
+          export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
-          name = "StApps Dev";
+        '';
-          targetPkgs = pkgs: with pkgs; [
+      };
-            nodejs
+    in {
-            pnpm
+      devShell = pkgs.mkShell rec {
-            python
+        nativeBuildInputs = [androidFhs];
-            docker
+        buildInputs = with pkgs; [
-            # tools
+          nodejs
-            curl
+          corepack
-            jq
+          # tools
-            # browsers
+          curl
-            firefox
+          jq
-            chrome
+          fontMin
-            webkit
+          cypress
-            cypress
+          # android
-            # android
+          jdk17
-            jdk17
+          android.androidsdk
-            android.androidsdk
+        ];
-            musl
+        ANDROID_JAVA_HOME = "${pkgs.jdk.home}";
-          ];
+        ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk";
-          runScript = "bash";
+        GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2";
-          profile = ''
+        CYPRESS_INSTALL_BINARY = "0";
-            export CYPRESS_INSTALL_BINARY=0
+        CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-            export CYPRESS_RUN_BINARY=${pkgs.cypress}/bin/Cypress
+      };
-            export ANDROID_SDK_ROOT=${pkgs.android.androidsdk}/libexec/android-sdk
+    });
-            export ANDROID_JAVA_HOME=${pkgs.jdk.home}
-            export DOCKER_HOST=unix:///run/user/1000/docker.sock
-            { dockerd-rootless & } 2>/dev/null
-          '';
-        }).env;
-      });
-    };
 }

frontend/app/.browserslistrc

@@ -5,10 +5,4 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
+> 0.5% in DE and last 2 major versions and supports es6 and not dead
-last 2 versions
-Firefox ESR
-not dead
-not kaios 2.5
-not op_mini all
-not IE 9-11

frontend/app/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @openstapps/app
 
+## 3.3.2
+
+### Patch Changes
+
+- 7afc24f1: fixed config version comparison
+  - @openstapps/core@3.3.2
+  - @openstapps/api@3.3.2
+
+## 3.3.0
+
+### Minor Changes
+
+- 688bc5f2: v3.3.0 changes
+
+### Patch Changes
+
+- Updated dependencies [688bc5f2]
+  - @openstapps/api@3.2.0
+  - @openstapps/core@3.2.0
+  - @openstapps/collection-utils@3.0.0
+
+## 3.2.0
+
+### Patch Changes
+
+- 689ac68b: pin alpine version to 3.18 and add healthchecks
+- Updated dependencies [912ae422]
+  - @openstapps/core@4.0.0
+  - @openstapps/api@4.0.0
+  - @openstapps/collection-utils@3.0.0
+
+## 3.1.2
+
+### Patch Changes
+
+- Fix for Android users not being able to log in
+
+## 3.1.1
+
+### Patch Changes
+
+- Fix version history offered by backend
+- Updated dependencies
+  - @openstapps/api@3.1.1
+  - @openstapps/core@3.1.1
+
+## 3.1.1
+
+### Patch Changes
+
+- last minute deployment changes
+
 ## 3.1.0
 
 ### Minor Changes

frontend/app/Dockerfile

@@ -1,7 +1,7 @@
 # Creates a docker image with only the app as an executable unit
 # Dependencies need to be installed beforehand
 # Needs to be build beforehand
-FROM node:18-alpine
+FROM node:18-alpine3.18
 
 WORKDIR /app
 COPY www/ /app/www

frontend/app/ICONS.md

@@ -50,11 +50,11 @@ the config file.
 Icon font minification is done automatically, but requires you to
 follow a few simple rules:
 
-1. Use the tagged template literal for referencing icon names in
+1. Use the type-safe proxy for referencing icon names in
    TypeScript files and code
 
 ```ts
-SCIcon`icon_name`;
+SCIcon.icon_name;
 ```
 
 2. When using `ion-icon` in HTML, reference either icons that went through

frontend/app/README.md

@@ -13,25 +13,25 @@ The StApps 1.x.x (legacy app, but current app in stores) is written using Ionic
 
 There are (`npm`) scripts defined to get the app running as quickly as possible. Those scripts (shortcuts for docker commands) are called using the syntax `npm run + <script-name>`. So we have the following commands available:
 
-```
+```sh
 npm run docker:pull
 ```
 
 which pulls the up-to-date image ([Dockerfile](Dockerfile)) which contains all the tools needed for building, serving and deploying the app.
 
-```
+```sh
 npm run docker:enter
 ```
 
 which enters the container on docker builder image, where we can run `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files), but also any other arbitrary commands with the tools available in the docker image.
 
-```
+```sh
 npm run docker:build
 ```
 
 which runs `npm install` (to install the required npm packages) and `npm build` (to build the app: convert into executable files) in the docker container which runs on the docker builder image.
 
-```
+```sh
 npm run docker:serve
 ```
 
@@ -39,7 +39,7 @@ which serves the app for running it in the browser. It basically runs `ionic ser
 
 ## How to build and start the app using the default backend?
 
-```
+```sh
 npm run build
 npm run start
 ```
@@ -86,52 +86,98 @@ addToIonicDB(
 
 You'll need to run _Chromium_ using
 
-```shell
+```sh
 pnpm chromium:no-cors
 ```
 
 ### Help, I can't log in!
 
 Login services will often block hosts not coming from the production
-server. You can circumvent this locally by using the `:virtual-host`
+server.
-scripts:
 
-```shell
+#### Web
+
+On the web you can circumvent this locally by using the `:virtual-host` scripts:
+
+```sh
 # Start the dev server on mobile.app.uni-frankfurt.de
 pnpm start:virtual-host
 # Run chromium with flags that redirect mobile.app.uni-frankfurt.de to localhost:8100
 pnpm chromium:virtual-host
 ```
 
+#### Android
+
+On Android you will need to change the `custom_url_scheme` values
+to `de.unifrankfurt.app` in the following files:
+
+- `android/app/src/main/res/values/strings.xml`
+- `src/environment/environment.ts`
+
+Then start the app normally as you would
+
+```sh
+pnpm run:android
+```
+
+**This alone will not make auth work**, only the login flow.
+
+If you need to test login, you have to disable live reload:
+
+```sh
+pnpm ionic capacitor run android
+```
+
+_**CAUTION:** a remote chrome debugging session can in some
+cases hijack the device's ADB connection. If the connection
+fails for no obvious reason, close chrome and uninstall the
+app, then try again._
+
+#### iOS
+
+On Android you will need to change the `custom_url_scheme` value in
+`src/environment/environment.ts` as well as the `CFBundleURLTypes`
+in `ios/App/App/Info.plist`.
+
+- make sure to remove any `Info.plist.orig` as capacitor might override
+  the modified `Info.plist` with that.
+- make sure you have a valid device in XCode (Simulator or real device).
+
+After that, run
+
+```sh
+pnpm run:ios
+```
+
 ### Running the app
 
 Install the npm packages needed for running the app (as for any other node project which uses npm):
 
-```
+```sh
 npm install
 ```
 
 Check the code for linter issues:
 
-```
+```sh
 npm run lint
 ```
 
 Automatically fix linter issues (those where autofix is possible):
 
-```
+```sh
 npm run lint:fix
 ```
 
 Build the app (transpile etc.):
 
-```
+```sh
 npm run build
 ```
 
 Open the app in the browser:
 
-```
+```sh
 ionic serve
 ```
 
@@ -139,7 +185,7 @@ ionic serve
 
 Run the app for testing on an android device (with live reload in the webview / device, when files are changed):
 
-```
+```sh
 npm run build # if needed
 npm run resources:android # generate needed resources (icons and splashscreens)
 npm run docker:run:android # runs "ionic capacitor run android --livereload --external" on a selected device
@@ -159,7 +205,7 @@ Besides that, it is possible to monitor processes (and so the processes related
 
 Build the (debug) app for testing on an android device (creates an APK file in the android's build outputs path):
 
-```
+```sh
 npm run docker:build:android
 ```
 
@@ -169,13 +215,13 @@ The mentioned `docker:*:android` npm commands are executed in a docker container
 
 Execute unit tests:
 
-```
+```sh
 npm test
 ```
 
 Execute e2e tests:
 
-```
+```sh
 npm run e2e
 ```
 

frontend/app/android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "de.anyschool.app"
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "de.anyschool.app"
         minSdkVersion rootProject.ext.minSdkVersion

frontend/app/android/app/capacitor.build.gradle

@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-community-screen-brightness')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
     implementation project(':capacitor-clipboard')
@@ -21,6 +22,7 @@ dependencies {
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-network')
     implementation project(':capacitor-preferences')
+    implementation project(':capacitor-screen-orientation')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':transistorsoft-capacitor-background-fetch')

frontend/app/android/app/src/main/assets/capacitor.plugins.json

@@ -1,4 +1,8 @@
 [
+	{
+		"pkg": "@capacitor-community/screen-brightness",
+		"classpath": "com.elylucas.capscreenbrightness.ScreenBrightnessPlugin"
+	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"
@@ -47,6 +51,10 @@
 		"pkg": "@capacitor/preferences",
 		"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
 	},
+	{
+		"pkg": "@capacitor/screen-orientation",
+		"classpath": "com.capacitorjs.plugins.screenorientation.ScreenOrientationPlugin"
+	},
 	{
 		"pkg": "@capacitor/share",
 		"classpath": "com.capacitorjs.plugins.share.SharePlugin"

frontend/app/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

frontend/app/android/capacitor.settings.gradle

@@ -1,51 +1,57 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.5.0_@capacitor+core@5.5.0/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@6.1.1_@capacitor+core@6.1.1/node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-community-screen-brightness'
+project(':capacitor-community-screen-brightness').projectDir = new File('../../../node_modules/.pnpm/@capacitor-community+screen-brightness@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor-community/screen-brightness/android')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/app/android')
 
 include ':capacitor-browser'
-project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@5.1.0_@capacitor+core@5.5.0/node_modules/@capacitor/browser/android')
+project(':capacitor-browser').projectDir = new File('../../../node_modules/.pnpm/@capacitor+browser@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/browser/android')
 
 include ':capacitor-clipboard'
-project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/clipboard/android')
+project(':capacitor-clipboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+clipboard@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/clipboard/android')
 
 include ':capacitor-device'
-project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/device/android')
+project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/device/android')
 
 include ':capacitor-dialog'
-project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/dialog/android')
+project(':capacitor-dialog').projectDir = new File('../../../node_modules/.pnpm/@capacitor+dialog@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/dialog/android')
 
 include ':capacitor-filesystem'
-project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.0/node_modules/@capacitor/filesystem/android')
+project(':capacitor-filesystem').projectDir = new File('../../../node_modules/.pnpm/@capacitor+filesystem@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/filesystem/android')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+geolocation@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/geolocation/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-local-notifications'
-project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/local-notifications/android')
+project(':capacitor-local-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+local-notifications@6.0.0_@capacitor+core@6.1.1/node_modules/@capacitor/local-notifications/android')
 
 include ':capacitor-network'
-project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/network/android')
+project(':capacitor-network').projectDir = new File('../../../node_modules/.pnpm/@capacitor+network@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/network/android')
 
 include ':capacitor-preferences'
-project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/preferences/android')
+project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/preferences/android')
+
+include ':capacitor-screen-orientation'
+project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/.pnpm/@capacitor+screen-orientation@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/screen-orientation/android')
 
 include ':capacitor-share'
-project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/share/android')
+project(':capacitor-share').projectDir = new File('../../../node_modules/.pnpm/@capacitor+share@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/share/android')
 
 include ':capacitor-splash-screen'
-project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.0/node_modules/@capacitor/splash-screen/android')
+project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@6.0.1_@capacitor+core@6.1.1/node_modules/@capacitor/splash-screen/android')
 
 include ':transistorsoft-capacitor-background-fetch'
-project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@1.0.2_@capacitor+core@5.5.0/node_modules/@transistorsoft/capacitor-background-fetch/android')
+project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../../../node_modules/.pnpm/@transistorsoft+capacitor-background-fetch@5.2.0_@capacitor+core@6.1.1/node_modules/@transistorsoft/capacitor-background-fetch/android')
 
 include ':capacitor-secure-storage-plugin'
-project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.8.1_@capacitor+core@5.5.0/node_modules/capacitor-secure-storage-plugin/android')
+project(':capacitor-secure-storage-plugin').projectDir = new File('../../../node_modules/.pnpm/capacitor-secure-storage-plugin@0.9.0_@capacitor+core@6.1.1/node_modules/capacitor-secure-storage-plugin/android')

frontend/app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontend/app/android/variables.gradle

@@ -1,14 +1,14 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
+    compileSdkVersion = 34
-    targetSdkVersion = 33
+    targetSdkVersion = 34
-    androidxActivityVersion = '1.7.0'
+    androidxActivityVersion = '1.8.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.10.0'
+    androidxCoreVersion = '1.12.0'
-    androidxFragmentVersion = '1.5.6'
+    androidxFragmentVersion = '1.6.2'
-    coreSplashScreenVersion = '1.0.0'
+    coreSplashScreenVersion = '1.0.1'
-    androidxWebkitVersion = '1.6.1'
+    androidxWebkitVersion = '1.9.0'
     junitVersion = '4.13.2'
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'

frontend/app/angular.json

@@ -21,10 +21,13 @@
             "allowedCommonJsDependencies": [
               "moment",
               "opening_hours",
-              "leaflet",
+              "localforage",
-              "leaflet.markercluster",
+              "i18next",
-              "localforge",
+              "semver",
-              "guid-typescript"
+              "suncalc",
+              "guid-typescript",
+              "fast-deep-equal",
+              "maplibre-gl"
             ],
             "aot": true,
             "assets": [
@@ -32,24 +35,13 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "./node_modules/leaflet/dist/images",
-                "output": "assets/"
               }
             ],
             "styles": [
-              {
-                "input": "src/theme/variables.scss",
-                "inject": true
-              },
               {
                 "input": "src/global.scss",
                 "inject": true
-              },
+              }
-              "./node_modules/leaflet/dist/leaflet.css",
-              "./node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css"
             ]
           },
           "configurations": {
@@ -97,20 +89,20 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "app:build:production"
+              "buildTarget": "app:build:production"
             },
             "development": {
-              "browserTarget": "app:build:development"
+              "buildTarget": "app:build:development"
             },
             "ci": {
-              "browserTarget": "app:build"
+              "buildTarget": "app:build"
             },
             "fake": {
-              "browserTarget": "app:build:fake"
+              "buildTarget": "app:build:fake"
             }
           },
           "defaultConfiguration": "development"
@@ -132,11 +124,6 @@
                 "glob": "**/*",
                 "input": "src/assets",
                 "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "./node_modules/leaflet/dist/images",
-                "output": "assets/"
               }
             ]
           }

frontend/app/cypress.config.ts

@@ -28,6 +28,7 @@ export default defineConfig({
     fixturesFolder: 'cypress/fixtures',
     defaultCommandTimeout: 20_000,
     specPattern: 'cypress/integration/**/*.spec.ts',
+    blockHosts: ['mobile.server.uni-frankfurt.de'],
     /*setupNodeEvents(on, config) {
       on('task', {
         log(message) {

frontend/app/cypress/BACKEND.md

@@ -0,0 +1,20 @@
+# Backend Mocking
+
+The backend _must_ be mocked using fixtures or other methods.
+
+You can use
+
+```typescript
+cy.interceptMultiSearch(...)
+cy.interceptSearch({extend: 'fixture', fixture: 'fixture', alias: 'alias'})
+cy.interceptGet({uid})
+```
+
+For mocking the responses based on a request.
+
+Paths in the commands will be relative to those, so
+`cy.interceptSearch({extend: 'request', fixture: 'response'})`
+will actually pull the fixtures from `request.search.req.json`
+and `response.search.res.json` respectively.
+
+If `fixture` is omitted, an empty response will be returned.

frontend/app/cypress/PITFALLS.md

@@ -0,0 +1,29 @@
+# A list of (possibly) common pitfalls
+
+## The component is not updating
+
+### Calling Cypress invoke will not trigger change detection
+
+Rewrite
+
+```typescript
+cy.get('component-selector').component().invoke('someFunction');
+```
+
+Into
+
+```typescript
+cy.get('component-selector')
+  .component()
+  .runInsideAngular(component => component.someFunction());
+```
+
+## The backend is unreachable
+
+See `BACKEND.md`, direct calls to backend are prohibited.
+
+## The search page doesn't work
+
+Run `cy.patchSearchPage()` after visiting the search page.
+It set the due time to zero so that the component
+won't wait for someone to type more.

frontend/app/cypress/fixtures/canteen/all.search.req.json

@@ -0,0 +1,46 @@
+{
+  "filter": {
+    "arguments": {
+      "filters": [
+        {
+          "arguments": {
+            "filters": [
+              {
+                "arguments": {
+                  "field": "categories",
+                  "value": "canteen"
+                },
+                "type": "value"
+              },
+              {
+                "arguments": {
+                  "field": "categories",
+                  "value": "student canteen"
+                },
+                "type": "value"
+              },
+              {
+                "arguments": {
+                  "field": "categories",
+                  "value": "cafe"
+                },
+                "type": "value"
+              },
+              {
+                "arguments": {
+                  "field": "categories",
+                  "value": "restaurant"
+                },
+                "type": "value"
+              }
+            ],
+            "operation": "or"
+          },
+          "type": "boolean"
+        }
+      ],
+      "operation": "and"
+    },
+    "type": "boolean"
+  }
+}

frontend/app/cypress/fixtures/canteen/dishes.multi.req.json

@@ -0,0 +1,31 @@
+{
+  "*": {
+    "filter": {
+      "arguments": {
+        "filters": [
+          {
+            "arguments": {
+              "field": "offers.inPlace.uid"
+            },
+            "type": "value"
+          },
+          {
+            "arguments": {
+              "field": "type",
+              "value": "dish"
+            },
+            "type": "value"
+          },
+          {
+            "arguments": {
+              "field": "offers.availabilityRange"
+            },
+            "type": "availability"
+          }
+        ],
+        "operation": "and"
+      },
+      "type": "boolean"
+    }
+  }
+}

frontend/app/cypress/fixtures/canteen/dishes.multi.res.json

@@ -0,0 +1,889 @@
+{
+  "2020-01-01T12:00:00.000Z": {
+    "data": [
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "db0c03b1-b7cc-5513-b3e6-71d6020520ab",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+            "name": "vegetarian"
+          }
+        ],
+        "nutrition": {
+          "calories": 835,
+          "carbohydrateContent": 99.2,
+          "fatContent": 33,
+          "proteinContent": 33.4,
+          "saltContent": 3.7,
+          "saturatedFatContent": 9.1,
+          "sugarContent": 7.3
+        },
+        "additives": ["gluten (A)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": ["Glutenhaltige Getreide (A)", "Milch u. Milcherzeugnisse (G)"],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+                "name": "vegetarisch"
+              }
+            ],
+            "name": "Pizza alla Pugliese (A,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.829Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Pugliese pizza (A,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "b798cc94-ab0a-5fdd-b9d8-127ae8940f47",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+            "name": "pork"
+          }
+        ],
+        "nutrition": {
+          "calories": 876,
+          "carbohydrateContent": 100.4,
+          "fatContent": 32.7,
+          "proteinContent": 42.6,
+          "saltContent": 4,
+          "saturatedFatContent": 6.3,
+          "sugarContent": 8.6
+        },
+        "additives": ["preserved (2)", "with antioxidants (3)", "gluten (A)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "konserviert (2)",
+              "mit Antioxidationsmittel (3)",
+              "Glutenhaltige Getreide (A)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+                "name": "Schwein"
+              }
+            ],
+            "name": "Pizza Carciofi e Prosciutto (2,3,A,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.830Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Artichoke-ham pizza (2,3,A,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "e5e40978-119b-5537-a3c6-87725f797990",
+        "nutrition": {
+          "calories": 899,
+          "carbohydrateContent": 98.2,
+          "fatContent": 36.7,
+          "proteinContent": 42.4,
+          "saltContent": 4.7,
+          "saturatedFatContent": 6.8,
+          "sugarContent": 8.1
+        },
+        "additives": ["gluten (A)", "fish (D)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "Glutenhaltige Getreide (A)",
+              "Fisch u. Fischerzeugnisse (D)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "name": "Pizza Salmone e Spinaci (A,D,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.830Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Salami-spinach pizza (A,D,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "94629b59-e0a7-538e-b057-018e268297ca",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+            "name": "vegetarian"
+          }
+        ],
+        "nutrition": {
+          "calories": 1399,
+          "carbohydrateContent": 148.8,
+          "fatContent": 69.2,
+          "proteinContent": 40.2,
+          "saltContent": 1,
+          "saturatedFatContent": 16.3,
+          "sugarContent": 7.7
+        },
+        "additives": ["gluten (A)", "egg (C)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "Glutenhaltige Getreide (A)",
+              "Eier u. Eiererzeugnisse (C)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+                "name": "vegetarisch"
+              }
+            ],
+            "name": "Tagliatelle Pesto verde de Francoforte (A,C,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.834Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Tagliatelle w/ Frankfurt-style green pesto (A,C,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "34d08548-07fa-51b7-ad88-cfdb6c6ed62b",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+            "name": "vegetarian"
+          }
+        ],
+        "nutrition": {
+          "calories": 849,
+          "carbohydrateContent": 103.3,
+          "fatContent": 37.4,
+          "proteinContent": 33.5,
+          "saltContent": 4.7,
+          "saturatedFatContent": 2.6,
+          "sugarContent": 11.6
+        },
+        "additives": [
+          "preserved (2)",
+          "with antioxidants (3)",
+          "gluten (A)",
+          "milk (G)",
+          "sulphur dioxide / sulphite (L)"
+        ],
+        "translations": {
+          "de": {
+            "additives": [
+              "konserviert (2)",
+              "mit Antioxidationsmittel (3)",
+              "Glutenhaltige Getreide (A)",
+              "Milch u. Milcherzeugnisse (G)",
+              "Schwefeldioxid / Sulfit (L)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+                "name": "vegetarisch"
+              }
+            ],
+            "name": "Pizza Antipasti (2,3,A,G,L)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.828Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Antipasti pizza (2,3,A,G,L)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "b58db64e-47bc-565a-abd7-6ca79211217d",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+            "name": "pork"
+          }
+        ],
+        "nutrition": {
+          "calories": 930,
+          "carbohydrateContent": 100.5,
+          "fatContent": 41.4,
+          "proteinContent": 35.9,
+          "saltContent": 4.7,
+          "saturatedFatContent": 6.6,
+          "sugarContent": 9
+        },
+        "additives": [
+          "with artificial colouring (1)",
+          "preserved (2)",
+          "with antioxidants (3)",
+          "blackened (6)",
+          "gluten (A)",
+          "milk (G)"
+        ],
+        "translations": {
+          "de": {
+            "additives": [
+              "mit Farbstoff (1)",
+              "konserviert (2)",
+              "mit Antioxidationsmittel (3)",
+              "geschwärzt (6)",
+              "Glutenhaltige Getreide (A)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+                "name": "Schwein"
+              }
+            ],
+            "name": "Pizza alla Diavola (1,2,3,6,A,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.827Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Diavola pizza (1,2,3,6,A,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "734fc8f9-0f4d-54aa-bd8b-87431c7997bb",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+            "name": "vegetarian"
+          }
+        ],
+        "nutrition": {
+          "calories": 581,
+          "carbohydrateContent": 79.9,
+          "fatContent": 16.5,
+          "proteinContent": 28.3,
+          "saltContent": 3.8,
+          "saturatedFatContent": 4.4,
+          "sugarContent": 13.8
+        },
+        "additives": ["gluten (A)", "egg (C)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "Glutenhaltige Getreide (A)",
+              "Eier u. Eiererzeugnisse (C)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+                "name": "vegetarisch"
+              }
+            ],
+            "name": "Cannelloni Ricotta-Spinat (A,C,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.832Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Ricotta-spinach cannelloni (A,C,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "738be5ff-6b35-5249-8f0d-b5e5830f9f4d",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/beef.svg",
+            "name": "beef"
+          }
+        ],
+        "nutrition": {
+          "calories": 880,
+          "carbohydrateContent": 94.3,
+          "fatContent": 36.9,
+          "proteinContent": 39.9,
+          "saltContent": 0.8,
+          "saturatedFatContent": 9.9,
+          "sugarContent": 10.2
+        },
+        "additives": ["gluten (A)", "egg (C)", "milk (G)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "Glutenhaltige Getreide (A)",
+              "Eier u. Eiererzeugnisse (C)",
+              "Milch u. Milcherzeugnisse (G)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/beef.svg",
+                "name": "Rind"
+              }
+            ],
+            "name": "Spaghetti Bolognese (A,C,G)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.833Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Spaghetti bolognese (A,C,G)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "7a95dd93-83d3-560c-8069-038b51d1b46b",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+            "name": "vegetarian"
+          }
+        ],
+        "nutrition": {
+          "calories": 349,
+          "carbohydrateContent": 5.3,
+          "fatContent": 29.9,
+          "proteinContent": 10.6,
+          "saltContent": 0.3,
+          "saturatedFatContent": 18.9,
+          "sugarContent": 3.6
+        },
+        "additives": ["gluten (A)", "milk (G)", "celery (I)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "Glutenhaltige Getreide (A)",
+              "Milch u. Milcherzeugnisse (G)",
+              "Sellerie u. Sellerieerzeugnisse (I)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/vegetarian.svg",
+                "name": "vegetarisch"
+              }
+            ],
+            "name": "Flammkuchen mit Spinat und Mozzarella (A,G,I)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.832Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Spinach-mozzarella tarte flambée (A,G,I)",
+        "categories": ["main dish"],
+        "type": "dish"
+      },
+      {
+        "offers": [
+          {
+            "availability": "in stock",
+            "availabilityRange": {
+              "gte": "2023-02-24T09:00:00.000Z",
+              "lte": "2023-02-24T20:00:00.000Z"
+            },
+            "inPlace": {
+              "address": {
+                "addressCountry": "Deutschland",
+                "addressLocality": "Frankfurt am Main",
+                "addressRegion": "Hessen",
+                "postalCode": "60323",
+                "streetAddress": "Kaffeebar Alfredo/Cocktailbar Theodor-W.-Adorno-Platz 2"
+              },
+              "alternateNames": ["Alfredo Anbau Casino"],
+              "categories": ["cafe"],
+              "geo": {
+                "point": {
+                  "coordinates": [8.666987121105194, 50.12725203226799],
+                  "type": "Point"
+                }
+              },
+              "name": "Alfredo Anbau Casino",
+              "openingHours": "Mo-Fr 08:30-21:00; Sa-Su off; 2023 Feb 13 - 2023 Apr 06 Mo-Fr 10:00-21:00; 2023 Feb 13 - 2023 Apr 06 Sa-Su off",
+              "type": "room",
+              "uid": "86464b64-da1e-5578-a5c4-eec23457f596"
+            },
+            "prices": {
+              "default": 4.4,
+              "employee": 2.2,
+              "guest": 1.1,
+              "student": 3.3
+            },
+            "provider": {
+              "name": "Studierendenwerk Frankfurt am Main",
+              "type": "organization",
+              "uid": "0405339e-f1f3-54a6-9ac1-a230e2bda5c0"
+            }
+          }
+        ],
+        "uid": "f430dde2-e17e-5406-84ae-484e1f095966",
+        "characteristics": [
+          {
+            "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+            "name": "pork"
+          }
+        ],
+        "nutrition": {
+          "calories": 325,
+          "carbohydrateContent": 5.2,
+          "fatContent": 27.2,
+          "proteinContent": 11.3,
+          "saltContent": 0.9,
+          "saturatedFatContent": 16.4,
+          "sugarContent": 4.1
+        },
+        "additives": ["preserved (2)", "gluten (A)", "milk (G)", "celery (I)"],
+        "translations": {
+          "de": {
+            "additives": [
+              "konserviert (2)",
+              "Glutenhaltige Getreide (A)",
+              "Milch u. Milcherzeugnisse (G)",
+              "Sellerie u. Sellerieerzeugnisse (I)"
+            ],
+            "characteristics": [
+              {
+                "image": "https://mobile.server.uni-frankfurt.de/_static/canteen/pork.svg",
+                "name": "Schwein"
+              }
+            ],
+            "name": "Flammkuchen mit Speck und Zwiebeln (2,A,G,I)"
+          }
+        },
+        "origin": {
+          "indexed": "2023-02-24T17:00:07.831Z",
+          "name": "Studierendenwerk Frankfurt am Main",
+          "type": "remote"
+        },
+        "name": "Bacon-onion tart flambée (2,A,G,I)",
+        "categories": ["main dish"],
+        "type": "dish"
+      }
+    ],
+    "facets": [
+      {
+        "buckets": [
+          {
+            "count": 10,
+            "key": "dish"
+          }
+        ],
+        "field": "type"
+      },
+      {
+        "buckets": [
+          {
+            "count": 10,
+            "key": "main dish"
+          }
+        ],
+        "field": "categories",
+        "onlyOnType": "dish"
+      },
+      {
+        "buckets": [
+          {
+            "count": 10,
+            "key": "cafe"
+          }
+        ],
+        "field": "offers.inPlace.categories",
+        "onlyOnType": "dish"
+      }
+    ],
+    "pagination": {
+      "count": 10,
+      "offset": 0,
+      "total": 10
+    },
+    "stats": {
+      "time": 2
+    }
+  }
+}