Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions docker/postgres/init-multiple-dbs.sh
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

public class GarminObservationFactory<C extends Observation<P>, P extends ObservationProperties> extends ObservationFactory<C, P> {

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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Loading