diff --git a/docker-compose.yaml b/docker-compose.yaml index 1c84801a..8b1d2e29 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,10 +12,15 @@ services: POSTGRES_DB: more POSTGRES_USER: more POSTGRES_PASSWORD: more + BLENDEDCARE_DB_USER: blendedcare + BLENDEDCARE_DB_PASSWORD: blendedcare + BLENDEDCARE_DB_NAME: blendedcare volumes: - type: volume source: postgres-data target: /var/lib/postgresql/data + # The init script + - ./docker/postgres/init-multiple-dbs.sh:/docker-entrypoint-initdb.d/init-multiple-dbs.sh redis: image: redis:7-alpine diff --git a/docker/postgres/init-multiple-dbs.sh b/docker/postgres/init-multiple-dbs.sh new file mode 100755 index 00000000..2d2d2baa --- /dev/null +++ b/docker/postgres/init-multiple-dbs.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +# Create the second user and database using environment variables +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL + CREATE USER "$BLENDEDCARE_DB_USER" WITH PASSWORD '$BLENDEDCARE_DB_PASSWORD'; + CREATE DATABASE "$BLENDEDCARE_DB_NAME" OWNER "$BLENDEDCARE_DB_USER"; + GRANT ALL PRIVILEGES ON DATABASE "$BLENDEDCARE_DB_NAME" TO "$BLENDEDCARE_DB_USER"; +EOSQL \ No newline at end of file diff --git a/studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/garmin/GarminObservationFactory.java b/studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/garmin/GarminObservationFactory.java index b132b5b5..d776baa6 100644 --- a/studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/garmin/GarminObservationFactory.java +++ b/studymanager-observation/src/main/java/io/redlink/more/studymanager/component/observation/garmin/GarminObservationFactory.java @@ -10,7 +10,7 @@ public class GarminObservationFactory, P extends ObservationProperties> extends ObservationFactory { - private static final Visibility visibility = new Visibility(false, true); + private static final Visibility visibility = new Visibility(true, false); @Override public GarminObservation create(MoreObservationSDK sdk, ObservationProperties properties) throws ConfigurationValidationException { diff --git a/studymanager-services/src/test/java/io/redlink/more/studymanager/service/ObservationServiceTest.java b/studymanager-services/src/test/java/io/redlink/more/studymanager/service/ObservationServiceTest.java index 957fdbc1..208bdac6 100644 --- a/studymanager-services/src/test/java/io/redlink/more/studymanager/service/ObservationServiceTest.java +++ b/studymanager-services/src/test/java/io/redlink/more/studymanager/service/ObservationServiceTest.java @@ -106,7 +106,8 @@ void testHidden() { assertThat(gpsFactory.getHidden()).isTrue(); assertThat(limFactory.getHidden()).isTrue(); assertThat(qstFactory.getHidden()).isTrue(); - assertThat(extFactory.getHidden()).isFalse(); - assertThat(garminFactory.getVisibility().isHiddenByDefault()).isTrue(); + + assertThat(extFactory.getVisibility().isChangeable()).isFalse(); + assertThat(garminFactory.getVisibility().isHiddenByDefault()).isFalse(); } }