Skip to content

Commit

Permalink
Kobit change local runtime db connection (#26)
Browse files Browse the repository at this point in the history
* Update docker-compose.yaml

* Update application-local.yml

* Update build.yaml

* run spotless apply

---------

Co-authored-by: Thomas Fink <[email protected]>
  • Loading branch information
ThomasAFink and ThomasAFink authored Apr 24, 2024
1 parent b95a9b4 commit 396b705
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
27 changes: 16 additions & 11 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,26 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Advance Security Policy as Code
uses: advanced-security/[email protected]
with:
policy: GeekMasher/security-queries
policy-path: policies/default.yml

token: ${{ secrets.ACCESS_TOKEN }}

argvs: '--disable-dependabot --disable-secret-scanning --disable-code-scanning'
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
cache: maven
- name: Build with maven
run: mvn --batch-mode --update-snapshots verify
run: mvn --batch-mode --update-snapshots verify

compliance:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Advance Security Policy as Code
uses: advanced-security/[email protected]
with:
policy: it-at-m/policy-as-code
policy-path: default.yaml
token: ${{ secrets.ACCESS_TOKEN }}
argvs: "--disable-dependabot --disable-secret-scanning --disable-code-scanning --display"
8 changes: 4 additions & 4 deletions localinfra/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ services:
ports:
- '5432:5432'
environment:
POSTGRES_PASSWORD: kobit-local
POSTGRES_USER: kobit
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
POSTGRES_DB: kobit_local
volumes:
- ./postgres:/var/lib/postgres/data
Expand All @@ -26,7 +26,7 @@ services:
depends_on:
- postgresql
environment:
PGADMIN_DEFAULT_PASSWORD: kobit-local
PGADMIN_DEFAULT_PASSWORD: postgres
PGADMIN_DEFAULT_EMAIL: [email protected]
ports:
- '80:80'
Expand All @@ -50,4 +50,4 @@ services:
mail:
image: bytemark/smtp
ports:
- "25:25"
- "25:25"
6 changes: 3 additions & 3 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
spring:

datasource:
url: jdbc:postgresql://localhost:5432/kobit_local;
url: jdbc:postgresql://localhost:5432/kobit_local
username: postgres
password: kobit-local
password: postgres


http:
Expand All @@ -17,4 +17,4 @@ spring:
hostname: ${AWS_S3_HOSTNAME}
region:
static: eu-central-1
auto: false
auto: false
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
package de.muenchen.kobit.backend.decisiontree.service;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

import de.muenchen.kobit.backend.competence.Competence;
import de.muenchen.kobit.backend.competence.service.CompetenceService;
import de.muenchen.kobit.backend.contactpoint.view.ContactPointView;
import de.muenchen.kobit.backend.decisiontree.branches.*;
import de.muenchen.kobit.backend.decisiontree.relevance.service.RelevanceService;
import de.muenchen.kobit.backend.decisiontree.view.DecisionPoint;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ void validateTest_InvalidNameShort() throws MalformedURLException {
assertThrows(
InvalidContactPointException.class,
() -> validateContactPoint.validate(contactPointView));
assertThat(exception.getMessage()).isEqualTo("Name must be at least 4 characters and not more than 100!");
assertThat(exception.getMessage())
.isEqualTo("Name must be at least 4 characters and not more than 100!");
}

@Test
Expand Down

0 comments on commit 396b705

Please sign in to comment.