diff --git a/Makefile b/Makefile index f290d621a..46cd5bb97 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,14 @@ front-visualize-bundle: BACKEND_DIR := backend BACKEND_CONFIGURATION_FOLDER=$(shell pwd)/infra/configurations/backend/ +.PHONY: back-show-dependencies back-local + +back-show-dependencies: + cd $(BACKEND_DIR) && ./gradlew dependencies + +back-start-local: + cd $(BACKEND_DIR) && ./gradlew bootRun --args='--spring.profiles.active=local --spring.config.additional-location=$(BACKEND_CONFIGURATION_FOLDER)' + .PHONY: back-clean-install back-check-dependencies back-test back-sonar back-clean-install: diff --git a/backend/.gitignore b/backend/.gitignore index 5733e1302..c03be1d15 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,4 +1,6 @@ HELP.md + +### Gradle ### .gradle build/ !gradle/wrapper/gradle-wrapper.jar diff --git a/backend/HELP.md b/backend/HELP.md index de2aebb69..315b8eaf1 100644 --- a/backend/HELP.md +++ b/backend/HELP.md @@ -1,23 +1,48 @@ # Getting Started ### Reference Documentation + For further reference, please consider the following sections: -* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.1.1/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.1.1/maven-plugin/reference/html/#build-image) -* [Spring Web](https://docs.spring.io/spring-boot/docs/3.1.1/reference/htmlsingle/#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/3.1.1/reference/htmlsingle/#data.sql.jpa-and-spring-data) -* [Rest Repositories](https://docs.spring.io/spring-boot/docs/3.1.1/reference/htmlsingle/#howto.data-access.exposing-spring-data-repositories-as-rest) +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.2.1/gradle-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.2.1/gradle-plugin/reference/html/#build-image) +* [Spring Boot Testcontainers support](https://docs.spring.io/spring-boot/docs/3.2.1/reference/html/features.html#features.testing.testcontainers) +* [Testcontainers Postgres Module Reference Guide](https://java.testcontainers.org/modules/databases/postgres/) +* [Spring Web](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#web) +* [Spring for GraphQL](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#web.graphql) +* [Spring Security](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#web.security) +* [Testcontainers](https://java.testcontainers.org/) +* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#data.sql.jpa-and-spring-data) +* [Flyway Migration](https://docs.spring.io/spring-boot/docs/3.2.1/reference/htmlsingle/index.html#howto.data-initialization.migration-tool.flyway) ### Guides + The following guides illustrate how to use some features concretely: * [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) * [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) * [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Building a GraphQL service](https://spring.io/guides/gs/graphql-server/) +* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) +* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) +* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) * [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Accessing JPA Data with REST](https://spring.io/guides/gs/accessing-data-rest/) -* [Accessing Neo4j Data with REST](https://spring.io/guides/gs/accessing-neo4j-data-rest/) -* [Accessing MongoDB Data with REST](https://spring.io/guides/gs/accessing-mongodb-data-rest/) + +### Additional Links + +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + +### Testcontainers support + +This project +uses [Testcontainers at development time](https://docs.spring.io/spring-boot/docs/3.2.1/reference/html/features.html#features.testing.testcontainers.at-development-time). + +Testcontainers has been configured to use the following Docker images: + +* [`postgres:latest`](https://hub.docker.com/_/postgres) + +Please review the tags of the used images and set them to the same as you're running in production. diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts new file mode 100644 index 000000000..6711e79d7 --- /dev/null +++ b/backend/build.gradle.kts @@ -0,0 +1,117 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +group = "fr.gouv.dgampa" +version = "VERSION_TO_CHANGE" +description = "RapportNav" + +val kotlinVersion by extra("1.9.0") +val serializationVersion by extra("1.6.2") +val springVersion by extra("3.2.0") +val testcontainersVersion by extra("1.19.2") + +plugins { + `java-library` + `maven-publish` + kotlin("jvm") version "1.9.0" + kotlin("plugin.spring") version "1.9.0" + kotlin("plugin.jpa") version "1.9.0" + id("org.springframework.boot") version "3.2.0" + id("io.spring.dependency-management") version "1.1.4" + id("org.owasp.dependencycheck") version "8.4.0" +} + +springBoot { + mainClass.set("fr.gouv.dgampa.rapportnav.RapportNavApplicationKt") +} + +repositories { + mavenCentral() +} + +configurations.all { + exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging") +} + +dependencyManagement { + imports { + mavenBom("org.testcontainers:testcontainers-bom:$testcontainersVersion") + } + dependencies { + dependency("com.graphql-java:graphql-java:21.1") + } +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-jpa:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-data-rest:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-web:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-graphql:$springVersion") + implementation("org.springframework.boot:spring-boot-autoconfigure:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-log4j2:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-security:$springVersion") + implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server:$springVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib") + runtimeOnly("org.postgresql:postgresql:42.7.0") + implementation("org.flywaydb:flyway-core:9.22.3") + implementation("org.n52.jackson:jackson-datatype-jts:1.2.10") { + exclude(group = "org.locationtech.jts", module = "jts-core") + } + implementation("io.jsonwebtoken:jjwt-api:0.12.3") + implementation("javax.xml.bind:jaxb-api:2.3.1") + implementation("org.springframework.security:spring-security-oauth2-jose:6.2.0") + implementation("org.locationtech.jts:jts-core:1.19.0") + implementation("io.swagger.core.v3:swagger-core:2.2.19") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion") + implementation("io.sentry:sentry-spring-boot-starter-jakarta:7.0.0") + implementation("io.sentry:sentry-log4j2:7.0.0") + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("org.springframework:spring-webflux") + testImplementation("org.springframework.graphql:spring-graphql-test") + testImplementation("org.testcontainers:testcontainers") + testImplementation("org.testcontainers:junit-jupiter") + testImplementation("org.testcontainers:postgresql") +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} + +kotlin { + jvmToolchain(17) +} + +tasks.withType { + kotlinOptions { + freeCompilerArgs += "-Xjsr305=strict" + jvmTarget = "17" + } +} + +//val sonarOrganization by extra("mtes-mct") +//val sonarProjectKey by extra("MTES-MCT_rapportnav2") +// +//configure { +// properties { +// property("sonar.organization", sonarOrganization) +// property("sonar.projectKey", sonarProjectKey) +// } +//} + +//configure { +// skip = true +//} + +//val ci by profiles.creating { +// val flywayEnabled by extra(false) +// properties["flyway.enabled"] = flywayEnabled +// configure { +// isEnabled = false +// } +//} + +//val sonar by profiles.creating { +// properties["sonar.organization"] = sonarOrganization +// properties["sonar.projectKey"] = sonarProjectKey +//} diff --git a/backend/gradle/wrapper/gradle-wrapper.jar b/backend/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..d64cd4917 Binary files /dev/null and b/backend/gradle/wrapper/gradle-wrapper.jar differ diff --git a/backend/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..1af9e0930 --- /dev/null +++ b/backend/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/backend/gradlew b/backend/gradlew new file mode 100755 index 000000000..1aa94a426 --- /dev/null +++ b/backend/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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/backend/gradlew.bat b/backend/gradlew.bat new file mode 100644 index 000000000..93e3f59f1 --- /dev/null +++ b/backend/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/backend/settings.gradle.kts b/backend/settings.gradle.kts new file mode 100644 index 000000000..4c2b244dc --- /dev/null +++ b/backend/settings.gradle.kts @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = "rapportnav" diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/RapportNavApplication.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/RapportNavApplication.kt index 083754b45..1aa00cd03 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/RapportNavApplication.kt +++ b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/RapportNavApplication.kt @@ -8,7 +8,7 @@ import org.springframework.boot.runApplication @SpringBootApplication(exclude = [SecurityAutoConfiguration::class]) -class RapportNavApplication +open class RapportNavApplication fun main(args: Array) { @@ -25,11 +25,4 @@ fun main(args: Array) { } } - Sentry.captureMessage("Something went wrong2") - - try { - throw Exception("This is a test.2") - } catch (e: Exception) { - Sentry.captureException(e) - } } diff --git a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/database/model/mission/control/ControlModel.kt b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/database/model/mission/control/ControlModel.kt index 4122c9996..4e3b107a8 100644 --- a/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/database/model/mission/control/ControlModel.kt +++ b/backend/src/main/kotlin/fr/gouv/dgampa/rapportnav/infrastructure/database/model/mission/control/ControlModel.kt @@ -9,25 +9,25 @@ import java.util.* abstract class ControlModel { @Id @Column(name = "id", unique = true, nullable = false) - lateinit var id: UUID + open var id: UUID = UUID.randomUUID() @Column(name = "mission_id", nullable = false) - var missionId: Int = 0 + open var missionId: Int = 0 @Column(name = "action_control_id", nullable = false, unique = true) - lateinit var actionControlId: String + open var actionControlId: String = "" @Column(name = "amount_of_controls", nullable = false) - var amountOfControls: Int = 1 + open var amountOfControls: Int = 1 @Column(name = "unit_should_confirm", nullable = true) - var unitShouldConfirm: Boolean? = false + open var unitShouldConfirm: Boolean? = false @Column(name = "unit_has_confirmed", nullable = true) - var unitHasConfirmed: Boolean? = false + open var unitHasConfirmed: Boolean? = false @Column(name = "observations", nullable = true) - var observations: String? = null + open var observations: String? = null @OneToMany( cascade = [CascadeType.ALL], @@ -35,5 +35,5 @@ abstract class ControlModel { mappedBy = "control", targetEntity = InfractionModel::class ) - var infractions: List? = null + open var infractions: List? = null } diff --git a/infra/configurations/backend/application-local.properties b/infra/configurations/backend/application-local.properties index fb221eb14..900d13560 100644 --- a/infra/configurations/backend/application-local.properties +++ b/infra/configurations/backend/application-local.properties @@ -1,8 +1,8 @@ -env.db.url=jdbc:postgresql://db:5432/rapportnavdb?user=postgres&password=postgres -spring.datasource.url=jdbc:postgresql://db:5432/rapportnavdb?user=postgres&password=postgres +env.db.url=jdbc:postgresql://localhost:5432/rapportnavdb?user=postgres&password=postgres +spring.datasource.url=jdbc:postgresql://localhost:5432/rapportnavdb?user=postgres&password=postgres host.ip=localhost:8880 #Sentry -sentry.enabled=true -sentry.dsn=https://8857258f9f1549968b13e15759bdf2bc@sentry.incubateur.net/121 +sentry.enabled=false +sentry.dsn= sentry.traces-sample-rate=1.0 sentry.environment=localhost