diff --git a/TelosysTools/models/InfiniMotion/CommandListStatistics.entity b/TelosysTools/models/InfiniMotion/CommandListStatistics.entity index 0736c5a..f5e6dfb 100644 --- a/TelosysTools/models/InfiniMotion/CommandListStatistics.entity +++ b/TelosysTools/models/InfiniMotion/CommandListStatistics.entity @@ -1,4 +1,6 @@ #Command @Extends(Command) CommandListStatistics { + movies: boolean { @NotNull }; + shows: boolean { @NotNull }; } diff --git a/TelosysTools/models/InfiniMotion/StatisticsFilm.entity b/TelosysTools/models/InfiniMotion/StatisticsFilm.entity index 24b01dc..321e4dd 100644 --- a/TelosysTools/models/InfiniMotion/StatisticsFilm.entity +++ b/TelosysTools/models/InfiniMotion/StatisticsFilm.entity @@ -2,7 +2,8 @@ #Statistics StatisticsFilm { - movie: Film {}; - tickets: Eintrittskarte[] {}; + movieId: int { @NotNull }; + movieTitle: string { @NotNull }; + tickets: int { @NotNull }; earnings: int { @NotNull }; } diff --git a/TelosysTools/models/InfiniMotion/StatisticsFilmReduced.entity b/TelosysTools/models/InfiniMotion/StatisticsFilmReduced.entity deleted file mode 100644 index c328382..0000000 --- a/TelosysTools/models/InfiniMotion/StatisticsFilmReduced.entity +++ /dev/null @@ -1,8 +0,0 @@ -// Entity StatisticsFilmReduced - -#AddonModel -StatisticsFilmReduced { - movie: Film {}; - tickets: int { @NotNull }; - earnings: int { @NotNull }; -} diff --git a/TelosysTools/models/InfiniMotion/StatisticsReduced.entity b/TelosysTools/models/InfiniMotion/StatisticsReduced.entity deleted file mode 100644 index ef86293..0000000 --- a/TelosysTools/models/InfiniMotion/StatisticsReduced.entity +++ /dev/null @@ -1,7 +0,0 @@ -// Entity OmdbMovie - -#AddonModel -StatisticsReduced { - movies: StatisticsFilmReduced[] {}; - shows: StatisticsVorstellungReduced[] {}; -} diff --git a/TelosysTools/models/InfiniMotion/StatisticsVorstellung.entity b/TelosysTools/models/InfiniMotion/StatisticsVorstellung.entity index 1833a47..a791f4b 100644 --- a/TelosysTools/models/InfiniMotion/StatisticsVorstellung.entity +++ b/TelosysTools/models/InfiniMotion/StatisticsVorstellung.entity @@ -2,7 +2,10 @@ #Statistics StatisticsVorstellung { - show: Vorstellung { }; - tickets: Eintrittskarte[] { }; + showId: int { @NotNull }; + showHallName: string { @NotNull }; + showStart: timestamp { @NotNull }; + movieTitle: string { @NotNull }; + tickets: int { @NotNull }; earnings: int { @NotNull }; } diff --git a/TelosysTools/models/InfiniMotion/StatisticsVorstellungReduced.entity b/TelosysTools/models/InfiniMotion/StatisticsVorstellungReduced.entity deleted file mode 100644 index 53ba242..0000000 --- a/TelosysTools/models/InfiniMotion/StatisticsVorstellungReduced.entity +++ /dev/null @@ -1,8 +0,0 @@ -// Entity StatisticsVorstellungReduced - -#AddonModel -StatisticsVorstellungReduced { - show: Vorstellung {} ; - tickets: int { @NotNull }; - earnings: int { @NotNull }; -} diff --git a/TelosysTools/telosys-tools.cfg b/TelosysTools/telosys-tools.cfg index 395b71f..09e6ee1 100644 --- a/TelosysTools/telosys-tools.cfg +++ b/TelosysTools/telosys-tools.cfg @@ -22,7 +22,7 @@ ENTITY_PKG=de.infinimotion.model.bean ProjectVariable.MAVEN_ARTIFACT_ID=model ProjectVariable.MAVEN_GROUP_ID=de.infinimotion ProjectVariable.PROJECT_NAME=infinimodel -ProjectVariable.PROJECT_VERSION=0.0.110 +ProjectVariable.PROJECT_VERSION=0.0.116 ProjectVariable.REST_SERVER_PORT=3000 ProjectVariable.REST_API_ROOT=/api/v1 ProjectVariable.REST_URL_ROOT=http://localhost:3000 diff --git a/TelosysTools/templates/infinimotion/frontend/package_json.vm b/TelosysTools/templates/infinimotion/frontend/package_json.vm index 1cd1571..ce80096 100644 --- a/TelosysTools/templates/infinimotion/frontend/package_json.vm +++ b/TelosysTools/templates/infinimotion/frontend/package_json.vm @@ -15,12 +15,14 @@ "author": "Lennart Heinrich", "license": "ISC", "devDependencies": { - "@types/node": "^24.8.0", + "@types/node": "^24.10.1", "ts-node": "^10.9.2", - "tsup": "^8.5.0", + "tsup": "^8.5.1", "typescript": "^5.9.3" }, - "repository": "https://github.com/InfiniMotion/model.git", + "repository": { + "url": "https://github.com/InfiniMotion/model.git" + }, "publishConfig": { "registry": "https://git.infinimotion.de/api/packages/infinimotion/npm/" } diff --git a/TelosysTools/templates/infinimotion/persistence/statistics_entity_java.vm b/TelosysTools/templates/infinimotion/persistence/statistics_entity_java.vm index 189029f..5369f57 100644 --- a/TelosysTools/templates/infinimotion/persistence/statistics_entity_java.vm +++ b/TelosysTools/templates/infinimotion/persistence/statistics_entity_java.vm @@ -9,6 +9,7 @@ */ package ${target.javaPackageFromFolder("persistence/${SRC}")}; +import java.time.LocalDateTime; import java.util.List; import io.quarkus.mongodb.panache.PanacheMongoEntity;