From 7cf36574847d8390b4db279686b3202ff7ba7d11 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Wed, 6 Mar 2024 15:26:18 +0100 Subject: [PATCH] First commit --- .gitignore | 6 + Dockerfile | 47 +++ LICENSE | 202 ++++++++++ README.md | 52 +++ build.gradle.kts | 46 +++ buildSrc/build.gradle.kts | 39 ++ buildSrc/src/main/kotlin/Versions.kt | 42 ++ dashboard.yml | 19 + data-dashboard-backend/.dockerignore | 8 + data-dashboard-backend/build.gradle.kts | 32 ++ data-dashboard-backend/dashboard.yml | 14 + .../dev/config/keystore.p12 | Bin 0 -> 5393 bytes .../dev/config/oauth_client_details.csv | 2 + .../dev/docker-compose-postgres.yml | 19 + .../datadashboard/api/DashboardApi.kt | 49 +++ .../datadashboard/api/api/ObservationDto.kt | 40 ++ .../datadashboard/api/api/VariableDto.kt | 37 ++ .../datadashboard/api/api/VariableListDto.kt | 24 ++ .../api/config/DashboardApiConfig.kt | 38 ++ .../api/config/DashboardServiceConfig.kt | 34 ++ .../api/domain/ObservationRepository.kt | 48 +++ .../api/domain/mapper/Extensions.kt | 56 +++ .../api/domain/model/Observation.kt | 73 ++++ .../api/domain/model/Variable.kt | 67 ++++ .../enhancer/DashBoardApiEnhancerFactory.kt | 49 +++ .../api/enhancer/DashboardApiEnhancer.kt | 56 +++ .../api/resource/ObservationResource.kt | 46 +++ .../api/service/ObservationService.kt | 37 ++ .../changes/20220309-create-database.xml | 63 +++ .../changes/20220321-insert-mock-data.xml | 40 ++ .../changes/20220321-observations.csv | 370 ++++++++++++++++++ .../changelog/changes/20220321-variables.csv | 124 ++++++ .../changelog/changes/db.changelog-master.xml | 29 ++ .../api/resource/ObservationResourceTest.kt | 120 ++++++ .../api/service/ObservationServiceTest.kt | 95 +++++ docker-compose.yml | 21 + gradle.properties | 24 ++ gradle/libs.versions.toml | 11 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 25 ++ gradlew | 251 ++++++++++++ settings.gradle.kts | 28 ++ 42 files changed, 2383 insertions(+) create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/Versions.kt create mode 100644 dashboard.yml create mode 100644 data-dashboard-backend/.dockerignore create mode 100644 data-dashboard-backend/build.gradle.kts create mode 100644 data-dashboard-backend/dashboard.yml create mode 100644 data-dashboard-backend/dev/config/keystore.p12 create mode 100644 data-dashboard-backend/dev/config/oauth_client_details.csv create mode 100644 data-dashboard-backend/dev/docker-compose-postgres.yml create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/DashboardApi.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableDto.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableListDto.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardApiConfig.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardServiceConfig.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Variable.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashBoardApiEnhancerFactory.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashboardApiEnhancer.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt create mode 100644 data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/service/ObservationService.kt create mode 100644 data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml create mode 100644 data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-insert-mock-data.xml create mode 100644 data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-observations.csv create mode 100644 data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-variables.csv create mode 100644 data-dashboard-backend/src/main/resources/db/changelog/changes/db.changelog-master.xml create mode 100644 data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt create mode 100644 data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt create mode 100644 docker-compose.yml create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b672924 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.idea +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3fb75d3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,47 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM --platform=$BUILDPLATFORM gradle:8.4-jdk17 as builder + +RUN mkdir /code +WORKDIR /code + +ENV GRADLE_USER_HOME=/code/.gradlecache \ + GRADLE_OPTS="-Djdk.lang.Process.launchMechanism=vfork -Dorg.gradle.vfs.watch=false" + +COPY ./buildSrc /code/buildSrc +COPY ./build.gradle.kts ./settings.gradle.kts ./gradle.properties /code/ +COPY ./buildSrc /code/buildSrc +COPY data-dashboard-backend/build.gradle.kts /code/data-dashboard-backend/ +RUN gradle downloadDependencies copyDependencies startScripts + +COPY data-dashboard-backend/src /code/data-dashboard-backend/src + +RUN gradle jar + +FROM eclipse-temurin:17-jre + +LABEL description="RADAR-base data dashboard backend application" + +# Override JAVA_OPTS to set heap parameters, for example +ENV JAVA_OPTS="" \ + AUTHORIZER_APP_BACKEND_OPTS="" + +COPY --from=builder /code/data-dashboard-backend/build/scripts/* /usr/bin/ +COPY --from=builder /code/data-dashboard-backend/build/third-party/* /usr/lib/ +COPY --from=builder /code/data-dashboard-backend/build/libs/data-dashboard-backend-*.jar /usr/lib/ + +USER 101 + +EXPOSE 9000 + +ENTRYPOINT ["data-dashboard-backend"] diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README.md b/README.md new file mode 100644 index 0000000..78921c5 --- /dev/null +++ b/README.md @@ -0,0 +1,52 @@ +# RADAR-base Data Dashboard backend + +Application that provides a REST API to provide Variables (measured modalities) and related Observations (measurements) +for Subjects (participants). The data layer connects to the TimescaleDB database that is provisioned with (a subset of) +the data from the RADAR-base kafka service.[]\ + +## Features supported + +1. API for retrieving variables and observations for a single subject. +2. Has liquibase support to enable seamless database schema migration. + +## APIs to be used by REST Source-Connectors + +Data dashboard applications can use the APIs as follows. + +`GET */subject/{subjectId}/variables/observations` + +Get all configured users for a particular source-type use `GET */users?source-type={source-type}` + +## Installation + +To install functional RADAR-base Rest-Sources Authorizer application with minimal dependencies from source, please use +the `docker-compose.yml` under the root directory. + +Copy the `docker/etc/rest-source-authorizer/authorizer.yml.template` +into `docker/etc/rest-source-authorizer/authorizer.yml` and modify the `restSourceClients.FitBit.clientId` +and `restSourceClients.FitBit.clientSecret` with your Fitbit client application credentials. Then start the +docker-compose stack: + +```bash +docker-compose up -d --build +``` + +## Authorization + +All users registered with the application will be authorized against ManagementPortal for integrity and security. + +### Registering OAuth Clients with ManagementPortal + +To add new OAuth clients, you can add at runtime through the UI on Management Portal, or you can add them to the OAuth +clients file referenced by the `MANAGEMENTPORTAL_OAUTH_CLIENTS_FILE` configuration option. For more info, +see [officail docs](https://github.com/RADAR-base/ManagementPortal#oauth-clients) +The OAuth client for authorizer-app-backend should have the following properties. + +```properties +client-id:data_dashboard_api +client-secret:Confidential +grant-type:client_credentials +resources:res_DataDashboardAPI +scope:MEASUREMENT.READ +``` + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6f18ee8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +import org.radarbase.gradle.plugin.radarKotlin + +plugins { + id("org.radarbase.radar-root-project") version Versions.radarCommons + id("org.radarbase.radar-dependency-management") version Versions.radarCommons + id("org.radarbase.radar-kotlin") version Versions.radarCommons apply false + kotlin("plugin.serialization") version Versions.kotlin apply false + kotlin("plugin.noarg") version Versions.kotlin apply false + kotlin("plugin.jpa") version Versions.kotlin apply false + kotlin("plugin.allopen") version Versions.kotlin apply false +} + +radarRootProject { + projectVersion.set(Versions.project) + gradleVersion.set(Versions.gradle) +} + +subprojects { + apply(plugin = "org.radarbase.radar-kotlin") + + radarKotlin { + javaVersion.set(Versions.java) + kotlinVersion.set(Versions.kotlin) + slf4jVersion.set(Versions.slf4j) + log4j2Version.set(Versions.log4j2) + junitVersion.set(Versions.junit) + } +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..00a8d45 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,39 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.9.10" +} + +repositories { + mavenCentral() +} + +tasks.withType { + sourceCompatibility = "17" + targetCompatibility = "17" +} + +tasks.withType { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 0000000..5ed34db --- /dev/null +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,42 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +@Suppress("ConstPropertyName") +object Versions { + const val project = "4.4.1" + + const val java = 17 + + const val kotlin = "1.9.10" + + const val radarCommons = "1.1.1" + const val radarJersey = "0.10.0" + const val postgresql = "42.6.0" + const val ktor = "2.3.5" + const val jedis = "5.0.2" + + const val slf4j = "2.0.9" + const val log4j2 = "2.21.0" + + const val jersey = "3.1.3" + const val junit = "5.10.0" + const val mockitoKotlin = "5.1.0" + const val hamcrest = "2.2" + + const val gradle = "8.4" +} diff --git a/dashboard.yml b/dashboard.yml new file mode 100644 index 0000000..0f42290 --- /dev/null +++ b/dashboard.yml @@ -0,0 +1,19 @@ +service: + baseUri: http://0.0.0.0:9000/data-dashboard-backend/ + advertisedBaseUri: http://example.org/data-dashboard-backend/ + enableCors: true + +auth: + managementPortal: + url: http://localhost:8080/managementportal + clientId: data_dashboard_api + clientSecret: data_dashboard_api_secret + jwtResourceName: res_DataDashboardAPI + +database: + url: jdbc:postgresql://data-dashboard-postgresql:5432/data + user: radarbase + password: radarbase + dialect: org.hibernate.dialect.PostgreSQLDialect + liquibase: + contexts: [dev] diff --git a/data-dashboard-backend/.dockerignore b/data-dashboard-backend/.dockerignore new file mode 100644 index 0000000..b5bbc58 --- /dev/null +++ b/data-dashboard-backend/.dockerignore @@ -0,0 +1,8 @@ +build +out +.idea +.gradle +.git +authorizer-app/* +docker/ +RADAR-Rest-Source-Auth.iml \ No newline at end of file diff --git a/data-dashboard-backend/build.gradle.kts b/data-dashboard-backend/build.gradle.kts new file mode 100644 index 0000000..b5e09ba --- /dev/null +++ b/data-dashboard-backend/build.gradle.kts @@ -0,0 +1,32 @@ +plugins { + application + kotlin("plugin.serialization") + kotlin("plugin.noarg") + kotlin("plugin.jpa") + kotlin("plugin.allopen") +} + +application { + mainClass.set("org.radarbase.datadashboard.api.Main") +} + +dependencies { + api(kotlin("stdlib-jdk8")) + implementation(kotlin("reflect")) + + implementation("org.radarbase:radar-jersey:${Versions.radarJersey}") + implementation("org.radarbase:radar-jersey-hibernate:${Versions.radarJersey}") { + runtimeOnly("org.postgresql:postgresql:${Versions.postgresql}") + } + implementation("org.radarbase:radar-commons-kotlin:${Versions.radarCommons}") + + testImplementation("org.mockito:mockito-core:${Versions.mockitoKotlin}") + testImplementation("org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}") + testImplementation("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:${Versions.jersey}") +} + +allOpen { + annotation("jakarta.persistence.Entity") + annotation("jakarta.persistence.MappedSuperclass") + annotation("jakarta.persistence.Embeddable") +} diff --git a/data-dashboard-backend/dashboard.yml b/data-dashboard-backend/dashboard.yml new file mode 100644 index 0000000..bdd91fc --- /dev/null +++ b/data-dashboard-backend/dashboard.yml @@ -0,0 +1,14 @@ +auth: + managementPortal: + url: http://localhost:8080/managementportal + clientId: data_dashboard_api + clientSecret: data_dashboard_api_secret + jwtResourceName: res_DataDashboardAPI + +database: + url: jdbc:postgresql://localhost:5432/data + user: radarbase + password: radarbase + dialect: org.hibernate.dialect.PostgreSQLDialect + liquibase: + contexts: [dev] diff --git a/data-dashboard-backend/dev/config/keystore.p12 b/data-dashboard-backend/dev/config/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..92c67f02fc4be8972cdc17603e63ef7df6f6d212 GIT binary patch literal 5393 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 HZzTFJ66wMG literal 0 HcmV?d00001 diff --git a/data-dashboard-backend/dev/config/oauth_client_details.csv b/data-dashboard-backend/dev/config/oauth_client_details.csv new file mode 100644 index 0000000..b881634 --- /dev/null +++ b/data-dashboard-backend/dev/config/oauth_client_details.csv @@ -0,0 +1,2 @@ +client_id;resource_ids;client_secret;scope;authorized_grant_types;redirect_uri;authorities;access_token_validity;refresh_token_validity;additional_information;autoapprove +data_dashboard_api;res_DataDashboardAPI;data_dashboard_api_secret;MEASUREMENT.READ;refresh_token,authorization_code;;;43200;259200;{}; diff --git a/data-dashboard-backend/dev/docker-compose-postgres.yml b/data-dashboard-backend/dev/docker-compose-postgres.yml new file mode 100644 index 0000000..4e6106e --- /dev/null +++ b/data-dashboard-backend/dev/docker-compose-postgres.yml @@ -0,0 +1,19 @@ +--- +version: '3.5' + +networks: + data: + name: data + +services: + + data-dashboard-postgresql: + image: postgres:14-alpine + networks: + - data + ports: + - "5432:5432" + environment: + POSTGRES_USER: radarbase + POSTGRES_PASSWORD: radarbase + POSTGRES_DB: data diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/DashboardApi.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/DashboardApi.kt new file mode 100644 index 0000000..0d1e746 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/DashboardApi.kt @@ -0,0 +1,49 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api + +import org.radarbase.datadashboard.api.config.DashboardApiConfig +import org.radarbase.jersey.GrizzlyServer +import org.radarbase.jersey.config.ConfigLoader +import org.slf4j.Logger +import org.slf4j.LoggerFactory +import kotlin.system.exitProcess + +object Main { + + init { + System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager") + } + private val logger: Logger = LoggerFactory.getLogger(Main.javaClass) + + @JvmStatic + fun main(args: Array) { + if (args.firstOrNull() in arrayOf("--help", "-h")) { + logger.info("Usage: []") + exitProcess(0) + } + + val config: DashboardApiConfig = ConfigLoader.loadConfig("dashboard.yml", args) + val resources = ConfigLoader.loadResources(config.service.resourceConfig, config) + + GrizzlyServer(config.service.baseUri, resources).run { + listen() + } + } +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt new file mode 100644 index 0000000..3317c15 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/ObservationDto.kt @@ -0,0 +1,40 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.api + +/** Single observation or data point. */ +data class ObservationDto( + /** Unique observation ID. */ + val id: Long?, + + /** Date or date-time of the observation. */ + val date: String?, + + /** + * For how long the observation was valid. Null if there is no duration, or if the observation + * lasted for exactly the date or time in [date]. + */ + val period: String?, + + /** + * Value of the observation. This should adhere to the coding system and type of the + * variable. + */ + val value: Any?, +) diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableDto.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableDto.kt new file mode 100644 index 0000000..7997a5f --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableDto.kt @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.api + +import org.radarbase.datadashboard.api.domain.model.Variable + +/** A variable, describing a type of observations. */ +data class VariableDto( + /** Unique ID. */ + val id: Long?, + /** Canonical name of the variable. */ + val name: String, + /** Data type of observations for this variable. */ + val type: String?, + /** Category to group variables with. */ + val category: String?, + /** Observations that are selected for this variable. */ + val observations: List?, + /** Date type of observations. */ + val dateType: Variable.DateType? = Variable.DateType.LOCAL_DATE, +) diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableListDto.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableListDto.kt new file mode 100644 index 0000000..761a397 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/api/VariableListDto.kt @@ -0,0 +1,24 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.api + +/** List of variables. */ +data class VariableListDto( + val variables: List, +) diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardApiConfig.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardApiConfig.kt new file mode 100644 index 0000000..451897d --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardApiConfig.kt @@ -0,0 +1,38 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.config + +import org.radarbase.datadashboard.api.enhancer.DashBoardApiEnhancerFactory +import org.radarbase.jersey.auth.AuthConfig +import org.radarbase.jersey.enhancer.EnhancerFactory +import org.radarbase.jersey.hibernate.config.DatabaseConfig +import java.net.URI + +data class DashboardApiConfig( + val service: DashboardServiceConfig = DashboardServiceConfig(), + val auth: AuthConfig = AuthConfig( + jwtResourceName = "dummy", + ), + val database: DatabaseConfig = DatabaseConfig(), +) { + fun withEnv(): DashboardApiConfig = copy( + auth = auth.withEnv(), + database = database.withEnv(), + ) +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardServiceConfig.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardServiceConfig.kt new file mode 100644 index 0000000..5cb44a8 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/config/DashboardServiceConfig.kt @@ -0,0 +1,34 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.config + +import org.radarbase.datadashboard.api.enhancer.DashBoardApiEnhancerFactory +import org.radarbase.jersey.enhancer.EnhancerFactory +import java.net.URI +import kotlin.time.Duration.Companion.days + +data class DashboardServiceConfig( + val baseUri: URI = URI.create("http://0.0.0.0:9000/data-dashboard-backend/"), + val advertisedBaseUri: URI? = null, + val frontendBaseUri: URI? = null, + val resourceConfig: Class = DashBoardApiEnhancerFactory::class.java, + val enableCors: Boolean? = false, + val tokenExpiryTimeInMinutes: Long = 15, + val persistentTokenExpiryInMin: Long = 3.days.inWholeMinutes, +) \ No newline at end of file diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt new file mode 100644 index 0000000..ec57ecf --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/ObservationRepository.kt @@ -0,0 +1,48 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.domain + +import jakarta.inject.Provider +import jakarta.persistence.EntityManager +import jakarta.ws.rs.core.Context +import org.radarbase.datadashboard.api.domain.model.Observation +import org.radarbase.jersey.hibernate.HibernateRepository +import org.slf4j.LoggerFactory + +class ObservationRepository( + @Context em: Provider, +) : HibernateRepository(em) { + + fun getObservations(subjectId: String): List { + logger.debug("Get observations of {}", subjectId) + + return transact { + createQuery( + "SELECT o FROM Observation o WHERE o.subjectId = :subjectId ORDER BY o.date DESC", + Observation::class.java, + ).apply { + setParameter("subjectId", subjectId) + }.resultList + } + } + + companion object { + private val logger = LoggerFactory.getLogger(ObservationRepository::class.java) + } +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt new file mode 100644 index 0000000..5086efd --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/mapper/Extensions.kt @@ -0,0 +1,56 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.domain.mapper + +import org.radarbase.datadashboard.api.api.ObservationDto +import org.radarbase.datadashboard.api.api.VariableDto +import org.radarbase.datadashboard.api.domain.model.Observation +import org.radarbase.datadashboard.api.domain.model.Variable +import java.time.Duration + +fun Observation.toDto(): ObservationDto = ObservationDto( + id = id, + date = date?.toString(), + period = if (date != null && endDate != null) { + Duration.between(date, endDate).toString() + } else { + null + }, + value = valueNumeric ?: valueTextual, +) + +fun Map.Entry>.toDto(): VariableDto { + val (variable, observations) = this + return variable.toDto( + observations + .sortedBy { it.date } + .map { it.toDto() }, + ) +} + +fun Variable.toDtoWithoutObservations(): VariableDto = toDto(null) + +fun Variable.toDto(observations: List?): VariableDto = VariableDto( + id = id, + name = name, + type = type, + category = category, + observations = observations, + dateType = dateType, +) diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt new file mode 100644 index 0000000..2120053 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Observation.kt @@ -0,0 +1,73 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.domain.model + +import jakarta.persistence.* +import java.time.ZonedDateTime +import java.util.* + +@Entity +@Table(name = "observation") +class Observation( + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(updatable = false, nullable = false) + @Id + val id: Long?, + @Column(name = "subject_id") + val subjectId: String, + @ManyToOne + @JoinColumn(name = "variable_id") + val variable: Variable, + val date: ZonedDateTime?, + @Column(name = "end_date") + val endDate: ZonedDateTime?, + @Column(name = "value_textual") + val valueTextual: String?, + @Column(name = "value_numeric") + val valueNumeric: Double?, +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as Observation + if (id != null && other.id != null) { + return id == other.id + } + + return subjectId == other.subjectId && + variable == other.variable && + date == other.date && + endDate == other.endDate + } + + override fun hashCode(): Int = Objects.hash(subjectId, variable, date) + + override fun toString(): String = "Observation(" + + "id=$id, " + + "variable=$variable, " + + "date=$date, " + + "endDate=$endDate, " + + "valueTextual=${valueTextual.toPrintString()}, " + + "valueNumeric=$valueNumeric)" + + companion object { + internal fun String?.toPrintString() = if (this != null) "'$this'" else "null" + } +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Variable.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Variable.kt new file mode 100644 index 0000000..104bcf8 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/domain/model/Variable.kt @@ -0,0 +1,67 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.domain.model + +import org.radarbase.datadashboard.api.domain.model.Observation.Companion.toPrintString +import jakarta.persistence.* + +@Entity +@Table(name = "variable") +class Variable( + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Id + val id: Long?, + val name: String, + val type: String?, + val category: String?, + @OneToMany(mappedBy = "variable", fetch = FetchType.LAZY) + val observations: List, + @Enumerated(EnumType.STRING) + @Column(name = "date_type") + val dateType: DateType? = DateType.LOCAL_DATE, +) { + enum class DateType { + LOCAL_DATE, ZONED_DATE, LOCAL_DATE_TIME, ZONED_DATE_TIME, + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as Variable + + if (id != null && other.id != null) { + return id == other.id + } + + return name == other.name && + type == other.type && + category == other.category && + dateType == other.dateType + } + + override fun hashCode(): Int = name.hashCode() + + override fun toString(): String = "Variable(" + + "id=$id, " + + "name='$name', " + + "type=${type.toPrintString()}, " + + "category=${category.toPrintString()}, " + + "dateType=$dateType)" +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashBoardApiEnhancerFactory.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashBoardApiEnhancerFactory.kt new file mode 100644 index 0000000..af24ae3 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashBoardApiEnhancerFactory.kt @@ -0,0 +1,49 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.enhancer + +import org.radarbase.datadashboard.api.config.DashboardApiConfig +import org.radarbase.datadashboard.api.domain.model.Observation +import org.radarbase.datadashboard.api.domain.model.Variable +import org.radarbase.jersey.enhancer.EnhancerFactory +import org.radarbase.jersey.enhancer.Enhancers +import org.radarbase.jersey.enhancer.JerseyResourceEnhancer +import org.radarbase.jersey.hibernate.config.HibernateResourceEnhancer +import kotlin.reflect.jvm.jvmName + +class DashBoardApiEnhancerFactory( + private val config: DashboardApiConfig, +) : EnhancerFactory { + + override fun createEnhancers(): List = listOf( + DashboardApiEnhancer(config), + Enhancers.radar(config.auth), + Enhancers.managementPortal(config.auth), + Enhancers.health, + Enhancers.exception, + HibernateResourceEnhancer( + config.database.copy( + managedClasses = listOf( + Observation::class.jvmName, + Variable::class.jvmName + ), + ), + ), + ) +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashboardApiEnhancer.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashboardApiEnhancer.kt new file mode 100644 index 0000000..42f8108 --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/enhancer/DashboardApiEnhancer.kt @@ -0,0 +1,56 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.enhancer + +import org.radarbase.datadashboard.api.config.DashboardApiConfig +import org.radarbase.datadashboard.api.domain.ObservationRepository +import org.radarbase.datadashboard.api.service.ObservationService +import jakarta.inject.Singleton +import org.glassfish.jersey.internal.inject.AbstractBinder +import org.radarbase.jersey.enhancer.JerseyResourceEnhancer +import org.radarbase.jersey.filter.Filters + +class DashboardApiEnhancer( + private val config: DashboardApiConfig, +) : JerseyResourceEnhancer { + override val classes: Array> + get() = listOfNotNull( + Filters.cache, + Filters.logResponse, + if (config.service.enableCors == true) Filters.cors else null, + ).toTypedArray() + + override val packages: Array = arrayOf( + "org.radarbase.datadashboard.api.resource", + ) + + override fun AbstractBinder.enhance() { + bind(config) + .to(DashboardApiConfig::class.java) + + bind(ObservationService::class.java) + .to(ObservationService::class.java) + .`in`(Singleton::class.java) + + bind(ObservationRepository::class.java) + .to(ObservationRepository::class.java) + .`in`(Singleton::class.java) + + } +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt new file mode 100644 index 0000000..21bb68e --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/resource/ObservationResource.kt @@ -0,0 +1,46 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.resource + +import jakarta.annotation.Resource +import jakarta.ws.rs.* +import jakarta.ws.rs.core.Context +import org.radarbase.datadashboard.api.api.VariableListDto +import org.radarbase.datadashboard.api.service.ObservationService +import org.radarbase.auth.authorization.Permission +import org.radarbase.jersey.auth.Authenticated +import org.radarbase.jersey.auth.NeedsPermission + +@Path("subject/{subjectId}/variables") +@Resource +@Produces("application/json") +@Consumes("application/json") +@Authenticated +class ObservationResource( + @Context private val observationService: ObservationService, +) { + @GET + @Path("observations") + @NeedsPermission(Permission.MEASUREMENT_READ) + fun getObservations( + @PathParam("subjectId") subjectId: String + ): VariableListDto { + return observationService.getObservations(subjectId) + } +} diff --git a/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/service/ObservationService.kt b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/service/ObservationService.kt new file mode 100644 index 0000000..dffc77b --- /dev/null +++ b/data-dashboard-backend/src/main/java/org/radarbase/datadashboard/api/service/ObservationService.kt @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.service + +import jakarta.ws.rs.core.Context +import org.radarbase.datadashboard.api.api.VariableListDto +import org.radarbase.datadashboard.api.domain.ObservationRepository +import org.radarbase.datadashboard.api.domain.mapper.toDto + +class ObservationService( + @Context private val observationRepository: ObservationRepository +) { + fun getObservations(subjectId: String): VariableListDto { + val result = this.observationRepository.getObservations(subjectId) + return VariableListDto( + result + .groupBy { it.variable } + .map { it.toDto() }, + ) + } +} diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml new file mode 100644 index 0000000..5030cfc --- /dev/null +++ b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220309-create-database.xml @@ -0,0 +1,63 @@ + + + + + + + Create variable and observation tables + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-insert-mock-data.xml b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-insert-mock-data.xml new file mode 100644 index 0000000..bc245ef --- /dev/null +++ b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-insert-mock-data.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-observations.csv b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-observations.csv new file mode 100644 index 0000000..44127f7 --- /dev/null +++ b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-observations.csv @@ -0,0 +1,370 @@ +variable_id;value_numeric;value_textual;date;subject_id;end_date +1;1;NULL;2021-02-20 00:00:00;sub-1;NULL +2;1969;NULL;2021-02-20 00:00:00;sub-1;NULL +3;1;NULL;2021-02-20 00:00:00;sub-1;NULL +4;176;NULL;2021-02-20 00:00:00;sub-1;NULL +5;82;NULL;2021-02-20 00:00:00;sub-1;NULL +6;6;NULL;2021-02-20 00:00:00;sub-1;NULL +7;2;NULL;2021-02-20 00:00:00;sub-1;NULL +8;10997;NULL;2021-02-20 00:00:00;sub-1;NULL +9;2;NULL;2021-02-20 00:00:00;sub-1;NULL +10;2015;NULL;2021-02-20 00:00:00;sub-1;NULL +11;3;NULL;2021-02-20 00:00:00;sub-1;NULL +12;3;NULL;2021-02-20 00:00:00;sub-1;NULL +13;3;NULL;2021-02-20 00:00:00;sub-1;NULL +14;1;NULL;2021-02-20 00:00:00;sub-1;NULL +15;0;NULL;2021-02-20 00:00:00;sub-1;NULL +16;0;NULL;2021-02-20 00:00:00;sub-1;NULL +17;0;NULL;2021-02-20 00:00:00;sub-1;NULL +18;0;NULL;2021-02-20 00:00:00;sub-1;NULL +19;0;NULL;2021-02-20 00:00:00;sub-1;NULL +20;0;NULL;2021-02-20 00:00:00;sub-1;NULL +21;0;NULL;2021-02-20 00:00:00;sub-1;NULL +22;0;NULL;2021-02-20 00:00:00;sub-1;NULL +23;0;NULL;2021-02-20 00:00:00;sub-1;NULL +24;1;NULL;2021-02-20 00:00:00;sub-1;NULL +25;1;NULL;2021-02-20 00:00:00;sub-1;NULL +26;0;NULL;2021-02-20 00:00:00;sub-1;NULL +27;0;NULL;2021-02-20 00:00:00;sub-1;NULL +28;0;NULL;2021-02-20 00:00:00;sub-1;NULL +29;0;NULL;2021-02-20 00:00:00;sub-1;NULL +30;0;NULL;2021-02-20 00:00:00;sub-1;NULL +32;1;NULL;2021-02-20 00:00:00;sub-1;NULL +33;0;NULL;2021-02-20 00:00:00;sub-1;NULL +34;0;NULL;2021-02-20 00:00:00;sub-1;NULL +35;0;NULL;2021-02-20 00:00:00;sub-1;NULL +36;0;NULL;2021-02-20 00:00:00;sub-1;NULL +37;0;NULL;2021-02-20 00:00:00;sub-1;NULL +38;0;NULL;2021-02-20 00:00:00;sub-1;NULL +39;0;NULL;2021-02-20 00:00:00;sub-1;NULL +40;3;NULL;2021-02-20 00:00:00;sub-1;NULL +41;0;NULL;2021-02-20 00:00:00;sub-1;NULL +42;0;NULL;2021-02-20 00:00:00;sub-1;NULL +43;0;NULL;2021-02-20 00:00:00;sub-1;NULL +44;0;NULL;2021-02-20 00:00:00;sub-1;NULL +45;0;NULL;2021-02-20 00:00:00;sub-1;NULL +46;0;NULL;2021-02-20 00:00:00;sub-1;NULL +47;0;NULL;2021-02-20 00:00:00;sub-1;NULL +48;1;NULL;2021-02-20 00:00:00;sub-1;NULL +49;1;NULL;2021-02-20 00:00:00;sub-1;NULL +50;1;NULL;2021-02-20 00:00:00;sub-1;NULL +51;0;NULL;2021-02-20 00:00:00;sub-1;NULL +52;0;NULL;2021-02-20 00:00:00;sub-1;NULL +53;0;NULL;2021-02-20 00:00:00;sub-1;NULL +54;3;NULL;2021-02-20 00:00:00;sub-1;NULL +55;5;NULL;2021-02-20 00:00:00;sub-1;NULL +56;2;NULL;2021-02-20 00:00:00;sub-1;NULL +57;0;NULL;2021-02-20 00:00:00;sub-1;NULL +58;3;NULL;2021-02-20 00:00:00;sub-1;NULL +59;2;NULL;2021-02-20 00:00:00;sub-1;NULL +61;3;NULL;2021-02-20 00:00:00;sub-1;NULL +62;3;NULL;2021-02-20 00:00:00;sub-1;NULL +63;3;NULL;2021-02-20 00:00:00;sub-1;NULL +64;3;NULL;2021-02-20 00:00:00;sub-1;NULL +67;3;NULL;2021-02-20 00:00:00;sub-1;NULL +68;4;NULL;2021-02-20 00:00:00;sub-1;NULL +69;3;NULL;2021-02-20 00:00:00;sub-1;NULL +70;4;NULL;2021-02-20 00:00:00;sub-1;NULL +73;1;NULL;2021-02-20 00:00:00;sub-1;NULL +74;1;NULL;2021-02-20 00:00:00;sub-1;NULL +77;3;NULL;2021-02-20 00:00:00;sub-1;NULL +78;4;NULL;2021-02-20 00:00:00;sub-1;NULL +79;4;NULL;2021-02-20 00:00:00;sub-1;NULL +80;2;NULL;2021-02-20 00:00:00;sub-1;NULL +83;1;NULL;2021-02-20 00:00:00;sub-1;NULL +84;1;NULL;2021-02-20 00:00:00;sub-1;NULL +87;2;NULL;2021-02-20 00:00:00;sub-1;NULL +88;2;NULL;2021-02-20 00:00:00;sub-1;NULL +89;2;NULL;2021-02-20 00:00:00;sub-1;NULL +90;2;NULL;2021-02-20 00:00:00;sub-1;NULL +93;3;NULL;2021-02-20 00:00:00;sub-1;NULL +94;3;NULL;2021-02-20 00:00:00;sub-1;NULL +95;3;NULL;2021-02-20 00:00:00;sub-1;NULL +96;1;NULL;2021-02-20 00:00:00;sub-1;NULL +99;2;NULL;2021-02-20 00:00:00;sub-1;NULL +100;2;NULL;2021-02-20 00:00:00;sub-1;NULL +103;3;NULL;2021-02-20 00:00:00;sub-1;NULL +104;2;NULL;2021-02-20 00:00:00;sub-1;NULL +105;3;NULL;2021-02-20 00:00:00;sub-1;NULL +106;2;NULL;2021-02-20 00:00:00;sub-1;NULL +107;1;NULL;2021-02-20 00:00:00;sub-1;NULL +108;1;NULL;2021-02-20 00:00:00;sub-1;NULL +109;2;NULL;2021-02-20 00:00:00;sub-1;NULL +110;3;NULL;2021-02-20 00:00:00;sub-1;NULL +111;2;NULL;2021-02-20 00:00:00;sub-1;NULL +112;2;NULL;2021-02-20 00:00:00;sub-1;NULL +113;3;NULL;2021-02-20 00:00:00;sub-1;NULL +114;0;NULL;2021-02-20 00:00:00;sub-1;NULL +115;1;NULL;2021-02-20 00:00:00;sub-1;NULL +116;1;NULL;2021-02-20 00:00:00;sub-1;NULL +117;1;NULL;2021-02-20 00:00:00;sub-1;NULL +118;1;NULL;2021-02-20 00:00:00;sub-1;NULL +119;1;NULL;2021-02-20 00:00:00;sub-1;NULL +120;3;NULL;2021-02-20 00:00:00;sub-1;NULL +121;3;NULL;2021-02-20 00:00:00;sub-1;NULL +122;1;NULL;2021-02-20 00:00:00;sub-1;NULL +123;1;NULL;2021-02-20 00:00:00;sub-1;NULL +61;3;NULL;2021-06-20 00:00:00;sub-1;NULL +62;3;NULL;2021-06-20 00:00:00;sub-1;NULL +63;3;NULL;2021-06-20 00:00:00;sub-1;NULL +64;3;NULL;2021-06-20 00:00:00;sub-1;NULL +67;3;NULL;2021-06-20 00:00:00;sub-1;NULL +68;3;NULL;2021-06-20 00:00:00;sub-1;NULL +69;4;NULL;2021-06-20 00:00:00;sub-1;NULL +70;3;NULL;2021-06-20 00:00:00;sub-1;NULL +73;4;NULL;2021-06-20 00:00:00;sub-1;NULL +74;1;NULL;2021-06-20 00:00:00;sub-1;NULL +77;1;NULL;2021-06-20 00:00:00;sub-1;NULL +78;3;NULL;2021-06-20 00:00:00;sub-1;NULL +79;4;NULL;2021-06-20 00:00:00;sub-1;NULL +80;4;NULL;2021-06-20 00:00:00;sub-1;NULL +83;2;NULL;2021-06-20 00:00:00;sub-1;NULL +84;1;NULL;2021-06-20 00:00:00;sub-1;NULL +87;1;NULL;2021-06-20 00:00:00;sub-1;NULL +88;2;NULL;2021-06-20 00:00:00;sub-1;NULL +89;2;NULL;2021-06-20 00:00:00;sub-1;NULL +90;2;NULL;2021-06-20 00:00:00;sub-1;NULL +93;2;NULL;2021-06-20 00:00:00;sub-1;NULL +94;3;NULL;2021-06-20 00:00:00;sub-1;NULL +95;3;NULL;2021-06-20 00:00:00;sub-1;NULL +96;3;NULL;2021-06-20 00:00:00;sub-1;NULL +99;1;NULL;2021-06-20 00:00:00;sub-1;NULL +100;2;NULL;2021-06-20 00:00:00;sub-1;NULL +103;2;NULL;2021-06-20 00:00:00;sub-1;NULL +104;3;NULL;2021-06-20 00:00:00;sub-1;NULL +105;2;NULL;2021-06-20 00:00:00;sub-1;NULL +106;3;NULL;2021-06-20 00:00:00;sub-1;NULL +107;2;NULL;2021-06-20 00:00:00;sub-1;NULL +108;1;NULL;2021-06-20 00:00:00;sub-1;NULL +109;1;NULL;2021-06-20 00:00:00;sub-1;NULL +110;2;NULL;2021-06-20 00:00:00;sub-1;NULL +111;3;NULL;2021-06-20 00:00:00;sub-1;NULL +112;2;NULL;2021-06-20 00:00:00;sub-1;NULL +113;2;NULL;2021-06-20 00:00:00;sub-1;NULL +114;3;NULL;2021-06-20 00:00:00;sub-1;NULL +115;0;NULL;2021-06-20 00:00:00;sub-1;NULL +116;1;NULL;2021-06-20 00:00:00;sub-1;NULL +117;1;NULL;2021-06-20 00:00:00;sub-1;NULL +118;1;NULL;2021-06-20 00:00:00;sub-1;NULL +119;1;NULL;2021-06-20 00:00:00;sub-1;NULL +120;1;NULL;2021-06-20 00:00:00;sub-1;NULL +121;3;NULL;2021-06-20 00:00:00;sub-1;NULL +122;3;NULL;2021-06-20 00:00:00;sub-1;NULL +123;0;NULL;2021-06-20 00:00:00;sub-1;NULL +19;0;NULL;2021-09-20 00:00:00;sub-1;NULL +20;0;NULL;2021-09-20 00:00:00;sub-1;NULL +24;1;NULL;2021-09-20 00:00:00;sub-1;NULL +25;1;NULL;2021-09-20 00:00:00;sub-1;NULL +26;0;NULL;2021-09-20 00:00:00;sub-1;NULL +27;0;NULL;2021-09-20 00:00:00;sub-1;NULL +28;0;NULL;2021-09-20 00:00:00;sub-1;NULL +29;0;NULL;2021-09-20 00:00:00;sub-1;NULL +30;0;NULL;2021-09-20 00:00:00;sub-1;NULL +32;1;NULL;2021-09-20 00:00:00;sub-1;NULL +33;0;NULL;2021-09-20 00:00:00;sub-1;NULL +34;0;NULL;2021-09-20 00:00:00;sub-1;NULL +35;0;NULL;2021-09-20 00:00:00;sub-1;NULL +36;0;NULL;2021-09-20 00:00:00;sub-1;NULL +37;0;NULL;2021-09-20 00:00:00;sub-1;NULL +38;0;NULL;2021-09-20 00:00:00;sub-1;NULL +39;0;NULL;2021-09-20 00:00:00;sub-1;NULL +40;3;NULL;2021-09-20 00:00:00;sub-1;NULL +41;0;NULL;2021-09-20 00:00:00;sub-1;NULL +42;0;NULL;2021-09-20 00:00:00;sub-1;NULL +43;0;NULL;2021-09-20 00:00:00;sub-1;NULL +44;0;NULL;2021-09-20 00:00:00;sub-1;NULL +45;0;NULL;2021-09-20 00:00:00;sub-1;NULL +46;0;NULL;2021-09-20 00:00:00;sub-1;NULL +47;0;NULL;2021-09-20 00:00:00;sub-1;NULL +50;1;NULL;2021-09-20 00:00:00;sub-1;NULL +51;0;NULL;2021-09-20 00:00:00;sub-1;NULL +52;0;NULL;2021-09-20 00:00:00;sub-1;NULL +53;0;NULL;2021-09-20 00:00:00;sub-1;NULL +54;3;NULL;2021-09-20 00:00:00;sub-1;NULL +58;3;NULL;2021-09-20 00:00:00;sub-1;NULL +59;2;NULL;2021-09-20 00:00:00;sub-1;NULL +61;3;NULL;2021-09-20 00:00:00;sub-1;NULL +62;3;NULL;2021-09-20 00:00:00;sub-1;NULL +63;2;NULL;2021-09-20 00:00:00;sub-1;NULL +64;3;NULL;2021-09-20 00:00:00;sub-1;NULL +67;4;NULL;2021-09-20 00:00:00;sub-1;NULL +68;3;NULL;2021-09-20 00:00:00;sub-1;NULL +69;4;NULL;2021-09-20 00:00:00;sub-1;NULL +70;3;NULL;2021-09-20 00:00:00;sub-1;NULL +73;4;NULL;2021-09-20 00:00:00;sub-1;NULL +74;1;NULL;2021-09-20 00:00:00;sub-1;NULL +77;1;NULL;2021-09-20 00:00:00;sub-1;NULL +78;3;NULL;2021-09-20 00:00:00;sub-1;NULL +79;4;NULL;2021-09-20 00:00:00;sub-1;NULL +80;4;NULL;2021-09-20 00:00:00;sub-1;NULL +83;2;NULL;2021-09-20 00:00:00;sub-1;NULL +84;1;NULL;2021-09-20 00:00:00;sub-1;NULL +87;1;NULL;2021-09-20 00:00:00;sub-1;NULL +88;2;NULL;2021-09-20 00:00:00;sub-1;NULL +89;2;NULL;2021-09-20 00:00:00;sub-1;NULL +90;2;NULL;2021-09-20 00:00:00;sub-1;NULL +93;2;NULL;2021-09-20 00:00:00;sub-1;NULL +94;3;NULL;2021-09-20 00:00:00;sub-1;NULL +95;3;NULL;2021-09-20 00:00:00;sub-1;NULL +96;3;NULL;2021-09-20 00:00:00;sub-1;NULL +99;1;NULL;2021-09-20 00:00:00;sub-1;NULL +100;2;NULL;2021-09-20 00:00:00;sub-1;NULL +103;2;NULL;2021-09-20 00:00:00;sub-1;NULL +104;3;NULL;2021-09-20 00:00:00;sub-1;NULL +105;2;NULL;2021-09-20 00:00:00;sub-1;NULL +106;2;NULL;2021-09-20 00:00:00;sub-1;NULL +107;1;NULL;2021-09-20 00:00:00;sub-1;NULL +108;4;NULL;2021-09-20 00:00:00;sub-1;NULL +109;2;NULL;2021-09-20 00:00:00;sub-1;NULL +110;1;NULL;2021-09-20 00:00:00;sub-1;NULL +111;3;NULL;2021-09-20 00:00:00;sub-1;NULL +112;2;NULL;2021-09-20 00:00:00;sub-1;NULL +113;2;NULL;2021-09-20 00:00:00;sub-1;NULL +114;3;NULL;2021-09-20 00:00:00;sub-1;NULL +115;0;NULL;2021-09-20 00:00:00;sub-1;NULL +116;1;NULL;2021-09-20 00:00:00;sub-1;NULL +117;1;NULL;2021-09-20 00:00:00;sub-1;NULL +118;1;NULL;2021-09-20 00:00:00;sub-1;NULL +119;3;NULL;2021-09-20 00:00:00;sub-1;NULL +120;2;NULL;2021-09-20 00:00:00;sub-1;NULL +121;3;NULL;2021-09-20 00:00:00;sub-1;NULL +122;3;NULL;2021-09-20 00:00:00;sub-1;NULL +123;0;NULL;2021-09-20 00:00:00;sub-1;NULL +61;2;NULL;2021-12-20 00:00:00;sub-1;NULL +62;2;NULL;2021-12-20 00:00:00;sub-1;NULL +63;1;NULL;2021-12-20 00:00:00;sub-1;NULL +64;1;NULL;2021-12-20 00:00:00;sub-1;NULL +67;2;NULL;2021-12-20 00:00:00;sub-1;NULL +68;5;NULL;2021-12-20 00:00:00;sub-1;NULL +69;5;NULL;2021-12-20 00:00:00;sub-1;NULL +70;4;NULL;2021-12-20 00:00:00;sub-1;NULL +73;5;NULL;2021-12-20 00:00:00;sub-1;NULL +74;2;NULL;2021-12-20 00:00:00;sub-1;NULL +77;2;NULL;2021-12-20 00:00:00;sub-1;NULL +78;3;NULL;2021-12-20 00:00:00;sub-1;NULL +79;4;NULL;2021-12-20 00:00:00;sub-1;NULL +80;4;NULL;2021-12-20 00:00:00;sub-1;NULL +83;2;NULL;2021-12-20 00:00:00;sub-1;NULL +84;5;NULL;2021-12-20 00:00:00;sub-1;NULL +87;4;NULL;2021-12-20 00:00:00;sub-1;NULL +88;1;NULL;2021-12-20 00:00:00;sub-1;NULL +89;1;NULL;2021-12-20 00:00:00;sub-1;NULL +90;1;NULL;2021-12-20 00:00:00;sub-1;NULL +93;1;NULL;2021-12-20 00:00:00;sub-1;NULL +94;3;NULL;2021-12-20 00:00:00;sub-1;NULL +95;3;NULL;2021-12-20 00:00:00;sub-1;NULL +96;3;NULL;2021-12-20 00:00:00;sub-1;NULL +99;1;NULL;2021-12-20 00:00:00;sub-1;NULL +100;4;NULL;2021-12-20 00:00:00;sub-1;NULL +103;4;NULL;2021-12-20 00:00:00;sub-1;NULL +104;7;NULL;2021-12-20 00:00:00;sub-1;NULL +105;2;NULL;2021-12-20 00:00:00;sub-1;NULL +106;2;NULL;2021-12-20 00:00:00;sub-1;NULL +107;1;NULL;2021-12-20 00:00:00;sub-1;NULL +108;1;NULL;2021-12-20 00:00:00;sub-1;NULL +109;2;NULL;2021-12-20 00:00:00;sub-1;NULL +110;1;NULL;2021-12-20 00:00:00;sub-1;NULL +111;4;NULL;2021-12-20 00:00:00;sub-1;NULL +112;4;NULL;2021-12-20 00:00:00;sub-1;NULL +113;4;NULL;2021-12-20 00:00:00;sub-1;NULL +114;3;NULL;2021-12-20 00:00:00;sub-1;NULL +115;0;NULL;2021-12-20 00:00:00;sub-1;NULL +116;4;NULL;2021-12-20 00:00:00;sub-1;NULL +117;4;NULL;2021-12-20 00:00:00;sub-1;NULL +118;1;NULL;2021-12-20 00:00:00;sub-1;NULL +119;4;NULL;2021-12-20 00:00:00;sub-1;NULL +120;3;NULL;2021-12-20 00:00:00;sub-1;NULL +121;4;NULL;2021-12-20 00:00:00;sub-1;NULL +122;4;NULL;2021-12-20 00:00:00;sub-1;NULL +123;1;NULL;2021-12-20 00:00:00;sub-1;NULL +4;176;NULL;2022-02-20 00:00:00;sub-1;NULL +5;82;NULL;2022-02-20 00:00:00;sub-1;NULL +7;1;NULL;2022-02-20 00:00:00;sub-1;NULL +8;10990;NULL;2022-02-20 00:00:00;sub-1;NULL +9;2;NULL;2022-02-20 00:00:00;sub-1;NULL +12;1;NULL;2022-02-20 00:00:00;sub-1;NULL +13;3;NULL;2022-02-20 00:00:00;sub-1;NULL +19;0;NULL;2022-02-20 00:00:00;sub-1;NULL +20;0;NULL;2022-02-20 00:00:00;sub-1;NULL +24;1;NULL;2022-02-20 00:00:00;sub-1;NULL +25;1;NULL;2022-02-20 00:00:00;sub-1;NULL +26;0;NULL;2022-02-20 00:00:00;sub-1;NULL +27;0;NULL;2022-02-20 00:00:00;sub-1;NULL +28;0;NULL;2022-02-20 00:00:00;sub-1;NULL +29;0;NULL;2022-02-20 00:00:00;sub-1;NULL +30;0;NULL;2022-02-20 00:00:00;sub-1;NULL +32;1;NULL;2022-02-20 00:00:00;sub-1;NULL +33;0;NULL;2022-02-20 00:00:00;sub-1;NULL +34;0;NULL;2022-02-20 00:00:00;sub-1;NULL +35;0;NULL;2022-02-20 00:00:00;sub-1;NULL +36;0;NULL;2022-02-20 00:00:00;sub-1;NULL +37;0;NULL;2022-02-20 00:00:00;sub-1;NULL +38;0;NULL;2022-02-20 00:00:00;sub-1;NULL +39;0;NULL;2022-02-20 00:00:00;sub-1;NULL +40;3;NULL;2022-02-20 00:00:00;sub-1;NULL +41;0;NULL;2022-02-20 00:00:00;sub-1;NULL +42;0;NULL;2022-02-20 00:00:00;sub-1;NULL +43;0;NULL;2022-02-20 00:00:00;sub-1;NULL +44;0;NULL;2022-02-20 00:00:00;sub-1;NULL +45;0;NULL;2022-02-20 00:00:00;sub-1;NULL +46;0;NULL;2022-02-20 00:00:00;sub-1;NULL +47;0;NULL;2022-02-20 00:00:00;sub-1;NULL +48;1;NULL;2022-02-20 00:00:00;sub-1;NULL +49;1;NULL;2022-02-20 00:00:00;sub-1;NULL +50;2;NULL;2022-02-20 00:00:00;sub-1;NULL +51;1;NULL;2022-02-20 00:00:00;sub-1;NULL +52;0;NULL;2022-02-20 00:00:00;sub-1;NULL +53;0;NULL;2022-02-20 00:00:00;sub-1;NULL +54;2;NULL;2022-02-20 00:00:00;sub-1;NULL +55;2;NULL;2022-02-20 00:00:00;sub-1;NULL +56;2;NULL;2022-02-20 00:00:00;sub-1;NULL +57;0;NULL;2022-02-20 00:00:00;sub-1;NULL +58;2;NULL;2022-02-20 00:00:00;sub-1;NULL +59;2;NULL;2022-02-20 00:00:00;sub-1;NULL +61;4;NULL;2022-02-20 00:00:00;sub-1;NULL +62;4;NULL;2022-02-20 00:00:00;sub-1;NULL +63;3;NULL;2022-02-20 00:00:00;sub-1;NULL +64;4;NULL;2022-02-20 00:00:00;sub-1;NULL +67;5;NULL;2022-02-20 00:00:00;sub-1;NULL +68;3;NULL;2022-02-20 00:00:00;sub-1;NULL +69;3;NULL;2022-02-20 00:00:00;sub-1;NULL +70;3;NULL;2022-02-20 00:00:00;sub-1;NULL +73;3;NULL;2022-02-20 00:00:00;sub-1;NULL +74;4;NULL;2022-02-20 00:00:00;sub-1;NULL +77;4;NULL;2022-02-20 00:00:00;sub-1;NULL +78;2;NULL;2022-02-20 00:00:00;sub-1;NULL +79;2;NULL;2022-02-20 00:00:00;sub-1;NULL +80;2;NULL;2022-02-20 00:00:00;sub-1;NULL +83;2;NULL;2022-02-20 00:00:00;sub-1;NULL +84;2;NULL;2022-02-20 00:00:00;sub-1;NULL +87;1;NULL;2022-02-20 00:00:00;sub-1;NULL +88;4;NULL;2022-02-20 00:00:00;sub-1;NULL +89;2;NULL;2022-02-20 00:00:00;sub-1;NULL +90;3;NULL;2022-02-20 00:00:00;sub-1;NULL +93;4;NULL;2022-02-20 00:00:00;sub-1;NULL +94;3;NULL;2022-02-20 00:00:00;sub-1;NULL +95;3;NULL;2022-02-20 00:00:00;sub-1;NULL +96;3;NULL;2022-02-20 00:00:00;sub-1;NULL +99;1;NULL;2022-02-20 00:00:00;sub-1;NULL +100;3;NULL;2022-02-20 00:00:00;sub-1;NULL +103;3;NULL;2022-02-20 00:00:00;sub-1;NULL +104;5;NULL;2022-02-20 00:00:00;sub-1;NULL +105;2;NULL;2022-02-20 00:00:00;sub-1;NULL +106;2;NULL;2022-02-20 00:00:00;sub-1;NULL +107;2;NULL;2022-02-20 00:00:00;sub-1;NULL +108;1;NULL;2022-02-20 00:00:00;sub-1;NULL +109;1;NULL;2022-02-20 00:00:00;sub-1;NULL +110;1;NULL;2022-02-20 00:00:00;sub-1;NULL +111;5;NULL;2022-02-20 00:00:00;sub-1;NULL +112;3;NULL;2022-02-20 00:00:00;sub-1;NULL +113;2;NULL;2022-02-20 00:00:00;sub-1;NULL +114;4;NULL;2022-02-20 00:00:00;sub-1;NULL +115;0;NULL;2022-02-20 00:00:00;sub-1;NULL +116;5;NULL;2022-02-20 00:00:00;sub-1;NULL +117;5;NULL;2022-02-20 00:00:00;sub-1;NULL +118;4;NULL;2022-02-20 00:00:00;sub-1;NULL +119;5;NULL;2022-02-20 00:00:00;sub-1;NULL +120;4;NULL;2022-02-20 00:00:00;sub-1;NULL +121;5;NULL;2022-02-20 00:00:00;sub-1;NULL +122;4;NULL;2022-02-20 00:00:00;sub-1;NULL +123;0;NULL;2022-02-20 00:00:00;sub-1;NULL diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-variables.csv b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-variables.csv new file mode 100644 index 0000000..5d6a8f4 --- /dev/null +++ b/data-dashboard-backend/src/main/resources/db/changelog/changes/20220321-variables.csv @@ -0,0 +1,124 @@ +id;category;name;type;date_type +1;Registration;PATCONSENT1;boolean;LOCAL_DATE +2;Sociodemographics;YearOfBirth;year;LOCAL_DATE +3;Sociodemographics;SEX;number;LOCAL_DATE +4;Sociodemographics;HEIGHTPAT;number;LOCAL_DATE +5;Sociodemographics;WEIGHTPAT;number;LOCAL_DATE +6;Sociodemographics;EducationLevel;number;LOCAL_DATE +7;Sociodemographics;LivingArrangements;number;LOCAL_DATE +8;Sociodemographics;ZIPCODE;number;LOCAL_DATE +9;Medical History;DIABTYPEPAT;number;LOCAL_DATE +10;Medical History;YODIAG;year;LOCAL_DATE +11;Medical History;DMFAM;number;LOCAL_DATE +12;Medical History;CARDIOACUTE;number;LOCAL_DATE +13;Medical History;STROKEACUTE;number;LOCAL_DATE +14;Medical History;CHDPAT;number;LOCAL_DATE +15;Medical History;HFPAT;number;LOCAL_DATE +16;Medical History;CKD;number;LOCAL_DATE +17;Medical History;DMRETINO;number;LOCAL_DATE +18;Medical History;DMMACU;number;LOCAL_DATE +19;Medical History;LULLCPAT;number;LOCAL_DATE +20;Medical History;LLAMPPAT;number;LOCAL_DATE +21;Medical History;EDPAT;number;LOCAL_DATE +22;Medical History;PERIODONPAT;number;LOCAL_DATE +23;Medical History;NODIABCOM;number;LOCAL_DATE +24;Treatment;TRDIETEXC;number;LOCAL_DATE +25;Treatment;TRTAB;number;LOCAL_DATE +26;Treatment;TRGLP1;number;LOCAL_DATE +27;Treatment;TRLONGINS;number;LOCAL_DATE +28;Treatment;TRSHORTINS;number;LOCAL_DATE +29;Treatment;TRPUMP;number;LOCAL_DATE +30;Treatment;TROTHER;number;LOCAL_DATE +31;Treatment;TRNO;number;LOCAL_DATE +32;Treatment;TRMET;number;LOCAL_DATE +33;Treatment;TRSGLT2;number;LOCAL_DATE +34;Treatment;TRDPP4;number;LOCAL_DATE +35;Treatment;TRSULF;number;LOCAL_DATE +36;Treatment;TRGLINIDE;number;LOCAL_DATE +37;Treatment;TRGLITAZONE;number;LOCAL_DATE +38;Treatment;TRGLYCOSIDASE;number;LOCAL_DATE +39;Treatment;TRDONTKNOW;number;LOCAL_DATE +40;Treatment;GLCMEASURE;number;LOCAL_DATE +41;Treatment;BPLTHEREPAT;number;LOCAL_DATE +42;Treatment;LIPTHERAPAT;number;LOCAL_DATE +43;Treatment;CARDINT;number;LOCAL_DATE +44;Treatment;CARDSURG;number;LOCAL_DATE +45;Treatment;LASER;number;LOCAL_DATE +46;Treatment;DIALYSISPAT;number;LOCAL_DATE +47;Treatment;NOFURTHERTR;number;LOCAL_DATE +48;Examinations;EYEEXAM;number;LOCAL_DATE +49;Examinations;FOOTEXAM;number;LOCAL_DATE +50;Examinations;HYPOSUP;number;LOCAL_DATE +51;Examinations;HYPONOSUP;number;LOCAL_DATE +52;Examinations;DKAHHSPAT;number;LOCAL_DATE +53;Examinations;HYPOANX;number;LOCAL_DATE +54;Health Behavior;SmokingStatus;number;LOCAL_DATE +55;Health Behavior;ALCFREQ1;number;LOCAL_DATE +56;Health Behavior;HEALTYDIET;number;LOCAL_DATE +57;Health Behavior;BINGE;number;LOCAL_DATE +58;Health Behavior;PHYSACTSEN;number;LOCAL_DATE +59;Functional Health Status - Psychosocial;Global01;number;LOCAL_DATE +60;Functional Health Status - Psychosocial;TRANS3MON;number;LOCAL_DATE +61;Functional Health Status - Psychosocial;PFA11;number;LOCAL_DATE +62;Functional Health Status - Psychosocial;PFA21;number;LOCAL_DATE +63;Functional Health Status - Psychosocial;PFA23;number;LOCAL_DATE +64;Functional Health Status - Psychosocial;PFA53;number;LOCAL_DATE +65;Functional Health Status - Psychosocial;PFTHETA;number;LOCAL_DATE +66;Functional Health Status - Psychosocial;PFSE;number;LOCAL_DATE +67;Functional Health Status - Psychosocial;HI7;number;LOCAL_DATE +68;Functional Health Status - Psychosocial;AN3;number;LOCAL_DATE +69;Functional Health Status - Psychosocial;FATEXP41;number;LOCAL_DATE +70;Functional Health Status - Psychosocial;FATEXP40;number;LOCAL_DATE +71;Functional Health Status - Psychosocial;FATTHETA;number;LOCAL_DATE +72;Functional Health Status - Psychosocial;FATSE;number;LOCAL_DATE +73;Functional Health Status - Psychosocial;PC8r;number;LOCAL_DATE +74;Functional Health Status - Psychosocial;PC13r;number;LOCAL_DATE +75;Functional Health Status - Psychosocial;COGTHETA;number;LOCAL_DATE +76;Functional Health Status - Psychosocial;COGSE;number;LOCAL_DATE +77;Functional Health Status - Psychosocial;EDDEP04;number;LOCAL_DATE +78;Functional Health Status - Psychosocial;EDDEP06;number;LOCAL_DATE +79;Functional Health Status - Psychosocial;EDDEP29;number;LOCAL_DATE +80;Functional Health Status - Psychosocial;EDDEP41;number;LOCAL_DATE +81;Functional Health Status - Psychosocial;DEPTHETA;number;LOCAL_DATE +82;Functional Health Status - Psychosocial;DEPSE;number;LOCAL_DATE +83;Functional Health Status - Psychosocial;EDANX01;number;LOCAL_DATE +84;Functional Health Status - Psychosocial;EDANX53;number;LOCAL_DATE +85;Functional Health Status - Psychosocial;ANXTHETA;number;LOCAL_DATE +86;Functional Health Status - Psychosocial;ANXSE;number;LOCAL_DATE +87;Functional Health Status - Psychosocial;SRPPER11_CaPS;number;LOCAL_DATE +88;Functional Health Status - Psychosocial;SRPPER18_CaPS;number;LOCAL_DATE +89;Functional Health Status - Psychosocial;SRPPER23_CaPS;number;LOCAL_DATE +90;Functional Health Status - Psychosocial;SRPPER46_CaPS;number;LOCAL_DATE +91;Functional Health Status - Psychosocial;SFTHETA;number;LOCAL_DATE +92;Functional Health Status - Psychosocial;SFSE;number;LOCAL_DATE +93;Functional Health Status - Psychosocial;Sleep116;number;LOCAL_DATE +94;Functional Health Status - Psychosocial;Sleep20;number;LOCAL_DATE +95;Functional Health Status - Psychosocial;Sleep44;number;LOCAL_DATE +96;Functional Health Status - Psychosocial;Sleep109;number;LOCAL_DATE +97;Functional Health Status - Psychosocial;SLEEPTHETA;number;LOCAL_DATE +98;Functional Health Status - Psychosocial;SLEEPSE;number;LOCAL_DATE +99;Functional Health Status - Psychosocial;PAININ22;number;LOCAL_DATE +100;Functional Health Status - Psychosocial;PAININ31;number;LOCAL_DATE +101;Functional Health Status - Psychosocial;PAINTHETA;number;LOCAL_DATE +102;Functional Health Status - Psychosocial;PAINSE;number;LOCAL_DATE +103;Functional Health Status - Psychosocial;Global07;number;LOCAL_DATE +104;Functional Health Status - Psychosocial;NEUROPAT;number;LOCAL_DATE +105;Functional Health Status - Psychosocial;GISYMP;number;LOCAL_DATE +106;Functional Health Status - Psychosocial;UISYMP;number;LOCAL_DATE +107;Functional Health Status - Psychosocial;ERRECTIL;number;LOCAL_DATE +108;Functional Health Status - Psychosocial;VISIMP;number;LOCAL_DATE +109;Functional Health Status - Psychosocial;EATBEH;number;LOCAL_DATE +110;Functional Health Status - Psychosocial;GLCREG;number;LOCAL_DATE +111;Functional Health Status - Psychosocial;DISSSTRESS;number;LOCAL_DATE +112;Functional Health Status - Psychosocial;GLCSTA;number;LOCAL_DATE +113;Functional Health Status - Psychosocial;THREATSAT;number;LOCAL_DATE +114;Functional Health Status - Psychosocial;GOALACH;number;LOCAL_DATE +115;Functional Health Status - Psychosocial;THERKNOW1;number;LOCAL_DATE +116;Functional Health Status - Psychosocial;THERKNOW2;number;LOCAL_DATE +117;Functional Health Status - Psychosocial;THERKNOW3;number;LOCAL_DATE +118;Functional Health Status - Psychosocial;THERKNOW4;number;LOCAL_DATE +119;Functional Health Status - Psychosocial;THERKNOW5;number;LOCAL_DATE +120;Functional Health Status - Psychosocial;THERAD;number;LOCAL_DATE +121;Functional Health Status - Psychosocial;HCACCESS;number;LOCAL_DATE +122;Functional Health Status - Psychosocial;DISCUTHREAT;number;LOCAL_DATE +123;Functional Health Status - Psychosocial;SUPPTHREAT;number;LOCAL_DATE diff --git a/data-dashboard-backend/src/main/resources/db/changelog/changes/db.changelog-master.xml b/data-dashboard-backend/src/main/resources/db/changelog/changes/db.changelog-master.xml new file mode 100644 index 0000000..315efe3 --- /dev/null +++ b/data-dashboard-backend/src/main/resources/db/changelog/changes/db.changelog-master.xml @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt b/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt new file mode 100644 index 0000000..ad97988 --- /dev/null +++ b/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/resource/ObservationResourceTest.kt @@ -0,0 +1,120 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.resource + +import jakarta.ws.rs.core.Application +import org.glassfish.hk2.utilities.binding.AbstractBinder +import org.glassfish.jersey.server.ResourceConfig +import org.glassfish.jersey.test.JerseyTest +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations +import org.radarbase.datadashboard.api.api.VariableListDto +import org.radarbase.datadashboard.api.domain.mapper.toDto +import org.radarbase.datadashboard.api.domain.model.Observation +import org.radarbase.datadashboard.api.domain.model.Variable +import org.radarbase.datadashboard.api.service.ObservationService + +class ObservationResourceTest: JerseyTest() { + + + @Mock + lateinit var observationService: ObservationService + + private lateinit var variableListDto: VariableListDto + private val subjectId = "sub-1" + + override fun configure(): Application { + // Initialize all defined Mockito mocks (with @Mock annotation). + MockitoAnnotations.openMocks(this) + // Configure the Jersey Application. + val resourceConfig = ResourceConfig(ObservationResource::class.java) + // Register the ObservationService mock for dependency injection (needed by ObservationResource). + resourceConfig.register(object : AbstractBinder() { + override fun configure() { + bind(observationService).to(ObservationService::class.java) + } + }) + return resourceConfig + } + + @BeforeEach + fun init() { + // Create some fake observations that are returned by the service. + // Each observation is linked to a Variable. + val var1 = createVariable(id = 1L, name = "name1") + val var2 = createVariable(id = 2L, name = "name2") + val obs1 = createObservation(id = 1L, variable = var1) + val obs2 = createObservation(id = 2L, variable = var1) + val obs3 = createObservation(id = 1L, variable = var2) + val obs4 = createObservation(id = 2L, variable = var2) + val observations: List = listOf(obs1, obs2, obs3, obs4) + // Create Dto that should be returned by the ObservationService. + variableListDto = VariableListDto( + observations + .groupBy { it.variable } + .map { it.toDto() }, + ) + } + + @Test + fun testGetObservations() { + // Instruct the mock to return the fake observations when called. + `when`(observationService.getObservations(subjectId)).thenReturn(variableListDto) + // Make the call to the REST endpoint. + val response = target("subject/sub-1/variables/observations").request().get() + // Expect the http response to be OK and the same as the expected DTO. + assertEquals(200, response.status) + assertEquals(variableListDto, response.readEntity(VariableListDto::class.java)) + } + + @Test + fun testGetObservations_failNoSubjectId() { + // Make the call to the REST endpoint. + val response = target("subject//variables/observations").request().get() + // Expect the http response to be OK and the same as the expected DTO. + assertEquals(404, response.status) + } + + private fun createVariable(id: Long, name: String): Variable { + return Variable( + id = id, + name = name, + type = "type1", + category = null, + observations = emptyList() + ) + } + + private fun createObservation(id: Long, variable: Variable): Observation { + return Observation( + id = id, + subjectId = "sub-1", + variable = variable, + date = null, + valueTextual = "value1", + valueNumeric = 1.0, + endDate = null + ) + } + +} \ No newline at end of file diff --git a/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt b/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt new file mode 100644 index 0000000..6fd99f1 --- /dev/null +++ b/data-dashboard-backend/src/test/java/org/radarbase/datadashboard/api/service/ObservationServiceTest.kt @@ -0,0 +1,95 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +package org.radarbase.datadashboard.api.service + +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import org.mockito.Mock +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations +import org.radarbase.datadashboard.api.api.VariableListDto +import org.radarbase.datadashboard.api.domain.ObservationRepository +import org.radarbase.datadashboard.api.domain.mapper.toDto +import org.radarbase.datadashboard.api.domain.model.Observation +import org.radarbase.datadashboard.api.domain.model.Variable + +class ObservationServiceTest { + + // Create a Mockito mock of the ObservationRepository. This is instantiated in the init block. + @Mock + private lateinit var observationRepository: ObservationRepository + + private val observationService: ObservationService + + init { + // Initialize all Mockito mocks. + MockitoAnnotations.openMocks(this) + observationService = ObservationService(observationRepository) + } + + @Test + fun test_getObservations1() { + + // Create some fake observations that are returned by the repository. + // Each observation is linked to a Variable. + val subjectId = "sub-1" + val var1 = createVariable(id = 1L, name = "name1") + val var2 = createVariable(id = 2L, name = "name2") + val obs1 = createObservation(id = 1L, variable = var1) + val obs2 = createObservation(id = 2L, variable = var1) + val obs3 = createObservation(id = 1L, variable = var2) + val obs4 = createObservation(id = 2L, variable = var2) + val observations = listOf(obs1, obs2, obs3, obs4) + + // Mock the repository to return the fake observations. + `when`(observationRepository.getObservations(subjectId)).thenReturn(observations) + + // Call the ObservationService (class under test) to get the observations. + val result = observationService.getObservations(subjectId) + + // Check if the result is as expected (observations keyed by the Variable). + val expectedDto = VariableListDto( + observations.groupBy { it.variable }.map { it.toDto() } + ) + assertEquals(expectedDto, result) + } + + private fun createVariable(id: Long, name: String): Variable { + return Variable( + id = id, + name = name, + type = "type1", + category = null, + observations = emptyList() + ) + } + + private fun createObservation(id: Long, variable: Variable): Observation { + return Observation( + id = id, + subjectId = "sub-1", + variable = variable, + date = null, + valueTextual = "value1", + valueNumeric = 1.0, + endDate = null + ) + } + +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..800589e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,21 @@ +--- +version: '3.5' + +include: + - data-dashboard-backend/dev/docker-compose-postgres.yml + +services: + + data-dashboard-backend: + image: quay.io/radarbase/data-dashboard-backend:dev + build: + context: . + depends_on: + - data-dashboard-postgresql + networks: + - data + ports: + - "9000:9000" + volumes: + - "./dashboard.yml:/etc/radar/dashboard.yml" + command: ["/etc/radar/dashboard.yml"] diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..878215e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,24 @@ +# +# /* +# * Copyright 2024 The Hyve +# * +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# */ +# + +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..11ef5a2 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,11 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +guava = "32.1.3-jre" + +[libraries] +guava = { module = "com.google.guava:guava", version.ref = "guava" } + +[plugins] +jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.20" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 zcma&NWl&^owk(X(xVyW%ySuwf;qI=D6|RlDJ2cR^yEKh!@I- zp9QeisK*rlxC>+~7Dk4IxIRsKBHqdR9b3+fyL=ynHmIDe&|>O*VlvO+%z5;9Z$|DJ zb4dO}-R=MKr^6EKJiOrJdLnCJn>np?~vU-1sSFgPu;pthGwf}bG z(1db%xwr#x)r+`4AGu$j7~u2MpVs3VpLp|mx&;>`0p0vH6kF+D2CY0fVdQOZ@h;A` z{infNyvmFUiu*XG}RNMNwXrbec_*a3N=2zJ|Wh5z* z5rAX$JJR{#zP>KY**>xHTuw?|-Rg|o24V)74HcfVT;WtQHXlE+_4iPE8QE#DUm%x0 zEKr75ur~W%w#-My3Tj`hH6EuEW+8K-^5P62$7Sc5OK+22qj&Pd1;)1#4tKihi=~8C zHiQSst0cpri6%OeaR`PY>HH_;CPaRNty%WTm4{wDK8V6gCZlG@U3$~JQZ;HPvDJcT1V{ z?>H@13MJcCNe#5z+MecYNi@VT5|&UiN1D4ATT+%M+h4c$t;C#UAs3O_q=GxK0}8%8 z8J(_M9bayxN}69ex4dzM_P3oh@ZGREjVvn%%r7=xjkqxJP4kj}5tlf;QosR=%4L5y zWhgejO=vao5oX%mOHbhJ8V+SG&K5dABn6!WiKl{|oPkq(9z8l&Mm%(=qGcFzI=eLu zWc_oCLyf;hVlB@dnwY98?75B20=n$>u3b|NB28H0u-6Rpl((%KWEBOfElVWJx+5yg z#SGqwza7f}$z;n~g%4HDU{;V{gXIhft*q2=4zSezGK~nBgu9-Q*rZ#2f=Q}i2|qOp z!!y4p)4o=LVUNhlkp#JL{tfkhXNbB=Ox>M=n6soptJw-IDI|_$is2w}(XY>a=H52d z3zE$tjPUhWWS+5h=KVH&uqQS=$v3nRs&p$%11b%5qtF}S2#Pc`IiyBIF4%A!;AVoI zXU8-Rpv!DQNcF~(qQnyyMy=-AN~U>#&X1j5BLDP{?K!%h!;hfJI>$mdLSvktEr*89 zdJHvby^$xEX0^l9g$xW-d?J;L0#(`UT~zpL&*cEh$L|HPAu=P8`OQZV!-}l`noSp_ zQ-1$q$R-gDL)?6YaM!=8H=QGW$NT2SeZlb8PKJdc=F-cT@j7Xags+Pr*jPtlHFnf- zh?q<6;)27IdPc^Wdy-mX%2s84C1xZq9Xms+==F4);O`VUASmu3(RlgE#0+#giLh-& zcxm3_e}n4{%|X zJp{G_j+%`j_q5}k{eW&TlP}J2wtZ2^<^E(O)4OQX8FDp6RJq!F{(6eHWSD3=f~(h} zJXCf7=r<16X{pHkm%yzYI_=VDP&9bmI1*)YXZeB}F? z(%QsB5fo*FUZxK$oX~X^69;x~j7ms8xlzpt-T15e9}$4T-pC z6PFg@;B-j|Ywajpe4~bk#S6(fO^|mm1hKOPfA%8-_iGCfICE|=P_~e;Wz6my&)h_~ zkv&_xSAw7AZ%ThYF(4jADW4vg=oEdJGVOs>FqamoL3Np8>?!W#!R-0%2Bg4h?kz5I zKV-rKN2n(vUL%D<4oj@|`eJ>0i#TmYBtYmfla;c!ATW%;xGQ0*TW@PTlGG><@dxUI zg>+3SiGdZ%?5N=8uoLA|$4isK$aJ%i{hECP$bK{J#0W2gQ3YEa zZQ50Stn6hqdfxJ*9#NuSLwKFCUGk@c=(igyVL;;2^wi4o30YXSIb2g_ud$ zgpCr@H0qWtk2hK8Q|&wx)}4+hTYlf;$a4#oUM=V@Cw#!$(nOFFpZ;0lc!qd=c$S}Z zGGI-0jg~S~cgVT=4Vo)b)|4phjStD49*EqC)IPwyeKBLcN;Wu@Aeph;emROAwJ-0< z_#>wVm$)ygH|qyxZaet&(Vf%pVdnvKWJn9`%DAxj3ot;v>S$I}jJ$FLBF*~iZ!ZXE zkvui&p}fI0Y=IDX)mm0@tAd|fEHl~J&K}ZX(Mm3cm1UAuwJ42+AO5@HwYfDH7ipIc zmI;1J;J@+aCNG1M`Btf>YT>~c&3j~Qi@Py5JT6;zjx$cvOQW@3oQ>|}GH?TW-E z1R;q^QFjm5W~7f}c3Ww|awg1BAJ^slEV~Pk`Kd`PS$7;SqJZNj->it4DW2l15}xP6 zoCl$kyEF%yJni0(L!Z&14m!1urXh6Btj_5JYt1{#+H8w?5QI%% zo-$KYWNMJVH?Hh@1n7OSu~QhSswL8x0=$<8QG_zepi_`y_79=nK=_ZP_`Em2UI*tyQoB+r{1QYZCpb?2OrgUw#oRH$?^Tj!Req>XiE#~B|~ z+%HB;=ic+R@px4Ld8mwpY;W^A%8%l8$@B@1m5n`TlKI6bz2mp*^^^1mK$COW$HOfp zUGTz-cN9?BGEp}5A!mDFjaiWa2_J2Iq8qj0mXzk; z66JBKRP{p%wN7XobR0YjhAuW9T1Gw3FDvR5dWJ8ElNYF94eF3ebu+QwKjtvVu4L zI9ip#mQ@4uqVdkl-TUQMb^XBJVLW(-$s;Nq;@5gr4`UfLgF$adIhd?rHOa%D);whv z=;krPp~@I+-Z|r#s3yCH+c1US?dnm+C*)r{m+86sTJusLdNu^sqLrfWed^ndHXH`m zd3#cOe3>w-ga(Dus_^ppG9AC>Iq{y%%CK+Cro_sqLCs{VLuK=dev>OL1dis4(PQ5R zcz)>DjEkfV+MO;~>VUlYF00SgfUo~@(&9$Iy2|G0T9BSP?&T22>K46D zL*~j#yJ?)^*%J3!16f)@Y2Z^kS*BzwfAQ7K96rFRIh>#$*$_Io;z>ux@}G98!fWR@ zGTFxv4r~v)Gsd|pF91*-eaZ3Qw1MH$K^7JhWIdX%o$2kCbvGDXy)a?@8T&1dY4`;L z4Kn+f%SSFWE_rpEpL9bnlmYq`D!6F%di<&Hh=+!VI~j)2mfil03T#jJ_s?}VV0_hp z7T9bWxc>Jm2Z0WMU?`Z$xE74Gu~%s{mW!d4uvKCx@WD+gPUQ zV0vQS(Ig++z=EHN)BR44*EDSWIyT~R4$FcF*VEY*8@l=218Q05D2$|fXKFhRgBIEE zdDFB}1dKkoO^7}{5crKX!p?dZWNz$m>1icsXG2N+((x0OIST9Zo^DW_tytvlwXGpn zs8?pJXjEG;T@qrZi%#h93?FP$!&P4JA(&H61tqQi=opRzNpm zkrG}$^t9&XduK*Qa1?355wd8G2CI6QEh@Ua>AsD;7oRUNLPb76m4HG3K?)wF~IyS3`fXuNM>${?wmB zpVz;?6_(Fiadfd{vUCBM*_kt$+F3J+IojI;9L(gc9n3{sEZyzR9o!_mOwFC#tQ{Q~ zP3-`#uK#tP3Q7~Q;4H|wjZHO8h7e4IuBxl&vz2w~D8)w=Wtg31zpZhz%+kzSzL*dV zwp@{WU4i;hJ7c2f1O;7Mz6qRKeASoIv0_bV=i@NMG*l<#+;INk-^`5w@}Dj~;k=|}qM1vq_P z|GpBGe_IKq|LNy9SJhKOQ$c=5L{Dv|Q_lZl=-ky*BFBJLW9&y_C|!vyM~rQx=!vun z?rZJQB5t}Dctmui5i31C_;_}CEn}_W%>oSXtt>@kE1=JW*4*v4tPp;O6 zmAk{)m!)}34pTWg8{i>($%NQ(Tl;QC@J@FfBoc%Gr&m560^kgSfodAFrIjF}aIw)X zoXZ`@IsMkc8_=w%-7`D6Y4e*CG8k%Ud=GXhsTR50jUnm+R*0A(O3UKFg0`K;qp1bl z7``HN=?39ic_kR|^R^~w-*pa?Vj#7|e9F1iRx{GN2?wK!xR1GW!qa=~pjJb-#u1K8 zeR?Y2i-pt}yJq;SCiVHODIvQJX|ZJaT8nO+(?HXbLefulKKgM^B(UIO1r+S=7;kLJ zcH}1J=Px2jsh3Tec&v8Jcbng8;V-`#*UHt?hB(pmOipKwf3Lz8rG$heEB30Sg*2rx zV<|KN86$soN(I!BwO`1n^^uF2*x&vJ$2d$>+`(romzHP|)K_KkO6Hc>_dwMW-M(#S zK(~SiXT1@fvc#U+?|?PniDRm01)f^#55;nhM|wi?oG>yBsa?~?^xTU|fX-R(sTA+5 zaq}-8Tx7zrOy#3*JLIIVsBmHYLdD}!0NP!+ITW+Thn0)8SS!$@)HXwB3tY!fMxc#1 zMp3H?q3eD?u&Njx4;KQ5G>32+GRp1Ee5qMO0lZjaRRu&{W<&~DoJNGkcYF<5(Ab+J zgO>VhBl{okDPn78<%&e2mR{jwVCz5Og;*Z;;3%VvoGo_;HaGLWYF7q#jDX=Z#Ml`H z858YVV$%J|e<1n`%6Vsvq7GmnAV0wW4$5qQ3uR@1i>tW{xrl|ExywIc?fNgYlA?C5 zh$ezAFb5{rQu6i7BSS5*J-|9DQ{6^BVQ{b*lq`xS@RyrsJN?-t=MTMPY;WYeKBCNg z^2|pN!Q^WPJuuO4!|P@jzt&tY1Y8d%FNK5xK(!@`jO2aEA*4 zkO6b|UVBipci?){-Ke=+1;mGlND8)6+P;8sq}UXw2hn;fc7nM>g}GSMWu&v&fqh

iViYT=fZ(|3Ox^$aWPp4a8h24tD<|8-!aK0lHgL$N7Efw}J zVIB!7=T$U`ao1?upi5V4Et*-lTG0XvExbf!ya{cua==$WJyVG(CmA6Of*8E@DSE%L z`V^$qz&RU$7G5mg;8;=#`@rRG`-uS18$0WPN@!v2d{H2sOqP|!(cQ@ zUHo!d>>yFArLPf1q`uBvY32miqShLT1B@gDL4XoVTK&@owOoD)OIHXrYK-a1d$B{v zF^}8D3Y^g%^cnvScOSJR5QNH+BI%d|;J;wWM3~l>${fb8DNPg)wrf|GBP8p%LNGN# z3EaIiItgwtGgT&iYCFy9-LG}bMI|4LdmmJt@V@% zb6B)1kc=T)(|L@0;wr<>=?r04N;E&ef+7C^`wPWtyQe(*pD1pI_&XHy|0gIGHMekd zF_*M4yi6J&Z4LQj65)S zXwdM{SwUo%3SbPwFsHgqF@V|6afT|R6?&S;lw=8% z3}@9B=#JI3@B*#4s!O))~z zc>2_4Q_#&+5V`GFd?88^;c1i7;Vv_I*qt!_Yx*n=;rj!82rrR2rQ8u5(Ejlo{15P% zs~!{%XJ>FmJ})H^I9bn^Re&38H{xA!0l3^89k(oU;bZWXM@kn$#aoS&Y4l^-WEn-fH39Jb9lA%s*WsKJQl?n9B7_~P z-XM&WL7Z!PcoF6_D>V@$CvUIEy=+Z&0kt{szMk=f1|M+r*a43^$$B^MidrT0J;RI` z(?f!O<8UZkm$_Ny$Hth1J#^4ni+im8M9mr&k|3cIgwvjAgjH z8`N&h25xV#v*d$qBX5jkI|xOhQn!>IYZK7l5#^P4M&twe9&Ey@@GxYMxBZq2e7?`q z$~Szs0!g{2fGcp9PZEt|rdQ6bhAgpcLHPz?f-vB?$dc*!9OL?Q8mn7->bFD2Si60* z!O%y)fCdMSV|lkF9w%x~J*A&srMyYY3{=&$}H zGQ4VG_?$2X(0|vT0{=;W$~icCI{b6W{B!Q8xdGhF|D{25G_5_+%s(46lhvNLkik~R z>nr(&C#5wwOzJZQo9m|U<;&Wk!_#q|V>fsmj1g<6%hB{jGoNUPjgJslld>xmODzGjYc?7JSuA?A_QzjDw5AsRgi@Y|Z0{F{!1=!NES-#*f^s4l0Hu zz468))2IY5dmD9pa*(yT5{EyP^G>@ZWumealS-*WeRcZ}B%gxq{MiJ|RyX-^C1V=0 z@iKdrGi1jTe8Ya^x7yyH$kBNvM4R~`fbPq$BzHum-3Zo8C6=KW@||>zsA8-Y9uV5V z#oq-f5L5}V<&wF4@X@<3^C%ptp6+Ce)~hGl`kwj)bsAjmo_GU^r940Z-|`<)oGnh7 zFF0Tde3>ui?8Yj{sF-Z@)yQd~CGZ*w-6p2U<8}JO-sRsVI5dBji`01W8A&3$?}lxBaC&vn0E$c5tW* zX>5(zzZ=qn&!J~KdsPl;P@bmA-Pr8T*)eh_+Dv5=Ma|XSle6t(k8qcgNyar{*ReQ8 zTXwi=8vr>!3Ywr+BhggHDw8ke==NTQVMCK`$69fhzEFB*4+H9LIvdt-#IbhZvpS}} zO3lz;P?zr0*0$%-Rq_y^k(?I{Mk}h@w}cZpMUp|ucs55bcloL2)($u%mXQw({Wzc~ z;6nu5MkjP)0C(@%6Q_I_vsWrfhl7Zpoxw#WoE~r&GOSCz;_ro6i(^hM>I$8y>`!wW z*U^@?B!MMmb89I}2(hcE4zN2G^kwyWCZp5JG>$Ez7zP~D=J^LMjSM)27_0B_X^C(M z`fFT+%DcKlu?^)FCK>QzSnV%IsXVcUFhFdBP!6~se&xxrIxsvySAWu++IrH;FbcY$ z2DWTvSBRfLwdhr0nMx+URA$j3i7_*6BWv#DXfym?ZRDcX9C?cY9sD3q)uBDR3uWg= z(lUIzB)G$Hr!){>E{s4Dew+tb9kvToZp-1&c?y2wn@Z~(VBhqz`cB;{E4(P3N2*nJ z_>~g@;UF2iG{Kt(<1PyePTKahF8<)pozZ*xH~U-kfoAayCwJViIrnqwqO}7{0pHw$ zs2Kx?s#vQr7XZ264>5RNKSL8|Ty^=PsIx^}QqOOcfpGUU4tRkUc|kc7-!Ae6!+B{o~7nFpm3|G5^=0#Bnm6`V}oSQlrX(u%OWnC zoLPy&Q;1Jui&7ST0~#+}I^&?vcE*t47~Xq#YwvA^6^} z`WkC)$AkNub|t@S!$8CBlwbV~?yp&@9h{D|3z-vJXgzRC5^nYm+PyPcgRzAnEi6Q^gslXYRv4nycsy-SJu?lMps-? zV`U*#WnFsdPLL)Q$AmD|0`UaC4ND07+&UmOu!eHruzV|OUox<+Jl|Mr@6~C`T@P%s zW7sgXLF2SSe9Fl^O(I*{9wsFSYb2l%-;&Pi^dpv!{)C3d0AlNY6!4fgmSgj_wQ*7Am7&$z;Jg&wgR-Ih;lUvWS|KTSg!&s_E9_bXBkZvGiC6bFKDWZxsD$*NZ#_8bl zG1P-#@?OQzED7@jlMJTH@V!6k;W>auvft)}g zhoV{7$q=*;=l{O>Q4a@ ziMjf_u*o^PsO)#BjC%0^h>Xp@;5$p{JSYDt)zbb}s{Kbt!T*I@Pk@X0zds6wsefuU zW$XY%yyRGC94=6mf?x+bbA5CDQ2AgW1T-jVAJbm7K(gp+;v6E0WI#kuACgV$r}6L? zd|Tj?^%^*N&b>Dd{Wr$FS2qI#Ucs1yd4N+RBUQiSZGujH`#I)mG&VKoDh=KKFl4=G z&MagXl6*<)$6P}*Tiebpz5L=oMaPrN+caUXRJ`D?=K9!e0f{@D&cZLKN?iNP@X0aF zE(^pl+;*T5qt?1jRC=5PMgV!XNITRLS_=9{CJExaQj;lt!&pdzpK?8p>%Mb+D z?yO*uSung=-`QQ@yX@Hyd4@CI^r{2oiu`%^bNkz+Nkk!IunjwNC|WcqvX~k=><-I3 zDQdbdb|!v+Iz01$w@aMl!R)koD77Xp;eZwzSl-AT zr@Vu{=xvgfq9akRrrM)}=!=xcs+U1JO}{t(avgz`6RqiiX<|hGG1pmop8k6Q+G_mv zJv|RfDheUp2L3=^C=4aCBMBn0aRCU(DQwX-W(RkRwmLeuJYF<0urcaf(=7)JPg<3P zQs!~G)9CT18o!J4{zX{_e}4eS)U-E)0FAt}wEI(c0%HkxgggW;(1E=>J17_hsH^sP z%lT0LGgbUXHx-K*CI-MCrP66UP0PvGqM$MkeLyqHdbgP|_Cm!7te~b8p+e6sQ_3k| zVcwTh6d83ltdnR>D^)BYQpDKlLk3g0Hdcgz2}%qUs9~~Rie)A-BV1mS&naYai#xcZ z(d{8=-LVpTp}2*y)|gR~;qc7fp26}lPcLZ#=JpYcn3AT9(UIdOyg+d(P5T7D&*P}# zQCYplZO5|7+r19%9e`v^vfSS1sbX1c%=w1;oyruXB%Kl$ACgKQ6=qNWLsc=28xJjg zwvsI5-%SGU|3p>&zXVl^vVtQT3o-#$UT9LI@Npz~6=4!>mc431VRNN8od&Ul^+G_kHC`G=6WVWM z%9eWNyy(FTO|A+@x}Ou3CH)oi;t#7rAxdIXfNFwOj_@Y&TGz6P_sqiB`Q6Lxy|Q{`|fgmRG(k+!#b*M+Z9zFce)f-7;?Km5O=LHV9f9_87; zF7%R2B+$?@sH&&-$@tzaPYkw0;=i|;vWdI|Wl3q_Zu>l;XdIw2FjV=;Mq5t1Q0|f< zs08j54Bp`3RzqE=2enlkZxmX6OF+@|2<)A^RNQpBd6o@OXl+i)zO%D4iGiQNuXd+zIR{_lb96{lc~bxsBveIw6umhShTX+3@ZJ=YHh@ zWY3(d0azg;7oHn>H<>?4@*RQbi>SmM=JrHvIG(~BrvI)#W(EAeO6fS+}mxxcc+X~W6&YVl86W9WFSS}Vz-f9vS?XUDBk)3TcF z8V?$4Q)`uKFq>xT=)Y9mMFVTUk*NIA!0$?RP6Ig0TBmUFrq*Q-Agq~DzxjStQyJ({ zBeZ;o5qUUKg=4Hypm|}>>L=XKsZ!F$yNTDO)jt4H0gdQ5$f|d&bnVCMMXhNh)~mN z@_UV6D7MVlsWz+zM+inZZp&P4fj=tm6fX)SG5H>OsQf_I8c~uGCig$GzuwViK54bcgL;VN|FnyQl>Ed7(@>=8$a_UKIz|V6CeVSd2(P z0Uu>A8A+muM%HLFJQ9UZ5c)BSAv_zH#1f02x?h9C}@pN@6{>UiAp>({Fn(T9Q8B z^`zB;kJ5b`>%dLm+Ol}ty!3;8f1XDSVX0AUe5P#@I+FQ-`$(a;zNgz)4x5hz$Hfbg z!Q(z26wHLXko(1`;(BAOg_wShpX0ixfWq3ponndY+u%1gyX)_h=v1zR#V}#q{au6; z!3K=7fQwnRfg6FXtNQmP>`<;!N137paFS%y?;lb1@BEdbvQHYC{976l`cLqn;b8lp zIDY>~m{gDj(wfnK!lpW6pli)HyLEiUrNc%eXTil|F2s(AY+LW5hkKb>TQ3|Q4S9rr zpDs4uK_co6XPsn_z$LeS{K4jFF`2>U`tbgKdyDne`xmR<@6AA+_hPNKCOR-Zqv;xk zu5!HsBUb^!4uJ7v0RuH-7?l?}b=w5lzzXJ~gZcxRKOovSk@|#V+MuX%Y+=;14i*%{)_gSW9(#4%)AV#3__kac1|qUy!uyP{>?U#5wYNq}y$S9pCc zFc~4mgSC*G~j0u#qqp9 z${>3HV~@->GqEhr_Xwoxq?Hjn#=s2;i~g^&Hn|aDKpA>Oc%HlW(KA1?BXqpxB;Ydx)w;2z^MpjJ(Qi(X!$5RC z*P{~%JGDQqojV>2JbEeCE*OEu!$XJ>bWA9Oa_Hd;y)F%MhBRi*LPcdqR8X`NQ&1L# z5#9L*@qxrx8n}LfeB^J{%-?SU{FCwiWyHp682F+|pa+CQa3ZLzBqN1{)h4d6+vBbV zC#NEbQLC;}me3eeYnOG*nXOJZEU$xLZ1<1Y=7r0(-U0P6-AqwMAM`a(Ed#7vJkn6plb4eI4?2y3yOTGmmDQ!z9`wzbf z_OY#0@5=bnep;MV0X_;;SJJWEf^E6Bd^tVJ9znWx&Ks8t*B>AM@?;D4oWUGc z!H*`6d7Cxo6VuyS4Eye&L1ZRhrRmN6Lr`{NL(wDbif|y&z)JN>Fl5#Wi&mMIr5i;x zBx}3YfF>>8EC(fYnmpu~)CYHuHCyr5*`ECap%t@y=jD>!_%3iiE|LN$mK9>- zHdtpy8fGZtkZF?%TW~29JIAfi2jZT8>OA7=h;8T{{k?c2`nCEx9$r zS+*&vt~2o^^J+}RDG@+9&M^K*z4p{5#IEVbz`1%`m5c2};aGt=V?~vIM}ZdPECDI)47|CWBCfDWUbxBCnmYivQ*0Nu_xb*C>~C9(VjHM zxe<*D<#dQ8TlpMX2c@M<9$w!RP$hpG4cs%AI){jp*Sj|*`m)5(Bw*A0$*i-(CA5#%>a)$+jI2C9r6|(>J8InryENI z$NohnxDUB;wAYDwrb*!N3noBTKPpPN}~09SEL18tkG zxgz(RYU_;DPT{l?Q$+eaZaxnsWCA^ds^0PVRkIM%bOd|G2IEBBiz{&^JtNsODs;5z zICt_Zj8wo^KT$7Bg4H+y!Df#3mbl%%?|EXe!&(Vmac1DJ*y~3+kRKAD=Ovde4^^%~ zw<9av18HLyrf*_>Slp;^i`Uy~`mvBjZ|?Ad63yQa#YK`4+c6;pW4?XIY9G1(Xh9WO8{F-Aju+nS9Vmv=$Ac0ienZ+p9*O%NG zMZKy5?%Z6TAJTE?o5vEr0r>f>hb#2w2U3DL64*au_@P!J!TL`oH2r*{>ffu6|A7tv zL4juf$DZ1MW5ZPsG!5)`k8d8c$J$o;%EIL0va9&GzWvkS%ZsGb#S(?{!UFOZ9<$a| zY|a+5kmD5N&{vRqkgY>aHsBT&`rg|&kezoD)gP0fsNYHsO#TRc_$n6Lf1Z{?+DLziXlHrq4sf(!>O{?Tj;Eh@%)+nRE_2VxbN&&%%caU#JDU%vL3}Cb zsb4AazPI{>8H&d=jUaZDS$-0^AxE@utGs;-Ez_F(qC9T=UZX=>ok2k2 ziTn{K?y~a5reD2A)P${NoI^>JXn>`IeArow(41c-Wm~)wiryEP(OS{YXWi7;%dG9v zI?mwu1MxD{yp_rrk!j^cKM)dc4@p4Ezyo%lRN|XyD}}>v=Xoib0gOcdXrQ^*61HNj z=NP|pd>@yfvr-=m{8$3A8TQGMTE7g=z!%yt`8`Bk-0MMwW~h^++;qyUP!J~ykh1GO z(FZ59xuFR$(WE;F@UUyE@Sp>`aVNjyj=Ty>_Vo}xf`e7`F;j-IgL5`1~-#70$9_=uBMq!2&1l zomRgpD58@)YYfvLtPW}{C5B35R;ZVvB<<#)x%srmc_S=A7F@DW8>QOEGwD6suhwCg z>Pa+YyULhmw%BA*4yjDp|2{!T98~<6Yfd(wo1mQ!KWwq0eg+6)o1>W~f~kL<-S+P@$wx*zeI|1t7z#Sxr5 zt6w+;YblPQNplq4Z#T$GLX#j6yldXAqj>4gAnnWtBICUnA&-dtnlh=t0Ho_vEKwV` z)DlJi#!@nkYV#$!)@>udAU*hF?V`2$Hf=V&6PP_|r#Iv*J$9)pF@X3`k;5})9^o4y z&)~?EjX5yX12O(BsFy-l6}nYeuKkiq`u9145&3Ssg^y{5G3Pse z9w(YVa0)N-fLaBq1`P!_#>SS(8fh_5!f{UrgZ~uEdeMJIz7DzI5!NHHqQtm~#CPij z?=N|J>nPR6_sL7!f4hD_|KH`vf8(Wpnj-(gPWH+ZvID}%?~68SwhPTC3u1_cB`otq z)U?6qo!ZLi5b>*KnYHWW=3F!p%h1;h{L&(Q&{qY6)_qxNfbP6E3yYpW!EO+IW3?@J z);4>g4gnl^8klu7uA>eGF6rIGSynacogr)KUwE_R4E5Xzi*Qir@b-jy55-JPC8c~( zo!W8y9OGZ&`xmc8;=4-U9=h{vCqfCNzYirONmGbRQlR`WWlgnY+1wCXbMz&NT~9*| z6@FrzP!LX&{no2!Ln_3|I==_4`@}V?4a;YZKTdw;vT<+K+z=uWbW(&bXEaWJ^W8Td z-3&1bY^Z*oM<=M}LVt>_j+p=2Iu7pZmbXrhQ_k)ysE9yXKygFNw$5hwDn(M>H+e1&9BM5!|81vd%r%vEm zqxY3?F@fb6O#5UunwgAHR9jp_W2zZ}NGp2%mTW@(hz7$^+a`A?mb8|_G*GNMJ) zjqegXQio=i@AINre&%ofexAr95aop5C+0MZ0m-l=MeO8m3epm7U%vZB8+I+C*iNFM z#T3l`gknX;D$-`2XT^Cg*vrv=RH+P;_dfF++cP?B_msQI4j+lt&rX2)3GaJx%W*Nn zkML%D{z5tpHH=dksQ*gzc|}gzW;lwAbxoR07VNgS*-c3d&8J|;@3t^ zVUz*J*&r7DFRuFVDCJDK8V9NN5hvpgGjwx+5n)qa;YCKe8TKtdnh{I7NU9BCN!0dq zczrBk8pE{{@vJa9ywR@mq*J=v+PG;?fwqlJVhijG!3VmIKs>9T6r7MJpC)m!Tc#>g zMtVsU>wbwFJEfwZ{vB|ZlttNe83)$iz`~#8UJ^r)lJ@HA&G#}W&ZH*;k{=TavpjWE z7hdyLZPf*X%Gm}i`Y{OGeeu^~nB8=`{r#TUrM-`;1cBvEd#d!kPqIgYySYhN-*1;L z^byj%Yi}Gx)Wnkosi337BKs}+5H5dth1JA{Ir-JKN$7zC)*}hqeoD(WfaUDPT>0`- z(6sa0AoIqASwF`>hP}^|)a_j2s^PQn*qVC{Q}htR z5-)duBFXT_V56-+UohKXlq~^6uf!6sA#ttk1o~*QEy_Y-S$gAvq47J9Vtk$5oA$Ct zYhYJ@8{hsC^98${!#Ho?4y5MCa7iGnfz}b9jE~h%EAAv~Qxu)_rAV;^cygV~5r_~?l=B`zObj7S=H=~$W zPtI_m%g$`kL_fVUk9J@>EiBH zOO&jtn~&`hIFMS5S`g8w94R4H40mdNUH4W@@XQk1sr17b{@y|JB*G9z1|CrQjd+GX z6+KyURG3;!*BQrentw{B2R&@2&`2}n(z-2&X7#r!{yg@Soy}cRD~j zj9@UBW+N|4HW4AWapy4wfUI- zZ`gSL6DUlgj*f1hSOGXG0IVH8HxK?o2|3HZ;KW{K+yPAlxtb)NV_2AwJm|E)FRs&& z=c^e7bvUsztY|+f^k7NXs$o1EUq>cR7C0$UKi6IooHWlK_#?IWDkvywnzg&ThWo^? z2O_N{5X39#?eV9l)xI(>@!vSB{DLt*oY!K1R8}_?%+0^C{d9a%N4 zoxHVT1&Lm|uDX%$QrBun5e-F`HJ^T$ zmzv)p@4ZHd_w9!%Hf9UYNvGCw2TTTbrj9pl+T9%-_-}L(tES>Or-}Z4F*{##n3~L~TuxjirGuIY#H7{%$E${?p{Q01 zi6T`n;rbK1yIB9jmQNycD~yZq&mbIsFWHo|ZAChSFPQa<(%d8mGw*V3fh|yFoxOOiWJd(qvVb!Z$b88cg->N=qO*4k~6;R==|9ihg&riu#P~s4Oap9O7f%crSr^rljeIfXDEg>wi)&v*a%7zpz<9w z*r!3q9J|390x`Zk;g$&OeN&ctp)VKRpDSV@kU2Q>jtok($Y-*x8_$2piTxun81@vt z!Vj?COa0fg2RPXMSIo26T=~0d`{oGP*eV+$!0I<(4azk&Vj3SiG=Q!6mX0p$z7I}; z9BJUFgT-K9MQQ-0@Z=^7R<{bn2Fm48endsSs`V7_@%8?Bxkqv>BDoVcj?K#dV#uUP zL1ND~?D-|VGKe3Rw_7-Idpht>H6XRLh*U7epS6byiGvJpr%d}XwfusjH9g;Z98H`x zyde%%5mhGOiL4wljCaWCk-&uE4_OOccb9c!ZaWt4B(wYl!?vyzl%7n~QepN&eFUrw zFIOl9c({``6~QD+43*_tzP{f2x41h(?b43^y6=iwyB)2os5hBE!@YUS5?N_tXd=h( z)WE286Fbd>R4M^P{!G)f;h<3Q>Fipuy+d2q-)!RyTgt;wr$(?9ox3;q+{E*ZQHhOn;lM`cjnu9 zXa48ks-v(~b*;MAI<>YZH(^NV8vjb34beE<_cwKlJoR;k6lJNSP6v}uiyRD?|0w+X@o1ONrH8a$fCxXpf? z?$DL0)7|X}Oc%h^zrMKWc-NS9I0Utu@>*j}b@tJ=ixQSJ={4@854wzW@E>VSL+Y{i z#0b=WpbCZS>kUCO_iQz)LoE>P5LIG-hv9E+oG}DtlIDF>$tJ1aw9^LuhLEHt?BCj& z(O4I8v1s#HUi5A>nIS-JK{v!7dJx)^Yg%XjNmlkWAq2*cv#tHgz`Y(bETc6CuO1VkN^L-L3j_x<4NqYb5rzrLC-7uOv z!5e`GZt%B782C5-fGnn*GhDF$%(qP<74Z}3xx+{$4cYKy2ikxI7B2N+2r07DN;|-T->nU&!=Cm#rZt%O_5c&1Z%nlWq3TKAW0w zQqemZw_ue--2uKQsx+niCUou?HjD`xhEjjQd3%rrBi82crq*~#uA4+>vR<_S{~5ce z-2EIl?~s z1=GVL{NxP1N3%=AOaC}j_Fv=ur&THz zyO!d9kHq|c73kpq`$+t+8Bw7MgeR5~`d7ChYyGCBWSteTB>8WAU(NPYt2Dk`@#+}= zI4SvLlyk#pBgVigEe`?NG*vl7V6m+<}%FwPV=~PvvA)=#ths==DRTDEYh4V5}Cf$z@#;< zyWfLY_5sP$gc3LLl2x+Ii)#b2nhNXJ{R~vk`s5U7Nyu^3yFg&D%Txwj6QezMX`V(x z=C`{76*mNb!qHHs)#GgGZ_7|vkt9izl_&PBrsu@}L`X{95-2jf99K)0=*N)VxBX2q z((vkpP2RneSIiIUEnGb?VqbMb=Zia+rF~+iqslydE34cSLJ&BJW^3knX@M;t*b=EA zNvGzv41Ld_T+WT#XjDB840vovUU^FtN_)G}7v)1lPetgpEK9YS^OWFkPoE{ovj^=@ zO9N$S=G$1ecndT_=5ehth2Lmd1II-PuT~C9`XVePw$y8J#dpZ?Tss<6wtVglm(Ok7 z3?^oi@pPio6l&!z8JY(pJvG=*pI?GIOu}e^EB6QYk$#FJQ%^AIK$I4epJ+9t?KjqA+bkj&PQ*|vLttme+`9G=L% ziadyMw_7-M)hS(3E$QGNCu|o23|%O+VN7;Qggp?PB3K-iSeBa2b}V4_wY`G1Jsfz4 z9|SdB^;|I8E8gWqHKx!vj_@SMY^hLEIbSMCuE?WKq=c2mJK z8LoG-pnY!uhqFv&L?yEuxo{dpMTsmCn)95xanqBrNPTgXP((H$9N${Ow~Is-FBg%h z53;|Y5$MUN)9W2HBe2TD`ct^LHI<(xWrw}$qSoei?}s)&w$;&!14w6B6>Yr6Y8b)S z0r71`WmAvJJ`1h&poLftLUS6Ir zC$bG9!Im_4Zjse)#K=oJM9mHW1{%l8sz$1o?ltdKlLTxWWPB>Vk22czVt|1%^wnN@*!l)}?EgtvhC>vlHm^t+ogpgHI1_$1ox9e;>0!+b(tBrmXRB`PY1vp-R**8N7 zGP|QqI$m(Rdu#=(?!(N}G9QhQ%o!aXE=aN{&wtGP8|_qh+7a_j_sU5|J^)vxq;# zjvzLn%_QPHZZIWu1&mRAj;Sa_97p_lLq_{~j!M9N^1yp3U_SxRqK&JnR%6VI#^E12 z>CdOVI^_9aPK2eZ4h&^{pQs}xsijXgFYRIxJ~N7&BB9jUR1fm!(xl)mvy|3e6-B3j zJn#ajL;bFTYJ2+Q)tDjx=3IklO@Q+FFM}6UJr6km7hj7th9n_&JR7fnqC!hTZoM~T zBeaVFp%)0cbPhejX<8pf5HyRUj2>aXnXBqDJe73~J%P(2C?-RT{c3NjE`)om! zl$uewSgWkE66$Kb34+QZZvRn`fob~Cl9=cRk@Es}KQm=?E~CE%spXaMO6YmrMl%9Q zlA3Q$3|L1QJ4?->UjT&CBd!~ru{Ih^in&JXO=|<6J!&qp zRe*OZ*cj5bHYlz!!~iEKcuE|;U4vN1rk$xq6>bUWD*u(V@8sG^7>kVuo(QL@Ki;yL zWC!FT(q{E8#on>%1iAS0HMZDJg{Z{^!De(vSIq&;1$+b)oRMwA3nc3mdTSG#3uYO_ z>+x;7p4I;uHz?ZB>dA-BKl+t-3IB!jBRgdvAbW!aJ(Q{aT>+iz?91`C-xbe)IBoND z9_Xth{6?(y3rddwY$GD65IT#f3<(0o#`di{sh2gm{dw*#-Vnc3r=4==&PU^hCv$qd zjw;>i&?L*Wq#TxG$mFIUf>eK+170KG;~+o&1;Tom9}}mKo23KwdEM6UonXgc z!6N(@k8q@HPw{O8O!lAyi{rZv|DpgfU{py+j(X_cwpKqcalcqKIr0kM^%Br3SdeD> zHSKV94Yxw;pjzDHo!Q?8^0bb%L|wC;4U^9I#pd5O&eexX+Im{ z?jKnCcsE|H?{uGMqVie_C~w7GX)kYGWAg%-?8|N_1#W-|4F)3YTDC+QSq1s!DnOML3@d`mG%o2YbYd#jww|jD$gotpa)kntakp#K;+yo-_ZF9qrNZw<%#C zuPE@#3RocLgPyiBZ+R_-FJ_$xP!RzWm|aN)S+{$LY9vvN+IW~Kf3TsEIvP+B9Mtm! zpfNNxObWQpLoaO&cJh5>%slZnHl_Q~(-Tfh!DMz(dTWld@LG1VRF`9`DYKhyNv z2pU|UZ$#_yUx_B_|MxUq^glT}O5Xt(Vm4Mr02><%C)@v;vPb@pT$*yzJ4aPc_FZ3z z3}PLoMBIM>q_9U2rl^sGhk1VUJ89=*?7|v`{!Z{6bqFMq(mYiA?%KbsI~JwuqVA9$H5vDE+VocjX+G^%bieqx->s;XWlKcuv(s%y%D5Xbc9+ zc(_2nYS1&^yL*ey664&4`IoOeDIig}y-E~_GS?m;D!xv5-xwz+G`5l6V+}CpeJDi^ z%4ed$qowm88=iYG+(`ld5Uh&>Dgs4uPHSJ^TngXP_V6fPyl~>2bhi20QB%lSd#yYn zO05?KT1z@?^-bqO8Cg`;ft>ilejsw@2%RR7;`$Vs;FmO(Yr3Fp`pHGr@P2hC%QcA|X&N2Dn zYf`MqXdHi%cGR@%y7Rg7?d3?an){s$zA{!H;Ie5exE#c~@NhQUFG8V=SQh%UxUeiV zd7#UcYqD=lk-}sEwlpu&H^T_V0{#G?lZMxL7ih_&{(g)MWBnCZxtXg znr#}>U^6!jA%e}@Gj49LWG@*&t0V>Cxc3?oO7LSG%~)Y5}f7vqUUnQ;STjdDU}P9IF9d9<$;=QaXc zL1^X7>fa^jHBu_}9}J~#-oz3Oq^JmGR#?GO7b9a(=R@fw@}Q{{@`Wy1vIQ#Bw?>@X z-_RGG@wt|%u`XUc%W{J z>iSeiz8C3H7@St3mOr_mU+&bL#Uif;+Xw-aZdNYUpdf>Rvu0i0t6k*}vwU`XNO2he z%miH|1tQ8~ZK!zmL&wa3E;l?!!XzgV#%PMVU!0xrDsNNZUWKlbiOjzH-1Uoxm8E#r`#2Sz;-o&qcqB zC-O_R{QGuynW14@)7&@yw1U}uP(1cov)twxeLus0s|7ayrtT8c#`&2~Fiu2=R;1_4bCaD=*E@cYI>7YSnt)nQc zohw5CsK%m?8Ack)qNx`W0_v$5S}nO|(V|RZKBD+btO?JXe|~^Qqur%@eO~<8-L^9d z=GA3-V14ng9L29~XJ>a5k~xT2152zLhM*@zlp2P5Eu}bywkcqR;ISbas&#T#;HZSf z2m69qTV(V@EkY(1Dk3`}j)JMo%ZVJ*5eB zYOjIisi+igK0#yW*gBGj?@I{~mUOvRFQR^pJbEbzFxTubnrw(Muk%}jI+vXmJ;{Q6 zrSobKD>T%}jV4Ub?L1+MGOD~0Ir%-`iTnWZN^~YPrcP5y3VMAzQ+&en^VzKEb$K!Q z<7Dbg&DNXuow*eD5yMr+#08nF!;%4vGrJI++5HdCFcGLfMW!KS*Oi@=7hFwDG!h2< zPunUEAF+HncQkbfFj&pbzp|MU*~60Z(|Ik%Tn{BXMN!hZOosNIseT?R;A`W?=d?5X zK(FB=9mZusYahp|K-wyb={rOpdn=@;4YI2W0EcbMKyo~-#^?h`BA9~o285%oY zfifCh5Lk$SY@|2A@a!T2V+{^!psQkx4?x0HSV`(w9{l75QxMk!)U52Lbhn{8ol?S) zCKo*7R(z!uk<6*qO=wh!Pul{(qq6g6xW;X68GI_CXp`XwO zxuSgPRAtM8K7}5E#-GM!*ydOOG_{A{)hkCII<|2=ma*71ci_-}VPARm3crFQjLYV! z9zbz82$|l01mv`$WahE2$=fAGWkd^X2kY(J7iz}WGS z@%MyBEO=A?HB9=^?nX`@nh;7;laAjs+fbo!|K^mE!tOB>$2a_O0y-*uaIn8k^6Y zSbuv;5~##*4Y~+y7Z5O*3w4qgI5V^17u*ZeupVGH^nM&$qmAk|anf*>r zWc5CV;-JY-Z@Uq1Irpb^O`L_7AGiqd*YpGUShb==os$uN3yYvb`wm6d=?T*it&pDk zo`vhw)RZX|91^^Wa_ti2zBFyWy4cJu#g)_S6~jT}CC{DJ_kKpT`$oAL%b^!2M;JgT zM3ZNbUB?}kP(*YYvXDIH8^7LUxz5oE%kMhF!rnPqv!GiY0o}NR$OD=ITDo9r%4E>E0Y^R(rS^~XjWyVI6 zMOR5rPXhTp*G*M&X#NTL`Hu*R+u*QNoiOKg4CtNPrjgH>c?Hi4MUG#I917fx**+pJfOo!zFM&*da&G_x)L(`k&TPI*t3e^{crd zX<4I$5nBQ8Ax_lmNRa~E*zS-R0sxkz`|>7q_?*e%7bxqNm3_eRG#1ae3gtV9!fQpY z+!^a38o4ZGy9!J5sylDxZTx$JmG!wg7;>&5H1)>f4dXj;B+@6tMlL=)cLl={jLMxY zbbf1ax3S4>bwB9-$;SN2?+GULu;UA-35;VY*^9Blx)Jwyb$=U!D>HhB&=jSsd^6yw zL)?a|>GxU!W}ocTC(?-%z3!IUhw^uzc`Vz_g>-tv)(XA#JK^)ZnC|l1`@CdX1@|!| z_9gQ)7uOf?cR@KDp97*>6X|;t@Y`k_N@)aH7gY27)COv^P3ya9I{4z~vUjLR9~z1Z z5=G{mVtKH*&$*t0@}-i_v|3B$AHHYale7>E+jP`ClqG%L{u;*ff_h@)al?RuL7tOO z->;I}>%WI{;vbLP3VIQ^iA$4wl6@0sDj|~112Y4OFjMs`13!$JGkp%b&E8QzJw_L5 zOnw9joc0^;O%OpF$Qp)W1HI!$4BaXX84`%@#^dk^hFp^pQ@rx4g(8Xjy#!X%+X5Jd@fs3amGT`}mhq#L97R>OwT5-m|h#yT_-v@(k$q7P*9X~T*3)LTdzP!*B} z+SldbVWrrwQo9wX*%FyK+sRXTa@O?WM^FGWOE?S`R(0P{<6p#f?0NJvnBia?k^fX2 zNQs7K-?EijgHJY}&zsr;qJ<*PCZUd*x|dD=IQPUK_nn)@X4KWtqoJNHkT?ZWL_hF? zS8lp2(q>;RXR|F;1O}EE#}gCrY~#n^O`_I&?&z5~7N;zL0)3Tup`%)oHMK-^r$NT% zbFg|o?b9w(q@)6w5V%si<$!U<#}s#x@0aX-hP>zwS#9*75VXA4K*%gUc>+yzupTDBOKH8WR4V0pM(HrfbQ&eJ79>HdCvE=F z|J>s;;iDLB^3(9}?biKbxf1$lI!*Z%*0&8UUq}wMyPs_hclyQQi4;NUY+x2qy|0J; zhn8;5)4ED1oHwg+VZF|80<4MrL97tGGXc5Sw$wAI#|2*cvQ=jB5+{AjMiDHmhUC*a zlmiZ`LAuAn_}hftXh;`Kq0zblDk8?O-`tnilIh|;3lZp@F_osJUV9`*R29M?7H{Fy z`nfVEIDIWXmU&YW;NjU8)EJpXhxe5t+scf|VXM!^bBlwNh)~7|3?fWwo_~ZFk(22% zTMesYw+LNx3J-_|DM~`v93yXe=jPD{q;li;5PD?Dyk+b? zo21|XpT@)$BM$%F=P9J19Vi&1#{jM3!^Y&fr&_`toi`XB1!n>sbL%U9I5<7!@?t)~ z;&H%z>bAaQ4f$wIzkjH70;<8tpUoxzKrPhn#IQfS%9l5=Iu))^XC<58D!-O z{B+o5R^Z21H0T9JQ5gNJnqh#qH^na|z92=hONIM~@_iuOi|F>jBh-?aA20}Qx~EpDGElELNn~|7WRXRFnw+Wdo`|# zBpU=Cz3z%cUJ0mx_1($X<40XEIYz(`noWeO+x#yb_pwj6)R(__%@_Cf>txOQ74wSJ z0#F3(zWWaR-jMEY$7C*3HJrohc79>MCUu26mfYN)f4M~4gD`}EX4e}A!U}QV8!S47 z6y-U-%+h`1n`*pQuKE%Av0@)+wBZr9mH}@vH@i{v(m-6QK7Ncf17x_D=)32`FOjjo zg|^VPf5c6-!FxN{25dvVh#fog=NNpXz zfB$o+0jbRkHH{!TKhE709f+jI^$3#v1Nmf80w`@7-5$1Iv_`)W^px8P-({xwb;D0y z7LKDAHgX<84?l!I*Dvi2#D@oAE^J|g$3!)x1Ua;_;<@#l1fD}lqU2_tS^6Ht$1Wl} zBESo7o^)9-Tjuz$8YQSGhfs{BQV6zW7dA?0b(Dbt=UnQs&4zHfe_sj{RJ4uS-vQpC zX;Bbsuju4%!o8?&m4UZU@~ZZjeFF6ex2ss5_60_JS_|iNc+R0GIjH1@Z z=rLT9%B|WWgOrR7IiIwr2=T;Ne?30M!@{%Qf8o`!>=s<2CBpCK_TWc(DX51>e^xh8 z&@$^b6CgOd7KXQV&Y4%}_#uN*mbanXq(2=Nj`L7H7*k(6F8s6{FOw@(DzU`4-*77{ zF+dxpv}%mFpYK?>N_2*#Y?oB*qEKB}VoQ@bzm>ptmVS_EC(#}Lxxx730trt0G)#$b zE=wVvtqOct1%*9}U{q<)2?{+0TzZzP0jgf9*)arV)*e!f`|jgT{7_9iS@e)recI#z zbzolURQ+TOzE!ymqvBY7+5NnAbWxvMLsLTwEbFqW=CPyCsmJ}P1^V30|D5E|p3BC5 z)3|qgw@ra7aXb-wsa|l^in~1_fm{7bS9jhVRkYVO#U{qMp z)Wce+|DJ}4<2gp8r0_xfZpMo#{Hl2MfjLcZdRB9(B(A(f;+4s*FxV{1F|4d`*sRNd zp4#@sEY|?^FIJ;tmH{@keZ$P(sLh5IdOk@k^0uB^BWr@pk6mHy$qf&~rI>P*a;h0C{%oA*i!VjWn&D~O#MxN&f@1Po# zKN+ zrGrkSjcr?^R#nGl<#Q722^wbYcgW@{+6CBS<1@%dPA8HC!~a`jTz<`g_l5N1M@9wn9GOAZ>nqNgq!yOCbZ@1z`U_N`Z>}+1HIZxk*5RDc&rd5{3qjRh8QmT$VyS;jK z;AF+r6XnnCp=wQYoG|rT2@8&IvKq*IB_WvS%nt%e{MCFm`&W*#LXc|HrD?nVBo=(8*=Aq?u$sDA_sC_RPDUiQ+wnIJET8vx$&fxkW~kP9qXKt zozR)@xGC!P)CTkjeWvXW5&@2?)qt)jiYWWBU?AUtzAN}{JE1I)dfz~7$;}~BmQF`k zpn11qmObXwRB8&rnEG*#4Xax3XBkKlw(;tb?Np^i+H8m(Wyz9k{~ogba@laiEk;2! zV*QV^6g6(QG%vX5Um#^sT&_e`B1pBW5yVth~xUs#0}nv?~C#l?W+9Lsb_5)!71rirGvY zTIJ$OPOY516Y|_014sNv+Z8cc5t_V=i>lWV=vNu#!58y9Zl&GsMEW#pPYPYGHQ|;vFvd*9eM==$_=vc7xnyz0~ zY}r??$<`wAO?JQk@?RGvkWVJlq2dk9vB(yV^vm{=NVI8dhsX<)O(#nr9YD?I?(VmQ z^r7VfUBn<~p3()8yOBjm$#KWx!5hRW)5Jl7wY@ky9lNM^jaT##8QGVsYeaVywmpv>X|Xj7gWE1Ezai&wVLt3p)k4w~yrskT-!PR!kiyQlaxl(( zXhF%Q9x}1TMt3~u@|#wWm-Vq?ZerK={8@~&@9r5JW}r#45#rWii};t`{5#&3$W)|@ zbAf2yDNe0q}NEUvq_Quq3cTjcw z@H_;$hu&xllCI9CFDLuScEMg|x{S7GdV8<&Mq=ezDnRZAyX-8gv97YTm0bg=d)(>N z+B2FcqvI9>jGtnK%eO%y zoBPkJTk%y`8TLf4)IXPBn`U|9>O~WL2C~C$z~9|0m*YH<-vg2CD^SX#&)B4ngOSG$ zV^wmy_iQk>dfN@Pv(ckfy&#ak@MLC7&Q6Ro#!ezM*VEh`+b3Jt%m(^T&p&WJ2Oqvj zs-4nq0TW6cv~(YI$n0UkfwN}kg3_fp?(ijSV#tR9L0}l2qjc7W?i*q01=St0eZ=4h zyGQbEw`9OEH>NMuIe)hVwYHsGERWOD;JxEiO7cQv%pFCeR+IyhwQ|y@&^24k+|8fD zLiOWFNJ2&vu2&`Jv96_z-Cd5RLgmeY3*4rDOQo?Jm`;I_(+ejsPM03!ly!*Cu}Cco zrQSrEDHNyzT(D5s1rZq!8#?f6@v6dB7a-aWs(Qk>N?UGAo{gytlh$%_IhyL7h?DLXDGx zgxGEBQoCAWo-$LRvM=F5MTle`M})t3vVv;2j0HZY&G z22^iGhV@uaJh(XyyY%} zd4iH_UfdV#T=3n}(Lj^|n;O4|$;xhu*8T3hR1mc_A}fK}jfZ7LX~*n5+`8N2q#rI$ z@<_2VANlYF$vIH$ zl<)+*tIWW78IIINA7Rr7i{<;#^yzxoLNkXL)eSs=%|P>$YQIh+ea_3k z_s7r4%j7%&*NHSl?R4k%1>Z=M9o#zxY!n8sL5>BO-ZP;T3Gut>iLS@U%IBrX6BA3k z)&@q}V8a{X<5B}K5s(c(LQ=%v1ocr`t$EqqY0EqVjr65usa=0bkf|O#ky{j3)WBR(((L^wmyHRzoWuL2~WTC=`yZ zn%VX`L=|Ok0v7?s>IHg?yArBcync5rG#^+u)>a%qjES%dRZoIyA8gQ;StH z1Ao7{<&}6U=5}4v<)1T7t!J_CL%U}CKNs-0xWoTTeqj{5{?Be$L0_tk>M9o8 zo371}S#30rKZFM{`H_(L`EM9DGp+Mifk&IP|C2Zu_)Ghr4Qtpmkm1osCf@%Z$%t+7 zYH$Cr)Ro@3-QDeQJ8m+x6%;?YYT;k6Z0E-?kr>x33`H%*ueBD7Zx~3&HtWn0?2Wt} zTG}*|v?{$ajzt}xPzV%lL1t-URi8*Zn)YljXNGDb>;!905Td|mpa@mHjIH%VIiGx- zd@MqhpYFu4_?y5N4xiHn3vX&|e6r~Xt> zZG`aGq|yTNjv;9E+Txuoa@A(9V7g?1_T5FzRI;!=NP1Kqou1z5?%X~Wwb{trRfd>i z8&y^H)8YnKyA_Fyx>}RNmQIczT?w2J4SNvI{5J&}Wto|8FR(W;Qw#b1G<1%#tmYzQ zQ2mZA-PAdi%RQOhkHy9Ea#TPSw?WxwL@H@cbkZwIq0B!@ns}niALidmn&W?!Vd4Gj zO7FiuV4*6Mr^2xlFSvM;Cp_#r8UaqIzHJQg_z^rEJw&OMm_8NGAY2)rKvki|o1bH~ z$2IbfVeY2L(^*rMRU1lM5Y_sgrDS`Z??nR2lX;zyR=c%UyGb*%TC-Dil?SihkjrQy~TMv6;BMs7P8il`H7DmpVm@rJ;b)hW)BL)GjS154b*xq-NXq2cwE z^;VP7ua2pxvCmxrnqUYQMH%a%nHmwmI33nJM(>4LznvY*k&C0{8f*%?zggpDgkuz&JBx{9mfb@wegEl2v!=}Sq2Gaty0<)UrOT0{MZtZ~j5y&w zXlYa_jY)I_+VA-^#mEox#+G>UgvM!Ac8zI<%JRXM_73Q!#i3O|)lOP*qBeJG#BST0 zqohi)O!|$|2SeJQo(w6w7%*92S})XfnhrH_Z8qe!G5>CglP=nI7JAOW?(Z29;pXJ9 zR9`KzQ=WEhy*)WH>$;7Cdz|>*i>=##0bB)oU0OR>>N<21e4rMCHDemNi2LD>Nc$;& zQRFthpWniC1J6@Zh~iJCoLOxN`oCKD5Q4r%ynwgUKPlIEd#?QViIqovY|czyK8>6B zSP%{2-<;%;1`#0mG^B(8KbtXF;Nf>K#Di72UWE4gQ%(_26Koiad)q$xRL~?pN71ZZ zujaaCx~jXjygw;rI!WB=xrOJO6HJ!!w}7eiivtCg5K|F6$EXa)=xUC za^JXSX98W`7g-tm@uo|BKj39Dl;sg5ta;4qjo^pCh~{-HdLl6qI9Ix6f$+qiZ$}s= zNguKrU;u+T@ko(Vr1>)Q%h$?UKXCY>3se%&;h2osl2D zE4A9bd7_|^njDd)6cI*FupHpE3){4NQ*$k*cOWZ_?CZ>Z4_fl@n(mMnYK62Q1d@+I zr&O))G4hMihgBqRIAJkLdk(p(D~X{-oBUA+If@B}j& zsHbeJ3RzTq96lB7d($h$xTeZ^gP0c{t!Y0c)aQE;$FY2!mACg!GDEMKXFOPI^)nHZ z`aSPJpvV0|bbrzhWWkuPURlDeN%VT8tndV8?d)eN*i4I@u zVKl^6{?}A?P)Fsy?3oi#clf}L18t;TjNI2>eI&(ezDK7RyqFxcv%>?oxUlonv(px) z$vnPzRH`y5A(x!yOIfL0bmgeMQB$H5wenx~!ujQK*nUBW;@Em&6Xv2%s(~H5WcU2R z;%Nw<$tI)a`Ve!>x+qegJnQsN2N7HaKzrFqM>`6R*gvh%O*-%THt zrB$Nk;lE;z{s{r^PPm5qz(&lM{sO*g+W{sK+m3M_z=4=&CC>T`{X}1Vg2PEfSj2x_ zmT*(x;ov%3F?qoEeeM>dUn$a*?SIGyO8m806J1W1o+4HRhc2`9$s6hM#qAm zChQ87b~GEw{ADfs+5}FJ8+|bIlIv(jT$Ap#hSHoXdd9#w<#cA<1Rkq^*EEkknUd4& zoIWIY)sAswy6fSERVm&!SO~#iN$OgOX*{9@_BWFyJTvC%S++ilSfCrO(?u=Dc?CXZ zzCG&0yVR{Z`|ZF0eEApWEo#s9osV>F{uK{QA@BES#&;#KsScf>y zvs?vIbI>VrT<*!;XmQS=bhq%46-aambZ(8KU-wOO2=en~D}MCToB_u;Yz{)1ySrPZ z@=$}EvjTdzTWU7c0ZI6L8=yP+YRD_eMMos}b5vY^S*~VZysrkq<`cK3>>v%uy7jgq z0ilW9KjVDHLv0b<1K_`1IkbTOINs0=m-22c%M~l=^S}%hbli-3?BnNq?b`hx^HX2J zIe6ECljRL0uBWb`%{EA=%!i^4sMcj+U_TaTZRb+~GOk z^ZW!nky0n*Wb*r+Q|9H@ml@Z5gU&W`(z4-j!OzC1wOke`TRAYGZVl$PmQ16{3196( zO*?`--I}Qf(2HIwb2&1FB^!faPA2=sLg(@6P4mN)>Dc3i(B0;@O-y2;lM4akD>@^v z=u>*|!s&9zem70g7zfw9FXl1bpJW(C#5w#uy5!V?Q(U35A~$dR%LDVnq@}kQm13{} zd53q3N(s$Eu{R}k2esbftfjfOITCL;jWa$}(mmm}d(&7JZ6d3%IABCapFFYjdEjdK z&4Edqf$G^MNAtL=uCDRs&Fu@FXRgX{*0<(@c3|PNHa>L%zvxWS={L8%qw`STm+=Rd zA}FLspESSIpE_^41~#5yI2bJ=9`oc;GIL!JuW&7YetZ?0H}$$%8rW@*J37L-~Rsx!)8($nI4 zZhcZ2^=Y+p4YPl%j!nFJA|*M^gc(0o$i3nlphe+~-_m}jVkRN{spFs(o0ajW@f3K{ zDV!#BwL322CET$}Y}^0ixYj2w>&Xh12|R8&yEw|wLDvF!lZ#dOTHM9pK6@Nm-@9Lnng4ZHBgBSrr7KI8YCC9DX5Kg|`HsiwJHg2(7#nS;A{b3tVO?Z% za{m5b3rFV6EpX;=;n#wltDv1LE*|g5pQ+OY&*6qCJZc5oDS6Z6JD#6F)bWxZSF@q% z+1WV;m!lRB!n^PC>RgQCI#D1br_o^#iPk>;K2hB~0^<~)?p}LG%kigm@moD#q3PE+ zA^Qca)(xnqw6x>XFhV6ku9r$E>bWNrVH9fum0?4s?Rn2LG{Vm_+QJHse6xa%nzQ?k zKug4PW~#Gtb;#5+9!QBgyB@q=sk9=$S{4T>wjFICStOM?__fr+Kei1 z3j~xPqW;W@YkiUM;HngG!;>@AITg}vAE`M2Pj9Irl4w1fo4w<|Bu!%rh%a(Ai^Zhi zs92>v5;@Y(Zi#RI*ua*h`d_7;byQSa*v9E{2x$<-_=5Z<7{%)}4XExANcz@rK69T0x3%H<@frW>RA8^swA+^a(FxK| zFl3LD*ImHN=XDUkrRhp6RY5$rQ{bRgSO*(vEHYV)3Mo6Jy3puiLmU&g82p{qr0F?ohmbz)f2r{X2|T2 z$4fdQ=>0BeKbiVM!e-lIIs8wVTuC_m7}y4A_%ikI;Wm5$9j(^Y z(cD%U%k)X>_>9~t8;pGzL6L-fmQO@K; zo&vQzMlgY95;1BSkngY)e{`n0!NfVgf}2mB3t}D9@*N;FQ{HZ3Pb%BK6;5#-O|WI( zb6h@qTLU~AbVW#_6?c!?Dj65Now7*pU{h!1+eCV^KCuPAGs28~3k@ueL5+u|Z-7}t z9|lskE`4B7W8wMs@xJa{#bsCGDFoRSNSnmNYB&U7 zVGKWe%+kFB6kb)e;TyHfqtU6~fRg)f|>=5(N36)0+C z`hv65J<$B}WUc!wFAb^QtY31yNleq4dzmG`1wHTj=c*=hay9iD071Hc?oYoUk|M*_ zU1GihAMBsM@5rUJ(qS?9ZYJ6@{bNqJ`2Mr+5#hKf?doa?F|+^IR!8lq9)wS3tF_9n zW_?hm)G(M+MYb?V9YoX^_mu5h-LP^TL^!Q9Z7|@sO(rg_4+@=PdI)WL(B7`!K^ND- z-uIuVDCVEdH_C@c71YGYT^_Scf_dhB8Z2Xy6vGtBSlYud9vggOqv^L~F{BraSE_t} zIkP+Hp2&nH^-MNEs}^`oMLy11`PQW$T|K(`Bu*(f@)mv1-qY(_YG&J2M2<7k;;RK~ zL{Fqj9yCz8(S{}@c)S!65aF<=&eLI{hAMErCx&>i7OeDN>okvegO87OaG{Jmi<|}D zaT@b|0X{d@OIJ7zvT>r+eTzgLq~|Dpu)Z&db-P4z*`M$UL51lf>FLlq6rfG)%doyp z)3kk_YIM!03eQ8Vu_2fg{+osaEJPtJ-s36R+5_AEG12`NG)IQ#TF9c@$99%0iye+ zUzZ57=m2)$D(5Nx!n)=5Au&O0BBgwxIBaeI(mro$#&UGCr<;C{UjJVAbVi%|+WP(a zL$U@TYCxJ=1{Z~}rnW;7UVb7+ZnzgmrogDxhjLGo>c~MiJAWs&&;AGg@%U?Y^0JhL ze(x6Z74JG6FlOFK(T}SXQfhr}RIFl@QXKnIcXYF)5|V~e-}suHILKT-k|<*~Ij|VF zC;t@=uj=hot~*!C68G8hTA%8SzOfETOXQ|3FSaIEjvBJp(A)7SWUi5!Eu#yWgY+;n zlm<$+UDou*V+246_o#V4kMdto8hF%%Lki#zPh}KYXmMf?hrN0;>Mv%`@{0Qn`Ujp) z=lZe+13>^Q!9zT);H<(#bIeRWz%#*}sgUX9P|9($kexOyKIOc`dLux}c$7It4u|Rl z6SSkY*V~g_B-hMPo_ak>>z@AVQ(_N)VY2kB3IZ0G(iDUYw+2d7W^~(Jq}KY=JnWS( z#rzEa&0uNhJ>QE8iiyz;n2H|SV#Og+wEZv=f2%1ELX!SX-(d3tEj$5$1}70Mp<&eI zCkfbByL7af=qQE@5vDVxx1}FSGt_a1DoE3SDI+G)mBAna)KBG4p8Epxl9QZ4BfdAN zFnF|Y(umr;gRgG6NLQ$?ZWgllEeeq~z^ZS7L?<(~O&$5|y)Al^iMKy}&W+eMm1W z7EMU)u^ke(A1#XCV>CZ71}P}0x)4wtHO8#JRG3MA-6g=`ZM!FcICCZ{IEw8Dm2&LQ z1|r)BUG^0GzI6f946RrBlfB1Vs)~8toZf~7)+G;pv&XiUO(%5bm)pl=p>nV^o*;&T z;}@oZSibzto$arQgfkp|z4Z($P>dTXE{4O=vY0!)kDO* zGF8a4wq#VaFpLfK!iELy@?-SeRrdz%F*}hjKcA*y@mj~VD3!it9lhRhX}5YOaR9$} z3mS%$2Be7{l(+MVx3 z(4?h;P!jnRmX9J9sYN#7i=iyj_5q7n#X(!cdqI2lnr8T$IfOW<_v`eB!d9xY1P=2q&WtOXY=D9QYteP)De?S4}FK6#6Ma z=E*V+#s8>L;8aVroK^6iKo=MH{4yEZ_>N-N z`(|;aOATba1^asjxlILk<4}f~`39dBFlxj>Dw(hMYKPO3EEt1@S`1lxFNM+J@uB7T zZ8WKjz7HF1-5&2=l=fqF-*@>n5J}jIxdDwpT?oKM3s8Nr`x8JnN-kCE?~aM1H!hAE z%%w(3kHfGwMnMmNj(SU(w42OrC-euI>Dsjk&jz3ts}WHqmMpzQ3vZrsXrZ|}+MHA7 z068obeXZTsO*6RS@o3x80E4ok``rV^Y3hr&C1;|ZZ0|*EKO`$lECUYG2gVFtUTw)R z4Um<0ZzlON`zTdvVdL#KFoMFQX*a5wM0Czp%wTtfK4Sjs)P**RW&?lP$(<}q%r68Z zS53Y!d@&~ne9O)A^tNrXHhXBkj~$8j%pT1%%mypa9AW5E&s9)rjF4@O3ytH{0z6riz|@< zB~UPh*wRFg2^7EbQrHf0y?E~dHlkOxof_a?M{LqQ^C!i2dawHTPYUE=X@2(3<=OOxs8qn_(y>pU>u^}3y&df{JarR0@VJn0f+U%UiF=$Wyq zQvnVHESil@d|8&R<%}uidGh7@u^(%?$#|&J$pvFC-n8&A>utA=n3#)yMkz+qnG3wd zP7xCnF|$9Dif@N~L)Vde3hW8W!UY0BgT2v(wzp;tlLmyk2%N|0jfG$%<;A&IVrOI< z!L)o>j>;dFaqA3pL}b-Je(bB@VJ4%!JeX@3x!i{yIeIso^=n?fDX`3bU=eG7sTc%g%ye8$v8P@yKE^XD=NYxTb zbf!Mk=h|otpqjFaA-vs5YOF-*GwWPc7VbaOW&stlANnCN8iftFMMrUdYNJ_Bnn5Vt zxfz@Ah|+4&P;reZxp;MmEI7C|FOv8NKUm8njF7Wb6Gi7DeODLl&G~}G4be&*Hi0Qw z5}77vL0P+7-B%UL@3n1&JPxW^d@vVwp?u#gVcJqY9#@-3X{ok#UfW3<1fb%FT`|)V~ggq z(3AUoUS-;7)^hCjdT0Kf{i}h)mBg4qhtHHBti=~h^n^OTH5U*XMgDLIR@sre`AaB$ zg)IGBET_4??m@cx&c~bA80O7B8CHR7(LX7%HThkeC*@vi{-pL%e)yXp!B2InafbDF zjPXf1mko3h59{lT6EEbxKO1Z5GF71)WwowO6kY|6tjSVSWdQ}NsK2x{>i|MKZK8%Q zfu&_0D;CO-Jg0#YmyfctyJ!mRJp)e#@O0mYdp|8x;G1%OZQ3Q847YWTyy|%^cpA;m zze0(5p{tMu^lDkpe?HynyO?a1$_LJl2L&mpeKu%8YvgRNr=%2z${%WThHG=vrWY@4 zsA`OP#O&)TetZ>s%h!=+CE15lOOls&nvC~$Qz0Ph7tHiP;O$i|eDwpT{cp>+)0-|; zY$|bB+Gbel>5aRN3>c0x)4U=|X+z+{ zn*_p*EQoquRL+=+p;=lm`d71&1NqBz&_ph)MXu(Nv6&XE7(RsS)^MGj5Q?Fwude-(sq zjJ>aOq!7!EN>@(fK7EE#;i_BGvli`5U;r!YA{JRodLBc6-`n8K+Fjgwb%sX;j=qHQ z7&Tr!)!{HXoO<2BQrV9Sw?JRaLXV8HrsNevvnf>Y-6|{T!pYLl7jp$-nEE z#X!4G4L#K0qG_4Z;Cj6=;b|Be$hi4JvMH!-voxqx^@8cXp`B??eFBz2lLD8RRaRGh zn7kUfy!YV~p(R|p7iC1Rdgt$_24i0cd-S8HpG|`@my70g^y`gu%#Tf_L21-k?sRRZHK&at(*ED0P8iw{7?R$9~OF$Ko;Iu5)ur5<->x!m93Eb zFYpIx60s=Wxxw=`$aS-O&dCO_9?b1yKiPCQmSQb>T)963`*U+Ydj5kI(B(B?HNP8r z*bfSBpSu)w(Z3j7HQoRjUG(+d=IaE~tv}y14zHHs|0UcN52fT8V_<@2ep_ee{QgZG zmgp8iv4V{k;~8@I%M3<#B;2R>Ef(Gg_cQM7%}0s*^)SK6!Ym+~P^58*wnwV1BW@eG z4sZLqsUvBbFsr#8u7S1r4teQ;t)Y@jnn_m5jS$CsW1um!p&PqAcc8!zyiXHVta9QC zY~wCwCF0U%xiQPD_INKtTb;A|Zf29(mu9NI;E zc-e>*1%(LSXB`g}kd`#}O;veb<(sk~RWL|f3ljxCnEZDdNSTDV6#Td({6l&y4IjKF z^}lIUq*ZUqgTPumD)RrCN{M^jhY>E~1pn|KOZ5((%F)G|*ZQ|r4zIbrEiV%42hJV8 z3xS)=!X1+=olbdGJ=yZil?oXLct8FM{(6ikLL3E%=q#O6(H$p~gQu6T8N!plf!96| z&Q3=`L~>U0zZh;z(pGR2^S^{#PrPxTRHD1RQOON&f)Siaf`GLj#UOk&(|@0?zm;Sx ztsGt8=29-MZs5CSf1l1jNFtNt5rFNZxJPvkNu~2}7*9468TWm>nN9TP&^!;J{-h)_ z7WsHH9|F%I`Pb!>KAS3jQWKfGivTVkMJLO-HUGM_a4UQ_%RgL6WZvrW+Z4ujZn;y@ zz9$=oO!7qVTaQAA^BhX&ZxS*|5dj803M=k&2%QrXda`-Q#IoZL6E(g+tN!6CA!CP* zCpWtCujIea)ENl0liwVfj)Nc<9mV%+e@=d`haoZ*`B7+PNjEbXBkv=B+Pi^~L#EO$D$ZqTiD8f<5$eyb54-(=3 zh)6i8i|jp(@OnRrY5B8t|LFXFQVQ895n*P16cEKTrT*~yLH6Z4e*bZ5otpRDri&+A zfNbK1D5@O=sm`fN=WzWyse!za5n%^+6dHPGX#8DyIK>?9qyX}2XvBWVqbP%%D)7$= z=#$WulZlZR<{m#gU7lwqK4WS1Ne$#_P{b17qe$~UOXCl>5b|6WVh;5vVnR<%d+Lnp z$uEmML38}U4vaW8>shm6CzB(Wei3s#NAWE3)a2)z@i{4jTn;;aQS)O@l{rUM`J@K& l00vQ5JBs~;vo!vr%%-k{2_Fq1Mn4QF81S)AQ99zk{{c4yR+0b! literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..869c8e5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,25 @@ +# +# /* +# * Copyright 2024 The Hyve +# * +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# */ +# + +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..85a04b6 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# /* +# * Copyright 2024 The Hyve +# * +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# */ +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..9110045 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,28 @@ +/* + * + * * Copyright 2024 The Hyve + * * + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * + */ + +rootProject.name = "radar-data-dashboard" + +include(":data-dashboard-backend") + +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +}