From 7e3afd13463f137a4a4c72a8facb225d66e87bf3 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 2 Jan 2024 14:29:42 +0100 Subject: [PATCH 01/69] #deploy-tenor-search-service --- .../workflows/app.tenor-search-service.yml | 26 ++ apps/tenor-search-service/Dockerfile | 6 + apps/tenor-search-service/README.md | 9 + apps/tenor-search-service/build.gradle | 93 +++++++ apps/tenor-search-service/config.yml | 64 +++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + apps/tenor-search-service/gradlew | 234 ++++++++++++++++++ apps/tenor-search-service/gradlew.bat | 89 +++++++ apps/tenor-search-service/gradlewUpdate.sh | 3 + apps/tenor-search-service/settings.gradle | 18 ++ .../TenorSearchServiceApplicationStarter.java | 21 ++ .../tenorsearchservice/config/Consumers.java | 20 ++ .../config/JacksonConfig.java | 27 ++ .../config/LocalVaultConfig.java | 36 +++ .../config/MaskinportenConfig.java | 41 +++ .../config/OpenApiConfig.java | 49 ++++ .../config/SecurityConfig.java | 40 +++ .../consumers/MaskinportenClient.java | 91 +++++++ .../consumers/TenorClient.java | 30 +++ .../command/GetAccessTokenCommand.java | 41 +++ .../consumers/command/GetTenorTestdata.java | 33 +++ .../command/GetWellKnownCommand.java | 35 +++ .../consumers/dto/AccessToken.java | 16 ++ .../consumers/dto/WellKnown.java | 18 ++ .../domain/AccessToken.java | 7 + .../provider/TenorSearchController.java | 38 +++ .../service/TenorSearchService.java | 22 ++ .../src/main/resources/application-local.yml | 10 + .../main/resources/application-virtual.yml | 20 ++ .../src/main/resources/application.yml | 48 ++++ .../src/main/resources/logback-spring.xml | 54 ++++ .../ApplicationContextTest.java | 20 ++ .../src/test/resources/application-test.yml | 5 + .../src/test/resources/logback-spring.xml | 20 ++ settings.gradle | 1 + 36 files changed, 1290 insertions(+) create mode 100644 .github/workflows/app.tenor-search-service.yml create mode 100644 apps/tenor-search-service/Dockerfile create mode 100644 apps/tenor-search-service/README.md create mode 100644 apps/tenor-search-service/build.gradle create mode 100644 apps/tenor-search-service/config.yml create mode 100644 apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar create mode 100644 apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties create mode 100755 apps/tenor-search-service/gradlew create mode 100644 apps/tenor-search-service/gradlew.bat create mode 100755 apps/tenor-search-service/gradlewUpdate.sh create mode 100644 apps/tenor-search-service/settings.gradle create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java create mode 100644 apps/tenor-search-service/src/main/resources/application-local.yml create mode 100644 apps/tenor-search-service/src/main/resources/application-virtual.yml create mode 100644 apps/tenor-search-service/src/main/resources/application.yml create mode 100644 apps/tenor-search-service/src/main/resources/logback-spring.xml create mode 100644 apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java create mode 100644 apps/tenor-search-service/src/test/resources/application-test.yml create mode 100644 apps/tenor-search-service/src/test/resources/logback-spring.xml diff --git a/.github/workflows/app.tenor-search-service.yml b/.github/workflows/app.tenor-search-service.yml new file mode 100644 index 00000000000..d74d7cc7f75 --- /dev/null +++ b/.github/workflows/app.tenor-search-service.yml @@ -0,0 +1,26 @@ +name: tenor-search-service + +on: + push: + paths: + - libs/integration-test + - libs/reactive-core + - libs/reactive-security + - libs/security-core + - apps/tenor-search-service-service/** + - .github/workflows/app.tenor-search-service.yml + +jobs: + workflow: + uses: ./.github/workflows/common.workflow.backend.yml + with: + working-directory: "apps/tenor-search-service-service" + deploy-tag: "#deploy-tenor-search-service-service" + permissions: + contents: read + id-token: write + secrets: + NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} + NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} + NAV_TOKEN: ${{ secrets.NAV_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/apps/tenor-search-service/Dockerfile b/apps/tenor-search-service/Dockerfile new file mode 100644 index 00000000000..11043b561a5 --- /dev/null +++ b/apps/tenor-search-service/Dockerfile @@ -0,0 +1,6 @@ +FROM ghcr.io/navikt/baseimages/temurin:21 +LABEL maintainer="Team Dolly" + +ADD build/libs/app.jar /app/app.jar + +EXPOSE 8080 \ No newline at end of file diff --git a/apps/tenor-search-service/README.md b/apps/tenor-search-service/README.md new file mode 100644 index 00000000000..93c76dce262 --- /dev/null +++ b/apps/tenor-search-service/README.md @@ -0,0 +1,9 @@ +# Tenor Search Service + +Service som formidler søk til Tenor testdata hos Skatteetaten. + +## Swagger + +Swagger finnes +under [/swagger-ui.html](https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no/swagger-ui.html) +-endepunktet til applikasjonen. \ No newline at end of file diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle new file mode 100644 index 00000000000..754c8bcf34d --- /dev/null +++ b/apps/tenor-search-service/build.gradle @@ -0,0 +1,93 @@ +plugins { + id 'java' + id "org.sonarqube" version "4.0.0.2929" + id 'org.springframework.boot' version "3.1.4" + id 'io.spring.dependency-management' version "1.1.3" + id "jacoco" +} + +test { + useJUnitPlatform() +} +def test = tasks.named("test") { + useJUnitPlatform { + excludeTags "integration" + } +} +def iTest = tasks.register("iTest", Test) { + useJUnitPlatform { + includeTags "integration" + } + shouldRunAfter test +} + +jacocoTestReport { + reports { + xml.required = true + } +} + +sonarqube { + properties { + property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.dynamicAnalysis", "reuseReports" + property "sonar.host.url", "https://sonarcloud.io" + property "sonar.java.coveragePlugin", "jacoco" + property "sonar.language", "java" + property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.organization", "navikt" + property "sonar.project.monorepo.enabled", true + property "sonar.projectKey", "testnav-tenor-search-service" + property "sonar.projectName", "testnav-tenor-search-service" + property "sonar.sourceEncoding", "UTF-8" + } +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +bootJar { + archiveFileName = "app.jar" +} +dependencyManagement { + applyMavenExclusions = false + imports { + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + } +} + +repositories { + mavenCentral() + mavenLocal() +} + +dependencies { + implementation 'no.nav.testnav.libs:reactive-core' + implementation 'no.nav.testnav.libs:reactive-security' + implementation 'no.nav.testnav.libs:security-core' + + implementation 'org.springframework.boot:spring-boot-starter-webflux' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + + implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' + + implementation 'io.micrometer:micrometer-registry-prometheus' + + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' + testImplementation 'no.nav.testnav.libs:integration-test' + testImplementation 'com.squareup.okhttp3:okhttp:4.10.0' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' +} diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml new file mode 100644 index 00000000000..8adf6ef9e59 --- /dev/null +++ b/apps/tenor-search-service/config.yml @@ -0,0 +1,64 @@ +apiVersion: "nais.io/v1alpha1" +kind: "Application" +metadata: + name: testnav-tenor-search-service + namespace: dolly + labels: + team: dolly +spec: + image: "{{image}}" + port: 8080 + azure: + application: + allowAllUsers: true + enabled: true + tenant: nav.no + tokenx: + enabled: true + accessPolicy: + inbound: + rules: + - application: testnav-oversikt-frontend + - application: dolly-frontend + - application: dolly-frontend-dev + - application: dolly-idporten + - application: team-dolly-lokal-app + - application: app-1 + namespace: plattformsikkerhet + outbound: + external: + - host: testdata.api.skatteetaten.no + - host: maskinporten.no + liveness: + path: /internal/isAlive + initialDelay: 4 + periodSeconds: 5 + failureThreshold: 500 + readiness: + path: /internal/isReady + initialDelay: 4 + periodSeconds: 5 + failureThreshold: 500 + prometheus: + enabled: true + path: /internal/metrics + envFrom: + - secret: maskinporten-dolly-prod + replicas: + min: 1 + max: 1 + resources: + requests: + cpu: 200m + memory: 1024Mi + limits: + memory: 2048Mi + ingresses: + - "https://testnav-tenor-search-service.intern.dev.nav.no" + env: + - name: SPRING_PROFILES_ACTIVE + value: prod + - name: ACCEPTED_AUDIENCE + value: dev-gcp:dolly:testnav-tenor-search-service + - name: TOKENDINGS_URL + value: https://tokenx.dev-gcp.nav.cloud.nais.io \ No newline at end of file diff --git a/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..e411586a54a --- /dev/null +++ b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/apps/tenor-search-service/gradlew b/apps/tenor-search-service/gradlew new file mode 100755 index 00000000000..3da45c161b0 --- /dev/null +++ b/apps/tenor-search-service/gradlew @@ -0,0 +1,234 @@ +#!/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/master/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/apps/tenor-search-service/gradlew.bat b/apps/tenor-search-service/gradlew.bat new file mode 100644 index 00000000000..107acd32c4e --- /dev/null +++ b/apps/tenor-search-service/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/apps/tenor-search-service/gradlewUpdate.sh b/apps/tenor-search-service/gradlewUpdate.sh new file mode 100755 index 00000000000..e5ee6361152 --- /dev/null +++ b/apps/tenor-search-service/gradlewUpdate.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +gradle wrapper \ No newline at end of file diff --git a/apps/tenor-search-service/settings.gradle b/apps/tenor-search-service/settings.gradle new file mode 100644 index 00000000000..ba2ffdb377c --- /dev/null +++ b/apps/tenor-search-service/settings.gradle @@ -0,0 +1,18 @@ +plugins { + id "com.gradle.enterprise" version "3.12.3" +} + +rootProject.name = 'tenor-search-service' + + +includeBuild '../../libs/reactive-core' +includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' +includeBuild '../../libs/integration-test' + +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java new file mode 100644 index 00000000000..71bad56f418 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/TenorSearchServiceApplicationStarter.java @@ -0,0 +1,21 @@ +package no.nav.testnav.apps.tenorsearchservice; + +import no.nav.testnav.libs.reactivecore.config.CoreConfig; +import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; +import org.springframework.web.reactive.config.EnableWebFlux; + +@Import({ + CoreConfig.class, + SecureOAuth2ServerToServerConfiguration.class +}) +@EnableWebFlux +@SpringBootApplication +public class TenorSearchServiceApplicationStarter { + + public static void main(String[] args) { + SpringApplication.run(TenorSearchServiceApplicationStarter.class, args); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java new file mode 100644 index 00000000000..362117f9a83 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/Consumers.java @@ -0,0 +1,20 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import static lombok.AccessLevel.PACKAGE; + +@Configuration +@ConfigurationProperties(prefix = "consumers") +@NoArgsConstructor(access = PACKAGE) +@Getter +@Setter(PACKAGE) +public class Consumers { + + private ServerProperties tenorSearchService; +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java new file mode 100644 index 00000000000..2c9f6771716 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java @@ -0,0 +1,27 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.codec.ServerCodecConfigurer; +import org.springframework.http.codec.json.Jackson2JsonDecoder; +import org.springframework.http.codec.json.Jackson2JsonEncoder; +import org.springframework.web.reactive.config.WebFluxConfigurer; + +@Configuration +@RequiredArgsConstructor +public class JacksonConfig implements WebFluxConfigurer { + + private final ObjectMapper objectMapper; + + @Override + public void configureHttpMessageCodecs(ServerCodecConfigurer configurer) { + configurer.defaultCodecs().jackson2JsonEncoder( + new Jackson2JsonEncoder(objectMapper) + ); + + configurer.defaultCodecs().jackson2JsonDecoder( + new Jackson2JsonDecoder(objectMapper) + ); + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java new file mode 100644 index 00000000000..4beafe1501b --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/LocalVaultConfig.java @@ -0,0 +1,36 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.vault.annotation.VaultPropertySource; +import org.springframework.vault.authentication.ClientAuthentication; +import org.springframework.vault.authentication.TokenAuthentication; +import org.springframework.vault.client.VaultEndpoint; +import org.springframework.vault.config.AbstractVaultConfiguration; + +import static io.micrometer.common.util.StringUtils.isBlank; + +@Configuration +@Profile("local") +@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false) +public class LocalVaultConfig extends AbstractVaultConfiguration { + + private static final String VAULT_TOKEN = "spring.cloud.vault.token"; + + @Override + public VaultEndpoint vaultEndpoint() { + return VaultEndpoint.create("vault.adeo.no", 443); + } + + @Override + public ClientAuthentication clientAuthentication() { + if (System.getenv().containsKey("VAULT_TOKEN")) { + System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN")); + } + var token = System.getProperty(VAULT_TOKEN); + if (isBlank(token)) { + throw new IllegalArgumentException("Påkrevet property '" + VAULT_TOKEN + "' er ikke satt."); + } + return new TokenAuthentication(System.getProperty(VAULT_TOKEN)); + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java new file mode 100644 index 00000000000..635a9d896e9 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java @@ -0,0 +1,41 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MaskinportenConfig { + + private final String clientId; + private final String jwkPrivate; + private final String scope; + private final String wellKnownUrl; + + public MaskinportenConfig( + @Value("${MASKINPORTEN_CLIENT_ID}") String clientId, + @Value("${MASKINPORTEN_CLIENT_JWK}") String jwkPrivate, + @Value("${MASKINPORTEN_SCOPES}") String scope, + @Value("${MASKINPORTEN_WELL_KNOWN_URL}") String wellKnownUrl + ) { + this.clientId = clientId; + this.scope = scope; + this.jwkPrivate = jwkPrivate; + this.wellKnownUrl = wellKnownUrl; + } + + public String getClientId() { + return clientId; + } + + public String getJwkPrivate() { + return jwkPrivate; + } + + public String getScope() { + return scope; + } + + public String getWellKnownUrl() { + return wellKnownUrl; + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java new file mode 100644 index 00000000000..5311ea12830 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/OpenApiConfig.java @@ -0,0 +1,49 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; + +import no.nav.testnav.libs.reactivecore.config.ApplicationProperties; + + +@Configuration +public class OpenApiConfig { + + @Bean + public OpenAPI openApi(ApplicationProperties applicationProperties) { + return new OpenAPI() + .components(new Components().addSecuritySchemes("bearer-jwt", new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + .name("Authorization") + )) + .addSecurityItem( + new SecurityRequirement().addList("bearer-jwt", Arrays.asList("read", "write"))) + .info(new Info() + .title(applicationProperties.getName()) + .version(applicationProperties.getVersion()) + .description(applicationProperties.getDescription()) + .termsOfService("https://nav.no") + .contact(new Contact() + .url("https://nav-it.slack.com/archives/CA3P9NGA2") + .email("dolly@nav.no") + .name("Team Dolly") + ) + .license(new License() + .name("MIT License") + .url("https://opensource.org/licenses/MIT") + ) + ); + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java new file mode 100644 index 00000000000..987897ac933 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/SecurityConfig.java @@ -0,0 +1,40 @@ +package no.nav.testnav.apps.tenorsearchservice.config; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.libs.reactivesecurity.manager.JwtReactiveAuthenticationManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; +import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; +import org.springframework.security.config.web.server.ServerHttpSecurity; +import org.springframework.security.web.server.SecurityWebFilterChain; + + +@Slf4j +@Configuration +@EnableWebFluxSecurity +@EnableReactiveMethodSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtReactiveAuthenticationManager jwtReactiveAuthenticationManager; + + @Bean + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity httpSecurity) { + return httpSecurity + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .authorizeExchange(authorizeConfig -> authorizeConfig.pathMatchers( + "/internal/**", + "/webjars/**", + "/swagger-resources/**", + "/v3/api-docs/**", + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html" + ).permitAll().anyExchange().authenticated()) + .oauth2ResourceServer(oauth2RSConfig -> oauth2RSConfig.jwt(jwtSpec -> jwtSpec.authenticationManager(jwtReactiveAuthenticationManager))) + .build(); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java new file mode 100644 index 00000000000..7c0f22fac42 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java @@ -0,0 +1,91 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers; + +import com.nimbusds.jose.JOSEException; +import com.nimbusds.jose.JOSEObjectType; +import com.nimbusds.jose.JWSAlgorithm; +import com.nimbusds.jose.JWSHeader; +import com.nimbusds.jose.JWSSigner; +import com.nimbusds.jose.crypto.RSASSASigner; +import com.nimbusds.jose.jwk.RSAKey; +import com.nimbusds.jwt.JWTClaimsSet; +import com.nimbusds.jwt.SignedJWT; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.tenorsearchservice.config.MaskinportenConfig; +import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetAccessTokenCommand; +import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetWellKnownCommand; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.UUID; +import java.util.function.Function; + +@Slf4j +@Component +public class MaskinportenClient { + + private final WebClient webClient; + private final MaskinportenConfig maskinportenConfig; + private final Mono accessToken; + + public MaskinportenClient(MaskinportenConfig maskinportenConfig) { + this.webClient = WebClient.builder().build(); + this.maskinportenConfig = maskinportenConfig; + var wellKnownMono = cache( + new GetWellKnownCommand(webClient, maskinportenConfig).call(), + value -> Duration.ofDays(7) + ); + this.accessToken = cache( + wellKnownMono.flatMap(wellKnown -> new GetAccessTokenCommand(webClient, wellKnown, createJwtClaims(wellKnown.issuer())).call()), + value -> Duration.ofSeconds(value.expiresIn() - 10L) + ); + } + + private static Mono cache(Mono value, Function ttlForValue) { + return value.cache( + ttlForValue, + throwable -> Duration.ZERO, + () -> Duration.ZERO + ); + } + + public Mono getAccessToken() { + return accessToken.map(no.nav.testnav.apps.tenorsearchservice.domain.AccessToken::new); + } + + @SneakyThrows + private String createJwtClaims(String audience) { + Instant now = Instant.now(); + var rsaKey = RSAKey.parse(maskinportenConfig.getJwkPrivate()); + return createSignedJWT(rsaKey, + new JWTClaimsSet.Builder() + .audience(audience) + .claim("scope", maskinportenConfig.getScope()) + .issuer(maskinportenConfig.getClientId()) + .issueTime(Date.from(now)) + .expirationTime(Date.from(now.plusSeconds(119))) + .jwtID(UUID.randomUUID().toString()) + .build()) + .serialize(); + } + + private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) { + try { + JWSHeader.Builder header = new JWSHeader.Builder(JWSAlgorithm.RS256) + .keyID(rsaJwk.getKeyID()) + .type(JOSEObjectType.JWT); + SignedJWT signedJWT = new SignedJWT(header.build(), claimsSet); + JWSSigner signer = new RSASSASigner(rsaJwk.toPrivateKey()); + signedJWT.sign(signer); + return signedJWT; + } catch (JOSEException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java new file mode 100644 index 00000000000..c5d21304f61 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -0,0 +1,30 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers; + +import com.fasterxml.jackson.databind.JsonNode; +import no.nav.testnav.apps.tenorsearchservice.config.Consumers; +import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +@Service +public class TenorClient { + + private final WebClient webClient; + private final MaskinportenClient maskinportenClient; + + public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { + + this.webClient = WebClient + .builder() + .baseUrl(consumers.getTenorSearchService().getUrl()) + .build(); + this.maskinportenClient = maskinportenClient; + } + + public Mono getTestdata(String query) { + + return maskinportenClient.getAccessToken() + .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java new file mode 100644 index 00000000000..b1a87765e13 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetAccessTokenCommand.java @@ -0,0 +1,41 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.command; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.WellKnown; +import org.springframework.web.reactive.function.BodyInserters; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.client.WebClientResponseException; +import reactor.core.publisher.Mono; + +import java.util.concurrent.Callable; + +@Slf4j +@RequiredArgsConstructor +public class GetAccessTokenCommand implements Callable> { + + private final WebClient webClient; + private final WellKnown wellKnown; + private final String assertion; + + @Override + public Mono call() { + return webClient.post() + .uri(wellKnown.tokenEndpoint()) + .body(BodyInserters + .fromFormData("grant_type", wellKnown.grantTypesSupported().get(0)) + .with("assertion", assertion) + ) + .retrieve() + .bodyToMono(AccessToken.class) + .doOnSuccess(value -> log.info("AccessToken hentet fra maskinporten.")) + .doOnError( + WebClientResponseException.class::isInstance, + throwable -> log.error( + "Feil ved henting av AccessToken for maskinporten. \n{}", + ((WebClientResponseException) throwable).getResponseBodyAsString() + ) + ); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java new file mode 100644 index 00000000000..e5b3df685be --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -0,0 +1,33 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.command; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +import java.util.concurrent.Callable; + +@RequiredArgsConstructor +public class GetTenorTestdata implements Callable> { + + private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; + + private final WebClient webClient; + private final String query; + private final String token; + @Override + public Mono call() { + + return webClient.get() + .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) + .queryParam("kql",query) + .build()) + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) + .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) + .retrieve() + .bodyToMono(JsonNode.class); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java new file mode 100644 index 00000000000..17bb387ff68 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetWellKnownCommand.java @@ -0,0 +1,35 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.command; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.tenorsearchservice.config.MaskinportenConfig; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.WellKnown; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.client.WebClientResponseException; +import reactor.core.publisher.Mono; + +import java.util.concurrent.Callable; + +@Slf4j +@RequiredArgsConstructor +public class GetWellKnownCommand implements Callable> { + + private final WebClient webClient; + private final MaskinportenConfig maskinportenConfig; + + @Override + public Mono call() { + return webClient.get() + .uri(maskinportenConfig.getWellKnownUrl()) + .retrieve() + .bodyToMono(WellKnown.class) + .doOnSuccess(value -> log.info("WellKnown hentet for maskinporten.")) + .doOnError( + WebClientResponseException.class::isInstance, + throwable -> log.error( + "Feil ved henting av well known for maskinporten. \n{}", + ((WebClientResponseException) throwable).getResponseBodyAsString() + ) + ); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java new file mode 100644 index 00000000000..4081addc17e --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/AccessToken.java @@ -0,0 +1,16 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public record AccessToken( + @JsonProperty("access_token") + String accessToken, + @JsonProperty("token_type") + String tokenType, + @JsonProperty("expires_in") + Integer expiresIn, + @JsonProperty("scope") + String scope +) { + +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java new file mode 100644 index 00000000000..eb091c0745a --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/WellKnown.java @@ -0,0 +1,18 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +public record WellKnown( + String issuer, + @JsonProperty("token_endpoint") + String tokenEndpoint, + @JsonProperty("jwks_uri") + String jwksUri, + @JsonProperty("token_endpoint_auth_methods_supported") + List tokenEndpointAuthMethodsSupported, + @JsonProperty("grant_types_supported") + List grantTypesSupported +) { +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java new file mode 100644 index 00000000000..c933e7c4f56 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/AccessToken.java @@ -0,0 +1,7 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +public record AccessToken(String value) { + public AccessToken(no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken accessToken) { + this(accessToken.accessToken()); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java new file mode 100644 index 00000000000..732f4471135 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -0,0 +1,38 @@ +package no.nav.testnav.apps.tenorsearchservice.provider; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.reactive.function.server.RequestPredicates; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.RouterFunctions; +import org.springframework.web.reactive.function.server.ServerResponse; +import org.webjars.NotFoundException; +import reactor.core.publisher.Mono; + +@RestController +@RequestMapping("/api/v1/tenor") +@RequiredArgsConstructor +public class TenorSearchController { + + private final TenorSearchService tenorSearchService; + + @GetMapping("/testdata") + public Mono getTestdata(@RequestParam(required = false) String searchData) { + return tenorSearchService + .getTestdata(searchData) + .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); + } + + @Bean + public RouterFunction notFound() { + return RouterFunctions + .route(RequestPredicates.GET("/statuses/not-found"), + request -> ServerResponse.notFound().build()); + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java new file mode 100644 index 00000000000..b11ba77210d --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -0,0 +1,22 @@ +package no.nav.testnav.apps.tenorsearchservice.service; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Mono; + +import static org.apache.commons.lang3.StringUtils.isNotBlank; + +@Service +@RequiredArgsConstructor +public class TenorSearchService { + + private final TenorClient tenorClient; + + public Mono getTestdata(String testDataQuery) { + + return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : ""); + } +} diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..619ed0070da --- /dev/null +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -0,0 +1,10 @@ +ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-person-tilgang-service-dev +ALTINN_URL: https://tt02.altinn.no + +TOKENDINGS_URL: dummy +ALTINN_API_KEY: dummy + +MASKINPORTEN_CLIENT_ID: dummy +MASKINPORTEN_CLIENT_JWK: dummy +MASKINPORTEN_SCOPES: dummy +MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/application-virtual.yml b/apps/tenor-search-service/src/main/resources/application-virtual.yml new file mode 100644 index 00000000000..4ccf23a19b7 --- /dev/null +++ b/apps/tenor-search-service/src/main/resources/application-virtual.yml @@ -0,0 +1,20 @@ +spring: + security: + oauth2: + resourceserver: + tokenx: + issuer-uri: http://tokendings:8080 + jwk-set-uri: http://tokendings:8080/jwks + accepted-audience: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service +altinn: + api: + url: http://altinn:8080 + key: dummy-altinn-key + + +TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service +TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server + +MASKINPORTEN_CLIENT_ID: client-id +MASKINPORTEN_SCOPES: scopes +MASKINPORTEN_WELL_KNOWN_URL: http://maskinporten:8080/.well-known/oauth-authorization-server \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml new file mode 100644 index 00000000000..2d73800f7b0 --- /dev/null +++ b/apps/tenor-search-service/src/main/resources/application.yml @@ -0,0 +1,48 @@ + +spring: + application: + version: 1 + name: testnav-tenor-search-service + desciption: Tjeneste som formidler søk til Tenor testdata hos Skatteetaten + security: + oauth2: + resourceserver: + tokenx: + issuer-uri: ${TOKENDINGS_URL} + jwk-set-uri: ${TOKENDINGS_URL}/jwks + accepted-audience: ${ACCEPTED_AUDIENCE} + jackson: + serialization: + write_dates_as_timestamps: false + cloud: + vault: + enabled: false + +springdoc: + swagger-ui: + disable-swagger-default-url: true + url: /v3/api-docs + +management: + endpoints: + enabled-by-default: true + web: + base-path: /internal + exposure.include: prometheus,heapdump,health + path-mapping: + prometheus: metrics + endpoint: + prometheus.enabled: true + heapdump.enabled: true + prometheus: + metrics: + export: + enabled: true +server: + servlet: + encoding: + charset: UTF-8 + +consumers: + tenor-search-service: + url: https://testdata.api.skatteetaten.no \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml new file mode 100644 index 00000000000..d5406129307 --- /dev/null +++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml @@ -0,0 +1,54 @@ + + + + + + + true + 256 + 10280 + 20 + ^sun\.reflect\..*\.invoke + ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke + java\.util\.concurrent\..* + org\.apache\.catalina\..* + org\.apache\.coyote\..* + org\.apache\.tomcat\..* + + + + + + + + + + + + + %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n + + utf8 + + + + + + + + + + + + %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n + + utf8 + + + + + + + + + \ No newline at end of file diff --git a/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java new file mode 100644 index 00000000000..058647bcc69 --- /dev/null +++ b/apps/tenor-search-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java @@ -0,0 +1,20 @@ +package no.nav.testnav.apps.tenorsearchservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest +@ActiveProfiles("test") +class ApplicationContextTest { + + @MockBean + public ReactiveJwtDecoder jwtDecoder; + + @Test + @SuppressWarnings("java:S2699") + void load_app_context() { + } +} diff --git a/apps/tenor-search-service/src/test/resources/application-test.yml b/apps/tenor-search-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..c4d97b0be16 --- /dev/null +++ b/apps/tenor-search-service/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +TOKENDINGS_URL: dummy +MASKINPORTEN_CLIENT_ID: dummy +MASKINPORTEN_CLIENT_JWK: dummy +MASKINPORTEN_SCOPES: dummy +MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file diff --git a/apps/tenor-search-service/src/test/resources/logback-spring.xml b/apps/tenor-search-service/src/test/resources/logback-spring.xml new file mode 100644 index 00000000000..328f2de802b --- /dev/null +++ b/apps/tenor-search-service/src/test/resources/logback-spring.xml @@ -0,0 +1,20 @@ + + + + + + + %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n + + utf8 + + + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4c0e59d4e0f..719fb502406 100644 --- a/settings.gradle +++ b/settings.gradle @@ -122,6 +122,7 @@ includeBuild './apps/tps-messaging-service' includeBuild './apps/organisasjon-tilgang-frontend' includeBuild './apps/synt-vedtakshistorikk-service' includeBuild './apps/testnav-ident-pool' +includeBuild './apps/tenor-search-service' includeBuild './apps/dollystatus' includeBuild './xsd/arbeidsforhold-xsd' From 337ad765a1fbbdcd72c98b68db002dd94f2db4e0 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 2 Jan 2024 14:42:56 +0100 Subject: [PATCH 02/69] Oppdatering #deploy-tenor-search-service --- .../workflows/app.tenor-search-service.yml | 6 +++--- apps/tenor-search-service/README.md | 2 +- .../src/main/resources/application-local.yml | 4 +--- .../main/resources/application-virtual.yml | 20 ------------------- .../src/main/resources/logback-spring.xml | 14 ------------- 5 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 apps/tenor-search-service/src/main/resources/application-virtual.yml diff --git a/.github/workflows/app.tenor-search-service.yml b/.github/workflows/app.tenor-search-service.yml index d74d7cc7f75..e7c256f6a16 100644 --- a/.github/workflows/app.tenor-search-service.yml +++ b/.github/workflows/app.tenor-search-service.yml @@ -7,15 +7,15 @@ on: - libs/reactive-core - libs/reactive-security - libs/security-core - - apps/tenor-search-service-service/** + - apps/tenor-search-service/** - .github/workflows/app.tenor-search-service.yml jobs: workflow: uses: ./.github/workflows/common.workflow.backend.yml with: - working-directory: "apps/tenor-search-service-service" - deploy-tag: "#deploy-tenor-search-service-service" + working-directory: "apps/tenor-search-service" + deploy-tag: "#deploy-tenor-search-service" permissions: contents: read id-token: write diff --git a/apps/tenor-search-service/README.md b/apps/tenor-search-service/README.md index 93c76dce262..db28fe607b5 100644 --- a/apps/tenor-search-service/README.md +++ b/apps/tenor-search-service/README.md @@ -5,5 +5,5 @@ Service som formidler søk til Tenor testdata hos Skatteetaten. ## Swagger Swagger finnes -under [/swagger-ui.html](https://testnav-person-organisasjon-tilgang-service.intern.dev.nav.no/swagger-ui.html) +under [/swagger-ui.html](https://testnav-tenor-search-service.intern.dev.nav.no/swagger-ui.html) -endepunktet til applikasjonen. \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml index 619ed0070da..84a98a0d1b8 100644 --- a/apps/tenor-search-service/src/main/resources/application-local.yml +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -1,8 +1,6 @@ -ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-person-tilgang-service-dev -ALTINN_URL: https://tt02.altinn.no +ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-tenor-search-service TOKENDINGS_URL: dummy -ALTINN_API_KEY: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy diff --git a/apps/tenor-search-service/src/main/resources/application-virtual.yml b/apps/tenor-search-service/src/main/resources/application-virtual.yml deleted file mode 100644 index 4ccf23a19b7..00000000000 --- a/apps/tenor-search-service/src/main/resources/application-virtual.yml +++ /dev/null @@ -1,20 +0,0 @@ -spring: - security: - oauth2: - resourceserver: - tokenx: - issuer-uri: http://tokendings:8080 - jwk-set-uri: http://tokendings:8080/jwks - accepted-audience: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service -altinn: - api: - url: http://altinn:8080 - key: dummy-altinn-key - - -TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service -TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server - -MASKINPORTEN_CLIENT_ID: client-id -MASKINPORTEN_SCOPES: scopes -MASKINPORTEN_WELL_KNOWN_URL: http://maskinporten:8080/.well-known/oauth-authorization-server \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/logback-spring.xml b/apps/tenor-search-service/src/main/resources/logback-spring.xml index d5406129307..2ca797bad5e 100644 --- a/apps/tenor-search-service/src/main/resources/logback-spring.xml +++ b/apps/tenor-search-service/src/main/resources/logback-spring.xml @@ -36,19 +36,5 @@ - - - - - %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n - - utf8 - - - - - - - \ No newline at end of file From f78d4d1c57c514bbca5f2a05820447edb278a7a3 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 3 Jan 2024 07:23:06 +0100 Subject: [PATCH 03/69] Oppdatering II #deploy-tenor-search-service --- .../apps/tenorsearchservice/config/MaskinportenConfig.java | 3 +-- .../tenor-search-service/src/main/resources/application.yml | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java index 635a9d896e9..e22b9fcd5c5 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java @@ -14,11 +14,10 @@ public class MaskinportenConfig { public MaskinportenConfig( @Value("${MASKINPORTEN_CLIENT_ID}") String clientId, @Value("${MASKINPORTEN_CLIENT_JWK}") String jwkPrivate, - @Value("${MASKINPORTEN_SCOPES}") String scope, @Value("${MASKINPORTEN_WELL_KNOWN_URL}") String wellKnownUrl ) { this.clientId = clientId; - this.scope = scope; + this.scope = "skatteetaten:tjenestepensjonsavtale"; this.jwkPrivate = jwkPrivate; this.wellKnownUrl = wellKnownUrl; } diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml index 2d73800f7b0..bf7696d1629 100644 --- a/apps/tenor-search-service/src/main/resources/application.yml +++ b/apps/tenor-search-service/src/main/resources/application.yml @@ -1,4 +1,4 @@ - +AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b spring: application: version: 1 @@ -7,6 +7,10 @@ spring: security: oauth2: resourceserver: + aad: + issuer-uri: ${AAD_ISSUER_URI}/v2.0 + jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys + accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: issuer-uri: ${TOKENDINGS_URL} jwk-set-uri: ${TOKENDINGS_URL}/jwks From 2e7514856b39562f245362f40d4ada87d8d11e50 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 3 Jan 2024 09:14:33 +0100 Subject: [PATCH 04/69] Oppdatering III #deploy-tenor-search-service --- apps/tenor-search-service/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml index 8adf6ef9e59..50c4eb41ddf 100644 --- a/apps/tenor-search-service/config.yml +++ b/apps/tenor-search-service/config.yml @@ -15,6 +15,11 @@ spec: tenant: nav.no tokenx: enabled: true + maskinporten: + enabled: true + scope: + consumes: + - name: skatteetaten:tjenestepensjonsavtale accessPolicy: inbound: rules: From 83e87e4d947b4111475887cbf58e715bc85d2d2a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 3 Jan 2024 09:47:39 +0100 Subject: [PATCH 05/69] Oppdatering IV #deploy-tenor-search-service --- apps/tenor-search-service/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml index 50c4eb41ddf..c08ebbf2bb8 100644 --- a/apps/tenor-search-service/config.yml +++ b/apps/tenor-search-service/config.yml @@ -17,7 +17,7 @@ spec: enabled: true maskinporten: enabled: true - scope: + scopes: consumes: - name: skatteetaten:tjenestepensjonsavtale accessPolicy: From 3b6b6942ea25ece6a978fc6f074e0c0309f894a8 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 3 Jan 2024 09:57:57 +0100 Subject: [PATCH 06/69] Oppdatering V #deploy-tenor-search-service --- apps/tenor-search-service/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 754c8bcf34d..47d05bc2561 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-service/build.gradle @@ -79,13 +79,9 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:integration-test' - testImplementation 'com.squareup.okhttp3:okhttp:4.10.0' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' From 97b11c83609f5bf1cefc2df84c03279150d4c0fe Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 9 Jan 2024 10:03:52 +0100 Subject: [PATCH 07/69] Update environment variables and config settings in TenorSearchService #deploy-tenor-search-service --- apps/tenor-search-service/config.yml | 11 +----- .../config/MaskinportenConfig.java | 38 +++++-------------- .../src/main/resources/application-local.yml | 6 +-- .../src/main/resources/application.yml | 6 +-- .../src/test/resources/application-test.yml | 4 +- 5 files changed, 19 insertions(+), 46 deletions(-) diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml index c08ebbf2bb8..7126109028c 100644 --- a/apps/tenor-search-service/config.yml +++ b/apps/tenor-search-service/config.yml @@ -15,11 +15,6 @@ spec: tenant: nav.no tokenx: enabled: true - maskinporten: - enabled: true - scopes: - consumes: - - name: skatteetaten:tjenestepensjonsavtale accessPolicy: inbound: rules: @@ -63,7 +58,5 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - - name: ACCEPTED_AUDIENCE - value: dev-gcp:dolly:testnav-tenor-search-service - - name: TOKENDINGS_URL - value: https://tokenx.dev-gcp.nav.cloud.nais.io \ No newline at end of file + - name: MASKINPORTEN_TENOR_SCOPE + value: "skatteetaten:testnorge/testdata.read" \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java index e22b9fcd5c5..a13813ca49c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java @@ -1,40 +1,22 @@ package no.nav.testnav.apps.tenorsearchservice.config; +import lombok.Getter; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; +@Getter @Configuration public class MaskinportenConfig { - private final String clientId; - private final String jwkPrivate; - private final String scope; - private final String wellKnownUrl; + @Value("${MASKINPORTEN_CLIENT_ID}") + private String clientId; - public MaskinportenConfig( - @Value("${MASKINPORTEN_CLIENT_ID}") String clientId, - @Value("${MASKINPORTEN_CLIENT_JWK}") String jwkPrivate, - @Value("${MASKINPORTEN_WELL_KNOWN_URL}") String wellKnownUrl - ) { - this.clientId = clientId; - this.scope = "skatteetaten:tjenestepensjonsavtale"; - this.jwkPrivate = jwkPrivate; - this.wellKnownUrl = wellKnownUrl; - } + @Value("${MASKINPORTEN_CLIENT_JWK}") + private String jwkPrivate; - public String getClientId() { - return clientId; - } + @Value("${MASKINPORTEN_TENOR_SCOPE}") + private String scope; - public String getJwkPrivate() { - return jwkPrivate; - } - - public String getScope() { - return scope; - } - - public String getWellKnownUrl() { - return wellKnownUrl; - } + @Value("${MASKINPORTEN_WELL_KNOWN_URL}") + private String wellKnownUrl; } diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml index 84a98a0d1b8..b2b920c414c 100644 --- a/apps/tenor-search-service/src/main/resources/application-local.yml +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -1,8 +1,6 @@ -ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-tenor-search-service - -TOKENDINGS_URL: dummy +TOKEN_X_ISSUER: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy -MASKINPORTEN_SCOPES: dummy +MASKINPORTEN_TENOR_SCOPE: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml index bf7696d1629..55fe126c531 100644 --- a/apps/tenor-search-service/src/main/resources/application.yml +++ b/apps/tenor-search-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: ${TOKENDINGS_URL} - jwk-set-uri: ${TOKENDINGS_URL}/jwks - accepted-audience: ${ACCEPTED_AUDIENCE} + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} jackson: serialization: write_dates_as_timestamps: false diff --git a/apps/tenor-search-service/src/test/resources/application-test.yml b/apps/tenor-search-service/src/test/resources/application-test.yml index c4d97b0be16..c1a3efae423 100644 --- a/apps/tenor-search-service/src/test/resources/application-test.yml +++ b/apps/tenor-search-service/src/test/resources/application-test.yml @@ -1,5 +1,5 @@ -TOKENDINGS_URL: dummy +TOKEN_X_ISSUER: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy -MASKINPORTEN_SCOPES: dummy +MASKINPORTEN_TENOR_SCOPE: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file From b13d8f532d30aa4a8bd3d36448b659c6012d3870 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 9 Jan 2024 12:38:46 +0100 Subject: [PATCH 08/69] Oppdatert konfig --- apps/tenor-search-service/config.yml | 10 ++++++---- .../tenorsearchservice/config/MaskinportenConfig.java | 2 +- .../src/main/resources/application-local.yml | 2 +- .../src/test/resources/application-test.yml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml index 7126109028c..8193e3ad62b 100644 --- a/apps/tenor-search-service/config.yml +++ b/apps/tenor-search-service/config.yml @@ -15,6 +15,11 @@ spec: tenant: nav.no tokenx: enabled: true + maskinporten: + enabled: true + scopes: + consumes: + - name: "skatteetaten:testnorge/testdata.read" accessPolicy: inbound: rules: @@ -28,7 +33,6 @@ spec: outbound: external: - host: testdata.api.skatteetaten.no - - host: maskinporten.no liveness: path: /internal/isAlive initialDelay: 4 @@ -57,6 +61,4 @@ spec: - "https://testnav-tenor-search-service.intern.dev.nav.no" env: - name: SPRING_PROFILES_ACTIVE - value: prod - - name: MASKINPORTEN_TENOR_SCOPE - value: "skatteetaten:testnorge/testdata.read" \ No newline at end of file + value: prod \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java index a13813ca49c..bb3cbf35099 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/MaskinportenConfig.java @@ -14,7 +14,7 @@ public class MaskinportenConfig { @Value("${MASKINPORTEN_CLIENT_JWK}") private String jwkPrivate; - @Value("${MASKINPORTEN_TENOR_SCOPE}") + @Value("${MASKINPORTEN_SCOPES}") private String scope; @Value("${MASKINPORTEN_WELL_KNOWN_URL}") diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml index b2b920c414c..8807d8c105a 100644 --- a/apps/tenor-search-service/src/main/resources/application-local.yml +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -2,5 +2,5 @@ TOKEN_X_ISSUER: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy -MASKINPORTEN_TENOR_SCOPE: dummy +MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file diff --git a/apps/tenor-search-service/src/test/resources/application-test.yml b/apps/tenor-search-service/src/test/resources/application-test.yml index c1a3efae423..dee4ed64372 100644 --- a/apps/tenor-search-service/src/test/resources/application-test.yml +++ b/apps/tenor-search-service/src/test/resources/application-test.yml @@ -1,5 +1,5 @@ TOKEN_X_ISSUER: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy -MASKINPORTEN_TENOR_SCOPE: dummy +MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file From 6c49a39348dd8d343140b86fb15ef28d08c4bc6a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 9 Jan 2024 12:40:26 +0100 Subject: [PATCH 09/69] Oppdatert konfig II #deploy-tenor-search-service --- apps/tenor-search-service/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/tenor-search-service/config.yml b/apps/tenor-search-service/config.yml index 8193e3ad62b..3243a5c47b5 100644 --- a/apps/tenor-search-service/config.yml +++ b/apps/tenor-search-service/config.yml @@ -46,8 +46,6 @@ spec: prometheus: enabled: true path: /internal/metrics - envFrom: - - secret: maskinporten-dolly-prod replicas: min: 1 max: 1 From 04000337da09b7a5f1d752973e5836e2b1a4958b Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 9 Jan 2024 14:07:21 +0100 Subject: [PATCH 10/69] =?UTF-8?q?Henter=20n=C3=B8kkelinformasjon=20#deploy?= =?UTF-8?q?-tenor-search-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index e5b3df685be..1ce6d7d658d 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.util.MultiValueMap; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; @@ -24,6 +23,7 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) .queryParam("kql",query) + .queryParam("nokkelinformasjon",true) .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) From 194577a1ef39b7b3325ab6278e649bc9a4bd94aa Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 08:00:07 +0100 Subject: [PATCH 11/69] =?UTF-8?q?Lagt=20til=20nytt=20endepunkt=20for=20sp?= =?UTF-8?q?=C3=B8rring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/TenorRequest.java | 48 ++++++++ .../provider/TenorSearchController.java | 15 ++- .../service/TenorSearchService.java | 107 +++++++++++++++++- 3 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java new file mode 100644 index 00000000000..3784f035985 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -0,0 +1,48 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +import static java.util.Objects.isNull; + +@Data +@NoArgsConstructor +public class TenorRequest { + + public enum IdentifikatorType {FNR, DNR, FNR_TIDLIGERE_DNR} + public enum Kjoenn {Mann, Kvinne} + public enum Roller {DAGLIG_LEDER} + public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphørt, Utflyttet} + public enum Sivilstand {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertPartner, Separert, SeparertPartner, Skilt, SkiltPartner, Ugift, Uoppgitt} + + private List roller; + + private IdentifikatorType identifikatorType; + private DatoIntervall foedselsdato; + private DatoIntervall doedsdato; + private Kjoenn kjoenn; + public Personstatus personstatus; + public Sivilstand sivilstand; + + public List getRoller() { + + if (isNull(roller)) { + roller = new ArrayList<>(); + } + return roller; + } + + private String adresseNavn; + + @Data + @NoArgsConstructor + public static class DatoIntervall { + + private LocalDate fra; + private LocalDate til; + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 732f4471135..c15f1fae741 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -2,9 +2,13 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.Mapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -22,8 +26,17 @@ public class TenorSearchController { private final TenorSearchService tenorSearchService; - @GetMapping("/testdata") + @GetMapping("/testdata/raw") public Mono getTestdata(@RequestParam(required = false) String searchData) { + + return tenorSearchService + .getTestdata(searchData) + .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); + } + + @PostMapping("/testdata") + public Mono getTestdata(@RequestBody TenorRequest searchData) { + return tenorSearchService .getTestdata(searchData) .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index b11ba77210d..6be6dfb16f8 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -3,10 +3,13 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; -import org.apache.commons.lang3.StringUtils; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; +import java.util.List; + +import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Service @@ -19,4 +22,106 @@ public Mono getTestdata(String testDataQuery) { return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : ""); } + + public Mono getTestdata(TenorRequest searchData) { + + var builder = new StringBuilder(); + builder.append(getFoedselsdato(searchData.getFoedselsdato())); + builder.append(getDoedsdato(searchData.getDoedsdato())); + builder.append(getIdentifikatorType(searchData.getIdentifikatorType())); + builder.append(getKjoenn(searchData.getKjoenn())); + builder.append(getPersonstatus(searchData.getPersonstatus())); + builder.append(getSivilstand(searchData.getSivilstand())); + + + builder.append(getRoller(searchData.getRoller())); + + return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); + } + + private String getRoller(List roller) { + + return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder}"; + } + + private String getSivilstand(TenorRequest.Sivilstand sivilstand) { + + if (isNull(sivilstand)) { + return ""; + } + + return "+and+sivilstand:" + switch (sivilstand) { + case EnkeEllerEnkemann -> "enkeEllerEnkemann"; + case Gift -> "gift"; + case GjenlevendePartner -> "gjenlevendePartner"; + case RegistrertPartner -> "registrertPartner"; + case Separert -> "separert"; + case SeparertPartner -> "separertPartner"; + case Skilt -> "skilt"; + case SkiltPartner -> "skiltPartner"; + case Ugift -> "ugift"; + case Uoppgitt -> "uoppgitt"; + }; + } + + private String getPersonstatus(TenorRequest.Personstatus personstatus) { + + if (isNull(personstatus)) { + return ""; + } + + return "+and+personstatus:" + switch (personstatus) { + case Bosatt -> "bosatt"; + case Doed -> "doed"; + case Forsvunnet -> "forsvunnet"; + case Foedselsregistrert -> "foedselsregistrert"; + case IkkeBosatt -> "ikkeBosatt"; + case Inaktiv -> "inaktiv"; + case Midlertidig -> "midlertidig"; + case Opphørt -> "opphørt"; + case Utflyttet -> "utflyttet"; + }; + } + + private String getKjoenn(TenorRequest.Kjoenn kjoenn) { + + if (isNull(kjoenn)) { + return ""; + } + + return "+and+kjoenn:" + switch (kjoenn) { + case Mann -> "mann"; + case Kvinne -> "kvinne"; + }; + } + + private String getFoedselsdato(TenorRequest.DatoIntervall foedselsdato) { + + if (isNull(foedselsdato)) { + return ""; + } + + return "+and+foedselsdato:[" + foedselsdato.getFra() + "+to+" + foedselsdato.getTil() + "]"; + } + private String getDoedsdato(TenorRequest.DatoIntervall doedsdato) { + + if (isNull(doedsdato)) { + return ""; + } + + return "+and+doedsdato:[" + doedsdato.getFra() + "+to+" + doedsdato.getTil() + "]"; + } + + private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { + + if (isNull(identifikatorType)) { + return ""; + } + + return "+and+identifikatorType:" + switch (identifikatorType) { + case FNR -> "foedselsnummer"; + case DNR -> "dNummer"; + case FNR_TIDLIGERE_DNR -> "foedselsnummerOgTidligereDNummer"; + }; + } } From 8614bdb45e59cded864973661c46651c13a94ff1 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 08:02:54 +0100 Subject: [PATCH 12/69] Deploy #deploy-tenor-search-service --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 1ce6d7d658d..c4e3a96f063 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -30,4 +30,4 @@ public Mono call() { .retrieve() .bodyToMono(JsonNode.class); } -} +} \ No newline at end of file From 9ced6b178681931c8ebee891fe989d00aa11c8e7 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 08:48:54 +0100 Subject: [PATCH 13/69] Lagt til feilhandtering #deploy-tenor-search-service --- .../consumers/TenorClient.java | 3 ++- .../consumers/command/GetTenorTestdata.java | 25 +++++++++++++++---- .../domain/TenorResponse.java | 20 +++++++++++++++ .../provider/TenorSearchController.java | 5 ++-- .../service/TenorSearchService.java | 7 +++--- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index c5d21304f61..c3708f8e552 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; @@ -22,7 +23,7 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.maskinportenClient = maskinportenClient; } - public Mono getTestdata(String query) { + public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index c4e3a96f063..567027b27c3 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -2,32 +2,47 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; +import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; +import reactor.util.retry.Retry; +import java.time.Duration; import java.util.concurrent.Callable; @RequiredArgsConstructor -public class GetTenorTestdata implements Callable> { +public class GetTenorTestdata implements Callable> { private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; private final WebClient webClient; private final String query; private final String token; + @Override - public Mono call() { + public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql",query) - .queryParam("nokkelinformasjon",true) + .queryParam("kql", query) + .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() - .bodyToMono(JsonNode.class); + .bodyToMono(JsonNode.class) + .map(response -> TenorResponse.builder() + .data(response) + .build()) + .doOnError(WebClientFilter::logErrorMessage) + .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) + .filter(WebClientFilter::is5xxException)) + .onErrorResume(error -> Mono.just(TenorResponse.builder() + .status(WebClientFilter.getStatus(error)) + .errorMessage(WebClientFilter.getMessage(error)) + .build())); } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java new file mode 100644 index 00000000000..000b1fa615f --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java @@ -0,0 +1,20 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +import com.fasterxml.jackson.databind.JsonNode; +import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.http.HttpStatus; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TenorResponse { + + private String errorMessage; + private HttpStatus status; + private JsonNode data; +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index c15f1fae741..02ae6928c5e 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; @@ -27,7 +28,7 @@ public class TenorSearchController { private final TenorSearchService tenorSearchService; @GetMapping("/testdata/raw") - public Mono getTestdata(@RequestParam(required = false) String searchData) { + public Mono getTestdata(@RequestParam(required = false) String searchData) { return tenorSearchService .getTestdata(searchData) @@ -35,7 +36,7 @@ public Mono getTestdata(@RequestParam(required = false) String searchD } @PostMapping("/testdata") - public Mono getTestdata(@RequestBody TenorRequest searchData) { + public Mono getTestdata(@RequestBody TenorRequest searchData) { return tenorSearchService .getTestdata(searchData) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 6be6dfb16f8..acf1d5d3b4c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; @@ -18,12 +19,12 @@ public class TenorSearchService { private final TenorClient tenorClient; - public Mono getTestdata(String testDataQuery) { + public Mono getTestdata(String testDataQuery) { return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : ""); } - public Mono getTestdata(TenorRequest searchData) { + public Mono getTestdata(TenorRequest searchData) { var builder = new StringBuilder(); builder.append(getFoedselsdato(searchData.getFoedselsdato())); @@ -41,7 +42,7 @@ public Mono getTestdata(TenorRequest searchData) { private String getRoller(List roller) { - return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder}"; + return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; } private String getSivilstand(TenorRequest.Sivilstand sivilstand) { From f9f41c4c44b54e360ad8fdb727f166bfb5a40f98 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 09:23:24 +0100 Subject: [PATCH 14/69] Update HTTP headers and error handling in TenorSearchService #deploy-testnav-tenor-search --- .../consumers/command/GetTenorTestdata.java | 9 +++++++-- .../apps/tenorsearchservice/domain/TenorResponse.java | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 567027b27c3..08eb7f6dd1e 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -5,11 +5,14 @@ import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.concurrent.Callable; @@ -27,14 +30,16 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", query) + .queryParam("kql", query, URLEncoder.encode(query, StandardCharsets.UTF_8)) .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) .retrieve() .bodyToMono(JsonNode.class) .map(response -> TenorResponse.builder() + .status(HttpStatus.OK) .data(response) .build()) .doOnError(WebClientFilter::logErrorMessage) @@ -42,7 +47,7 @@ public Mono call() { .filter(WebClientFilter::is5xxException)) .onErrorResume(error -> Mono.just(TenorResponse.builder() .status(WebClientFilter.getStatus(error)) - .errorMessage(WebClientFilter.getMessage(error)) + .error(WebClientFilter.getMessage(error)) .build())); } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java index 000b1fa615f..ee824904d3f 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java @@ -1,7 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.domain; import com.fasterxml.jackson.databind.JsonNode; -import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakeException; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,7 +13,7 @@ @AllArgsConstructor public class TenorResponse { - private String errorMessage; private HttpStatus status; private JsonNode data; + private String error; } \ No newline at end of file From b9b350423cfe52367c989a0753f650110516c84e Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 09:51:22 +0100 Subject: [PATCH 15/69] Oppdatering #deploy-testnav-tenor-search --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 08eb7f6dd1e..26607436b7a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -30,7 +30,7 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", query, URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) From 691fd56dcc17de91c2f57cdb5823be11a113c3b2 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 09:58:00 +0100 Subject: [PATCH 16/69] Deploy #deploy-testnav-tenor-search --- .../testnav/apps/tenorsearchservice/consumers/TenorClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index c3708f8e552..27bcae89de8 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -28,4 +28,4 @@ public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } -} +} \ No newline at end of file From e803ff59f44d02a03df415d19149744a4cae0f39 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 10:09:16 +0100 Subject: [PATCH 17/69] Deploy #deploy-tenor-search-service --- .../testnav/apps/tenorsearchservice/consumers/TenorClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 27bcae89de8..c3708f8e552 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -28,4 +28,4 @@ public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } -} \ No newline at end of file +} From 86fb1886f5cd53e040402dcc6a32786e84c29051 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 10:38:48 +0100 Subject: [PATCH 18/69] Oppdatert konfig #deploy-tenor-search-service --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 1 - .../apps/tenorsearchservice/service/TenorSearchService.java | 1 - 2 files changed, 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 26607436b7a..9ecfcf397dc 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -35,7 +35,6 @@ public Mono call() { .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) .retrieve() .bodyToMono(JsonNode.class) .map(response -> TenorResponse.builder() diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index acf1d5d3b4c..616cc1c0f11 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -1,6 +1,5 @@ package no.nav.testnav.apps.tenorsearchservice.service; -import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; From 1d704264b0fbdfab2e087f0c5b7d3393d5dc0df5 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 12:23:17 +0100 Subject: [PATCH 19/69] Oppdatert konfig #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 2 +- .../provider/TenorSearchController.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 9ecfcf397dc..87971e663ce 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -30,7 +30,7 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("kql", query) .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 02ae6928c5e..363a2a3e70e 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; +import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient; +import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; @@ -26,6 +28,7 @@ public class TenorSearchController { private final TenorSearchService tenorSearchService; + private final MaskinportenClient maskinportenClient; @GetMapping("/testdata/raw") public Mono getTestdata(@RequestParam(required = false) String searchData) { @@ -43,6 +46,13 @@ public Mono getTestdata(@RequestBody TenorRequest searchData) { .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); } + @GetMapping("/testdata/token") + public Mono getToken() { + + return maskinportenClient.getAccessToken() + .map(AccessToken::toString); + } + @Bean public RouterFunction notFound() { return RouterFunctions From f519505f720f1c143f0aa8f4356800beb71200e8 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 12:39:09 +0100 Subject: [PATCH 20/69] Oppdatert konfig II #deploy-tenor-search-service --- .../apps/tenorsearchservice/provider/TenorSearchController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 363a2a3e70e..d33c1fb59d4 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -50,7 +50,7 @@ public Mono getTestdata(@RequestBody TenorRequest searchData) { public Mono getToken() { return maskinportenClient.getAccessToken() - .map(AccessToken::toString); + .map(AccessToken::value); } @Bean From ef4fd6342c1c717057172c33f65d39422d3f4e42 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 10 Jan 2024 18:55:08 +0100 Subject: [PATCH 21/69] Lagt til flere opplysningstyper #deploy-tenor-search-service --- .../domain/TenorRequest.java | 47 +++++++- .../service/TenorSearchService.java | 113 ++++++++---------- 2 files changed, 92 insertions(+), 68 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 3784f035985..ea0a77dd9a1 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -16,8 +16,12 @@ public class TenorRequest { public enum IdentifikatorType {FNR, DNR, FNR_TIDLIGERE_DNR} public enum Kjoenn {Mann, Kvinne} public enum Roller {DAGLIG_LEDER} - public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphørt, Utflyttet} - public enum Sivilstand {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertPartner, Separert, SeparertPartner, Skilt, SkiltPartner, Ugift, Uoppgitt} + public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphoert, Utflyttet} + public enum Sivilstatus {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertPartner, Separert, SeparertPartner, Skilt, SkiltPartner, Ugift, Uoppgitt} + public enum UtenlandskPersonIdentifikasjon{UtenlandskIdentifikasjonsnummer, TaxIdentificationNumber, SocialSecurityNumber, UtlendingsmyndighetenesIdentifikasjonsnummer} + public enum IdentitetsgrunnlagStatus {IkkeKontrollert, IngenStatus, Kontrollert} + public enum Adressebeskyttelse {Fortrolig, StrengtFortrolig} + private List roller; @@ -25,8 +29,25 @@ public enum Sivilstand {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertP private DatoIntervall foedselsdato; private DatoIntervall doedsdato; private Kjoenn kjoenn; - public Personstatus personstatus; - public Sivilstand sivilstand; + private Personstatus personstatus; + private Sivilstatus sivilstatus; + private List utenlandskPersonIdentifikasjon; + private IdentitetsgrunnlagStatus identitetsgrunnlagStatus; + private Adressebeskyttelse adressebeskyttelse; + private Boolean legitimasjonsdokument; + private Boolean falskIdentitet; + private Boolean norskStatsborgerskap; + private Boolean flereStatsborgerskap; + private Navn navn; + + + public List getUtenlandskPersonIdentifikasjon() { + + if (isNull(utenlandskPersonIdentifikasjon)) { + utenlandskPersonIdentifikasjon = new ArrayList<>(); + } + return utenlandskPersonIdentifikasjon; + } public List getRoller() { @@ -45,4 +66,22 @@ public static class DatoIntervall { private LocalDate fra; private LocalDate til; } + + @Data + @NoArgsConstructor + public static class Navn { + + private NavnLengde navnLengde; + private Boolean flereFornavn; + private Boolean harMellomnavn; + private Boolean navnSpesialtegn; + } + + @Data + @NoArgsConstructor + public static class NavnLengde { + + private Integer fraOgMed; + private Integer tilOgMed; + } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 616cc1c0f11..d984d190a10 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -8,8 +8,11 @@ import reactor.core.publisher.Mono; import java.util.List; +import java.util.stream.Collectors; import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Service @@ -25,91 +28,73 @@ public Mono getTestdata(String testDataQuery) { public Mono getTestdata(TenorRequest searchData) { - var builder = new StringBuilder(); - builder.append(getFoedselsdato(searchData.getFoedselsdato())); - builder.append(getDoedsdato(searchData.getDoedsdato())); - builder.append(getIdentifikatorType(searchData.getIdentifikatorType())); - builder.append(getKjoenn(searchData.getKjoenn())); - builder.append(getPersonstatus(searchData.getPersonstatus())); - builder.append(getSivilstand(searchData.getSivilstand())); - + var builder = new StringBuilder() + .append(convertDatoer("foedselsdato", searchData.getFoedselsdato())) + .append(convertDatoer("doedsdato", searchData.getDoedsdato())) + .append(getIdentifikatorType(searchData.getIdentifikatorType())) + .append(convertEnum("kjoenn", searchData.getKjoenn())) + .append(convertEnum("personstatus", searchData.getPersonstatus())) + .append(convertEnum("sivilstatus", searchData.getSivilstatus())) + .append(getUtenlandskPersonidentifikasjon(searchData.getUtenlandskPersonIdentifikasjon())) + .append(convertEnum("identitetsgrunnlagStatus", searchData.getIdentitetsgrunnlagStatus())) + .append(convertEnum("adressebeskyttelse", searchData.getAdressebeskyttelse())) + .append(convertBoolean("legitimasjonsdokument", searchData.getLegitimasjonsdokument())) + .append(convertBoolean("falskIdentitet", searchData.getFalskIdentitet())) + .append(convertBoolean("norskStatsborgerskap", searchData.getNorskStatsborgerskap())) + .append(convertBoolean("flereStatsborgerskap", searchData.getFlereStatsborgerskap())); + if (nonNull(searchData.getNavn())) { + builder.append(convertBoolean("flereFornavn", searchData.getNavn().getFlereFornavn())) + .append(getNavnLengde(searchData.getNavn().getNavnLengde())) + .append(getHarMellomnavn(searchData.getNavn().getHarMellomnavn())) + .append(convertBoolean("navnSpesialtegn", searchData.getNavn().getNavnSpesialtegn())); + } builder.append(getRoller(searchData.getRoller())); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } - private String getRoller(List roller) { + private String getHarMellomnavn(Boolean harMellomnavn) { - return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; + return isNotTrue(harMellomnavn) ? "" : "+and+harMellomnavn:*"; } - private String getSivilstand(TenorRequest.Sivilstand sivilstand) { - - if (isNull(sivilstand)) { - return ""; - } - - return "+and+sivilstand:" + switch (sivilstand) { - case EnkeEllerEnkemann -> "enkeEllerEnkemann"; - case Gift -> "gift"; - case GjenlevendePartner -> "gjenlevendePartner"; - case RegistrertPartner -> "registrertPartner"; - case Separert -> "separert"; - case SeparertPartner -> "separertPartner"; - case Skilt -> "skilt"; - case SkiltPartner -> "skiltPartner"; - case Ugift -> "ugift"; - case Uoppgitt -> "uoppgitt"; - }; - } + private String getNavnLengde(TenorRequest.NavnLengde navnLengde) { - private String getPersonstatus(TenorRequest.Personstatus personstatus) { - - if (isNull(personstatus)) { - return ""; - } - - return "+and+personstatus:" + switch (personstatus) { - case Bosatt -> "bosatt"; - case Doed -> "doed"; - case Forsvunnet -> "forsvunnet"; - case Foedselsregistrert -> "foedselsregistrert"; - case IkkeBosatt -> "ikkeBosatt"; - case Inaktiv -> "inaktiv"; - case Midlertidig -> "midlertidig"; - case Opphørt -> "opphørt"; - case Utflyttet -> "utflyttet"; - }; + return isNull(navnLengde) ? "" : "+and+navnLengde:[%s+to+%s]" + .formatted(isNull(navnLengde.getFraOgMed()) ? "*" : navnLengde.getFraOgMed(), + isNull(navnLengde.getTilOgMed()) ? "*" : navnLengde.getTilOgMed()); } - private String getKjoenn(TenorRequest.Kjoenn kjoenn) { + private String convertBoolean(String booleanNavn, Boolean booleanVerdi) { + + return isNull(booleanVerdi) ? "" : "+and+%s:%s".formatted(booleanNavn, booleanVerdi); + } - if (isNull(kjoenn)) { - return ""; - } + private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { - return "+and+kjoenn:" + switch (kjoenn) { - case Mann -> "mann"; - case Kvinne -> "kvinne"; - }; + return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : "+data+utenlandskPersonidentifikasjon:(%s)" + .formatted(utenlandskPersonIdentifikasjon.stream() + .map(Enum::name) + .collect(Collectors.joining("+and+"))); } - private String getFoedselsdato(TenorRequest.DatoIntervall foedselsdato) { + private String getRoller(List roller) { - if (isNull(foedselsdato)) { - return ""; - } + return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; + } - return "+and+foedselsdato:[" + foedselsdato.getFra() + "+to+" + foedselsdato.getTil() + "]"; + private String convertEnum(String enumNavn, Enum enumVerdi) { + + return isNull(enumVerdi) ? "" : "+and+%s:%s%s".formatted(enumNavn, + enumVerdi.name().substring(0, 1).toUpperCase(), + enumVerdi.name().substring(1)); } - private String getDoedsdato(TenorRequest.DatoIntervall doedsdato) { - if (isNull(doedsdato)) { - return ""; - } + private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { - return "+and+doedsdato:[" + doedsdato.getFra() + "+to+" + doedsdato.getTil() + "]"; + return isNull(datoIntervall) ? "" : + "+and+%s:[%s+to+%s]".formatted(datoNavn, datoIntervall.getFra(), datoIntervall.getTil()); } private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { From bc72dff09f0a68ab737a5b280880efc7eff48816 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 11 Jan 2024 09:20:10 +0100 Subject: [PATCH 22/69] =?UTF-8?q?Oppdatert=20for=20flere=20typer=20s=C3=B8?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/TenorRequest.java | 70 +++++++++++++++---- .../service/TenorSearchService.java | 61 ++++++++++++---- 2 files changed, 105 insertions(+), 26 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index ea0a77dd9a1..68b380e2bdf 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -21,7 +21,18 @@ public enum Sivilstatus {EnkeEllerEnkemann, Gift, GjenlevendePartner, Registrert public enum UtenlandskPersonIdentifikasjon{UtenlandskIdentifikasjonsnummer, TaxIdentificationNumber, SocialSecurityNumber, UtlendingsmyndighetenesIdentifikasjonsnummer} public enum IdentitetsgrunnlagStatus {IkkeKontrollert, IngenStatus, Kontrollert} public enum Adressebeskyttelse {Fortrolig, StrengtFortrolig} - + public enum AdresseGradering {Ugradert, Klientadresse, Fortrolig} + public enum Relasjon {Barn, Far, Medmor, Mor, Partner} + public enum Hendelser {EndringIAdressebeskyttelse, EndringIBostedsadresse, EndringIBostedsadresseUtenFlytting, + EndringIBrukAvSamiskSpraak, EndringIDeltBosted, EndringIDoedsfall, EndringIFalskIdentitet, EndringIFamilierelasjon, + EndringIForeldreansvar, EndringIFratattRettsligHandleevne, EndringIFoedsel, EndringIFoedselINorge, + EndringIIdentifikasjonsnummer, EndringIIdentitetsgrunnlag, EndringIInnflytting, EndringIKjoenn, + EndringIKontaktinformasjon, EndringIKontaktopplysningerForDoedsbo, EndringILegitimasjonsdokument, + EndringINavn, EndringIOpphold, EndringIOppholdPaaSvalbard, EndringIOppholdsadresse, EndringIPerson, + EndringIRettsligHandleevne, EndringISametingetsValgmanntall, EndringISivilstand, EndringIStatsborgerskap, + EndringIStatus, EndringIUtenlandskPersonidentifikasjon, EndringIUtflytting, + EndringIUtlendingsmyndighetenesIdentifikasjonsnummer, + } private List roller; @@ -34,12 +45,14 @@ public enum Adressebeskyttelse {Fortrolig, StrengtFortrolig} private List utenlandskPersonIdentifikasjon; private IdentitetsgrunnlagStatus identitetsgrunnlagStatus; private Adressebeskyttelse adressebeskyttelse; - private Boolean legitimasjonsdokument; - private Boolean falskIdentitet; - private Boolean norskStatsborgerskap; - private Boolean flereStatsborgerskap; + private Boolean harLegitimasjonsdokument; + private Boolean harFalskIdentitet; + private Boolean harNorskStatsborgerskap; + private Boolean harFlereStatsborgerskap; private Navn navn; - + private Adresser adresser; + private Relasjoner relasjoner; + private Hendelser hendelser; public List getUtenlandskPersonIdentifikasjon() { @@ -67,21 +80,54 @@ public static class DatoIntervall { private LocalDate til; } + @Data + @NoArgsConstructor + public static class Intervall { + + private Integer fraOgMed; + + private Integer tilOgMed; + } @Data @NoArgsConstructor public static class Navn { - private NavnLengde navnLengde; - private Boolean flereFornavn; + private Intervall navnLengde; + private Boolean harFlereFornavn; private Boolean harMellomnavn; - private Boolean navnSpesialtegn; + private Boolean harNavnSpesialtegn; } @Data @NoArgsConstructor - public static class NavnLengde { + public static class Adresser { + + private AdresseGradering adresseGradering; + private Integer kommunenummer; + private Boolean harBostedsadresse; + private Boolean harOppholdAnnetSted; + private Boolean harPostadresseNorge; + private Boolean harPostadresseUtland; + private Boolean harKontaktadresseDoedsbo; + private Boolean harAdresseSpesialtegn; + } - private Integer fraOgMed; - private Integer tilOgMed; + @Data + @NoArgsConstructor + public static class Relasjoner { + + private Relasjon relasjon; + private Intervall antallBarn; + private Boolean harForeldreAnsvar; + private Intervall relasjonMedFoedselsaar; + private Boolean harDeltBosted; + private Boolean harVergemaalEllerFremtidsfullmakt; + } + + @Data + @NoArgsConstructor + public static class Hendelser { + + private Hendelser hendelse; } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index d984d190a10..eb84e6fed49 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -38,15 +38,34 @@ public Mono getTestdata(TenorRequest searchData) { .append(getUtenlandskPersonidentifikasjon(searchData.getUtenlandskPersonIdentifikasjon())) .append(convertEnum("identitetsgrunnlagStatus", searchData.getIdentitetsgrunnlagStatus())) .append(convertEnum("adressebeskyttelse", searchData.getAdressebeskyttelse())) - .append(convertBoolean("legitimasjonsdokument", searchData.getLegitimasjonsdokument())) - .append(convertBoolean("falskIdentitet", searchData.getFalskIdentitet())) - .append(convertBoolean("norskStatsborgerskap", searchData.getNorskStatsborgerskap())) - .append(convertBoolean("flereStatsborgerskap", searchData.getFlereStatsborgerskap())); + .append(convertBoolean("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument())) + .append(convertBoolean("falskIdentitet", searchData.getHarFalskIdentitet())) + .append(convertBoolean("norskStatsborgerskap", searchData.getHarNorskStatsborgerskap())) + .append(convertBoolean("flereStatsborgerskap", searchData.getHarFlereStatsborgerskap())); + if (nonNull(searchData.getNavn())) { - builder.append(convertBoolean("flereFornavn", searchData.getNavn().getFlereFornavn())) - .append(getNavnLengde(searchData.getNavn().getNavnLengde())) - .append(getHarMellomnavn(searchData.getNavn().getHarMellomnavn())) - .append(convertBoolean("navnSpesialtegn", searchData.getNavn().getNavnSpesialtegn())); + builder.append(convertBoolean("flereFornavn", searchData.getNavn().getHarFlereFornavn())) + .append(getIntervall("navnLengde", searchData.getNavn().getNavnLengde())) + .append(convertBooleanWildcard("mellomnavn", searchData.getNavn().getHarMellomnavn())) + .append(convertBoolean("navnSpesialtegn", searchData.getNavn().getHarNavnSpesialtegn())); + } + + if (nonNull(searchData.getAdresser())) { + builder.append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse())) + .append(convertBooleanWildcard("oppholdAnnetSted", searchData.getAdresser().getHarOppholdAnnetSted())) + .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge())) + .append(convertBooleanWildcard("postadresseUtland", searchData.getAdresser().getHarPostadresseUtland())) + .append(convertBooleanWildcard("kontaktinfoDoedsbo", searchData.getAdresser().getHarKontaktadresseDoedsbo())) + .append(convertBoolean("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())); + } + + if (nonNull(searchData.getRelasjoner())) { + builder.append(getRelasjon(searchData.getRelasjoner().getRelasjon())) + .append(getIntervall("antallBarn", searchData.getRelasjoner().getAntallBarn())) + .append(convertBooleanWildcard("foreldreansvar", searchData.getRelasjoner().getHarForeldreAnsvar())) + .append(getRelasjonMedFoedselsdato(searchData.getRelasjoner().getRelasjonMedFoedselsaar())) + .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted())) + .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())); } builder.append(getRoller(searchData.getRoller())); @@ -54,16 +73,17 @@ public Mono getTestdata(TenorRequest searchData) { return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } - private String getHarMellomnavn(Boolean harMellomnavn) { + private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { - return isNotTrue(harMellomnavn) ? "" : "+and+harMellomnavn:*"; + return isNull(relasjonMedFoedselsaar) ? "" : "+and+tenorRelasjoner.freg:{foedselsdato:[%s+to+%s]}" + .formatted( + isNull(relasjonMedFoedselsaar.getFraOgMed()) ? "*" : relasjonMedFoedselsaar.getFraOgMed(), + isNull(relasjonMedFoedselsaar.getTilOgMed()) ? "*" : relasjonMedFoedselsaar.getTilOgMed()); } - private String getNavnLengde(TenorRequest.NavnLengde navnLengde) { + private String getRelasjon(TenorRequest.Relasjon relasjon) { - return isNull(navnLengde) ? "" : "+and+navnLengde:[%s+to+%s]" - .formatted(isNull(navnLengde.getFraOgMed()) ? "*" : navnLengde.getFraOgMed(), - isNull(navnLengde.getTilOgMed()) ? "*" : navnLengde.getTilOgMed()); + return isNull(relasjon) ? "" : "+and+tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); } private String convertBoolean(String booleanNavn, Boolean booleanVerdi) { @@ -71,6 +91,19 @@ private String convertBoolean(String booleanNavn, Boolean booleanVerdi) { return isNull(booleanVerdi) ? "" : "+and+%s:%s".formatted(booleanNavn, booleanVerdi); } + private String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { + + return isNotTrue(booleanVerdi) ? "" : "+and+%s:*".formatted(booleanNavn); + } + + private String getIntervall(String intervallNavn, TenorRequest.Intervall intervall) { + + return isNull(intervall) ? "" : "+and+%s:[%s+to+%s]" + .formatted(intervallNavn, + isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), + isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + } + private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : "+data+utenlandskPersonidentifikasjon:(%s)" From 0a28eda01ea9c12767b903c398303f0587fc0870 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 11 Jan 2024 09:52:02 +0100 Subject: [PATCH 23/69] Oppdatert enum #deploy-tenor-search-service --- .../domain/TenorRequest.java | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 68b380e2bdf..63bd6e6fd63 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -14,24 +14,38 @@ public class TenorRequest { public enum IdentifikatorType {FNR, DNR, FNR_TIDLIGERE_DNR} + public enum Kjoenn {Mann, Kvinne} + public enum Roller {DAGLIG_LEDER} + public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphoert, Utflyttet} + public enum Sivilstatus {EnkeEllerEnkemann, Gift, GjenlevendePartner, RegistrertPartner, Separert, SeparertPartner, Skilt, SkiltPartner, Ugift, Uoppgitt} - public enum UtenlandskPersonIdentifikasjon{UtenlandskIdentifikasjonsnummer, TaxIdentificationNumber, SocialSecurityNumber, UtlendingsmyndighetenesIdentifikasjonsnummer} + + public enum UtenlandskPersonIdentifikasjon {UtenlandskIdentifikasjonsnummer, TaxIdentificationNumber, SocialSecurityNumber, UtlendingsmyndighetenesIdentifikasjonsnummer} + public enum IdentitetsgrunnlagStatus {IkkeKontrollert, IngenStatus, Kontrollert} + public enum Adressebeskyttelse {Fortrolig, StrengtFortrolig} + public enum AdresseGradering {Ugradert, Klientadresse, Fortrolig} + public enum Relasjon {Barn, Far, Medmor, Mor, Partner} - public enum Hendelser {EndringIAdressebeskyttelse, EndringIBostedsadresse, EndringIBostedsadresseUtenFlytting, - EndringIBrukAvSamiskSpraak, EndringIDeltBosted, EndringIDoedsfall, EndringIFalskIdentitet, EndringIFamilierelasjon, + + public enum Hendelse { + EndringIAdressebeskyttelse, EndringIBostedsadresse, EndringIBostedsadresseUtenFlytting, + EndringIBrukAvSamiskSpraak, EndringIDeltBosted, EndringIDoedsfall, EndringIFalskIdentitet, EndringIFamilierelasjon, EndringIForeldreansvar, EndringIFratattRettsligHandleevne, EndringIFoedsel, EndringIFoedselINorge, EndringIIdentifikasjonsnummer, EndringIIdentitetsgrunnlag, EndringIInnflytting, EndringIKjoenn, EndringIKontaktinformasjon, EndringIKontaktopplysningerForDoedsbo, EndringILegitimasjonsdokument, EndringINavn, EndringIOpphold, EndringIOppholdPaaSvalbard, EndringIOppholdsadresse, EndringIPerson, EndringIRettsligHandleevne, EndringISametingetsValgmanntall, EndringISivilstand, EndringIStatsborgerskap, EndringIStatus, EndringIUtenlandskPersonidentifikasjon, EndringIUtflytting, - EndringIUtlendingsmyndighetenesIdentifikasjonsnummer, + EndringIUtlendingsmyndighetenesIdentifikasjonsnummer, EndringIVergemaal, PersonErBosatt, PersonErDod, + PersonErEndretVedSplitting, PersonErGjenopprettetVedSplitting, PersonErOppdatert, PersonErOpphoert, + PersonErOpphoertSomDublett, PersonErOpprettet, PersonErReaktivert, PersonErUtflyttet, + PersonErViderefoertSomGjeldendeVedSammenslaaing } private List roller; @@ -88,6 +102,7 @@ public static class Intervall { private Integer tilOgMed; } + @Data @NoArgsConstructor public static class Navn { @@ -116,18 +131,18 @@ public static class Adresser { @NoArgsConstructor public static class Relasjoner { - private Relasjon relasjon; - private Intervall antallBarn; - private Boolean harForeldreAnsvar; - private Intervall relasjonMedFoedselsaar; - private Boolean harDeltBosted; - private Boolean harVergemaalEllerFremtidsfullmakt; + private Relasjon relasjon; + private Intervall antallBarn; + private Boolean harForeldreAnsvar; + private Intervall relasjonMedFoedselsaar; + private Boolean harDeltBosted; + private Boolean harVergemaalEllerFremtidsfullmakt; } @Data @NoArgsConstructor public static class Hendelser { - private Hendelser hendelse; + private Hendelse hendelse; } } From cbd87f7e108c3079f9103bb2dea9ca9ca752accf Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 11 Jan 2024 12:26:31 +0100 Subject: [PATCH 24/69] Lagt til flere sokemuligheter #deploy-tenor-search-service --- .../domain/TenorRequest.java | 15 +++++++++-- .../service/TenorSearchService.java | 26 ++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 63bd6e6fd63..1c80c5b2f33 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -1,5 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.domain; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -47,9 +48,13 @@ public enum Hendelse { PersonErOpphoertSomDublett, PersonErOpprettet, PersonErReaktivert, PersonErUtflyttet, PersonErViderefoertSomGjeldendeVedSammenslaaing } + private enum BostedsadresseType {Vegadresse, Matrikkeladresse, Ukjent} + private enum CoAdresseType {Bostedsadresse, DeltBosted, Oppholdsadresse, Postadresse, PostadresseIUtlandet} private List roller; + @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") + private String identifikator; private IdentifikatorType identifikatorType; private DatoIntervall foedselsdato; private DatoIntervall doedsdato; @@ -84,8 +89,6 @@ public List getRoller() { return roller; } - private String adresseNavn; - @Data @NoArgsConstructor public static class DatoIntervall { @@ -117,6 +120,8 @@ public static class Navn { @NoArgsConstructor public static class Adresser { + @Schema(description = "Adressesøk, fritekst") + private String bostedsadresseFritekst; private AdresseGradering adresseGradering; private Integer kommunenummer; private Boolean harBostedsadresse; @@ -125,6 +130,8 @@ public static class Adresser { private Boolean harPostadresseUtland; private Boolean harKontaktadresseDoedsbo; private Boolean harAdresseSpesialtegn; + private BostedsadresseType bostedsadresseType; + private CoAdresseType coAdresseType; } @Data @@ -137,6 +144,9 @@ public static class Relasjoner { private Intervall relasjonMedFoedselsaar; private Boolean harDeltBosted; private Boolean harVergemaalEllerFremtidsfullmakt; + private Boolean borMedMor; + private Boolean borMedFar; + private Boolean borMedMedmor; } @Data @@ -144,5 +154,6 @@ public static class Relasjoner { public static class Hendelser { private Hendelse hendelse; + private Hendelse sisteHendelse; } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index eb84e6fed49..7ebc9574ad5 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -1,6 +1,7 @@ package no.nav.testnav.apps.tenorsearchservice.service; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; @@ -13,8 +14,10 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; +@Slf4j @Service @RequiredArgsConstructor public class TenorSearchService { @@ -29,6 +32,7 @@ public Mono getTestdata(String testDataQuery) { public Mono getTestdata(TenorRequest searchData) { var builder = new StringBuilder() + .append(convertString("identifikator", searchData.getIdentifikator())) .append(convertDatoer("foedselsdato", searchData.getFoedselsdato())) .append(convertDatoer("doedsdato", searchData.getDoedsdato())) .append(getIdentifikatorType(searchData.getIdentifikatorType())) @@ -51,12 +55,15 @@ public Mono getTestdata(TenorRequest searchData) { } if (nonNull(searchData.getAdresser())) { - builder.append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse())) + builder.append(convertString("bostedsadresse", searchData.getAdresser().getBostedsadresseFritekst())) + .append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse())) .append(convertBooleanWildcard("oppholdAnnetSted", searchData.getAdresser().getHarOppholdAnnetSted())) .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge())) .append(convertBooleanWildcard("postadresseUtland", searchData.getAdresser().getHarPostadresseUtland())) .append(convertBooleanWildcard("kontaktinfoDoedsbo", searchData.getAdresser().getHarKontaktadresseDoedsbo())) - .append(convertBoolean("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())); + .append(convertBoolean("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())) + .append(convertEnum("bostedsadresseType", searchData.getAdresser().getBostedsadresseType())) + .append(convertEnum("coAdressenavnType", searchData.getAdresser().getCoAdresseType())); } if (nonNull(searchData.getRelasjoner())) { @@ -65,14 +72,27 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertBooleanWildcard("foreldreansvar", searchData.getRelasjoner().getHarForeldreAnsvar())) .append(getRelasjonMedFoedselsdato(searchData.getRelasjoner().getRelasjonMedFoedselsaar())) .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted())) - .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())); + .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())) + .append(convertBoolean("borMedFar", searchData.getRelasjoner().getBorMedFar())) + .append(convertBoolean("borMedMor", searchData.getRelasjoner().getBorMedMor())) + .append(convertBoolean("borMedMedMor", searchData.getRelasjoner().getBorMedMedmor())); } + if (nonNull(searchData.getHendelser())) { + builder.append(convertEnum("hendelserMedSekvens.hendelse", searchData.getHendelser().getHendelse())) + .append(convertEnum("sisteHendelse", searchData.getHendelser().getSisteHendelse())); + } builder.append(getRoller(searchData.getRoller())); + log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } + private String convertString(String navn, String verdi) { + + return isBlank(verdi) ? "" : "+and+%s:%s".formatted(navn, verdi); + } + private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { return isNull(relasjonMedFoedselsaar) ? "" : "+and+tenorRelasjoner.freg:{foedselsdato:[%s+to+%s]}" From 65d1bdae03299d81eb42418080998e3267e4be6d Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 11 Jan 2024 13:57:08 +0100 Subject: [PATCH 25/69] URLEncoder igjen #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 87971e663ce..0534aec691d 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -6,7 +6,6 @@ import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; @@ -30,10 +29,9 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", query) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) .queryParam("nokkelinformasjon", true) .build()) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) From c38178474c927eee3bccd2107a8c0e3884b1304a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 11 Jan 2024 14:08:20 +0100 Subject: [PATCH 26/69] =?UTF-8?q?Lagt=20p=C3=A5=20user-agent=20#deploy-ten?= =?UTF-8?q?or-search-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 0534aec691d..e7adefcebbf 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -32,6 +32,7 @@ public Mono call() { .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) .queryParam("nokkelinformasjon", true) .build()) + .header("User-Agent", "test") .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) From 04d0552fb3c619150a9628a4ce1d02b2cf65d228 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 08:40:57 +0100 Subject: [PATCH 27/69] Endret enkoding #deploy-tenor-search-service --- .../tenorsearchservice/consumers/command/GetTenorTestdata.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index e7adefcebbf..bf51f3719d8 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -29,10 +29,9 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) .queryParam("nokkelinformasjon", true) .build()) - .header("User-Agent", "test") .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) From 25f9230f6955bce64f392be677bcb0dea4732493 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 08:50:58 +0100 Subject: [PATCH 28/69] Endret enkoding II #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index bf51f3719d8..cfa10adb025 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; @@ -15,6 +16,7 @@ import java.time.Duration; import java.util.concurrent.Callable; +@Slf4j @RequiredArgsConstructor public class GetTenorTestdata implements Callable> { @@ -27,9 +29,11 @@ public class GetTenorTestdata implements Callable> { @Override public Mono call() { + log.info("Query-parameter: {}", query); + return webClient.get() .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) + .queryParam("kql", query) .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) From 418080535e8005b05938184900cc2219349e7667 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 09:19:28 +0100 Subject: [PATCH 29/69] Endret enkoding III #deploy-tenor-search-service --- .../apps/tenorsearchservice/consumers/TenorClient.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index c3708f8e552..48c2c20e305 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -1,6 +1,5 @@ package no.nav.testnav.apps.tenorsearchservice.consumers; -import com.fasterxml.jackson.databind.JsonNode; import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; @@ -26,6 +25,9 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() - .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); + .flatMap(token -> new GetTenorTestdata(webClient, + query.replace("{", "%7b") + .replace("}", "%7d"), + token.value()).call()); } } From 9087f84ee7670117abaa1ae4cfd2067f6da75267 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 13:10:13 +0100 Subject: [PATCH 30/69] Oppdatert encoding #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index cfa10adb025..6afa47e8e16 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -7,12 +7,11 @@ import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.concurrent.Callable; @@ -37,6 +36,7 @@ public Mono call() { .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .retrieve() .bodyToMono(JsonNode.class) .map(response -> TenorResponse.builder() From fa9dbd6526c3d58517a08a6bdfefc17fa07586fd Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 13:19:35 +0100 Subject: [PATCH 31/69] Oppdatert URI #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 6afa47e8e16..4fb11101b5b 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; @@ -12,6 +13,7 @@ import reactor.core.publisher.Mono; import reactor.util.retry.Retry; +import java.net.URI; import java.time.Duration; import java.util.concurrent.Callable; @@ -19,22 +21,20 @@ @RequiredArgsConstructor public class GetTenorTestdata implements Callable> { - private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; + private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg?kql="; private final WebClient webClient; private final String query; private final String token; @Override + @SneakyThrows public Mono call() { log.info("Query-parameter: {}", query); return webClient.get() - .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", query) - .queryParam("nokkelinformasjon", true) - .build()) + .uri(new URI(TENOR_QUERY_URL+query+"nokkelinformasjon:true")) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .retrieve() From 251f768d5594f117dd5dabf6c924351787a61a27 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 13:29:52 +0100 Subject: [PATCH 32/69] Oppdatert URI II #deploy-tenor-search-service --- .../apps/tenorsearchservice/consumers/TenorClient.java | 5 +---- .../consumers/command/GetTenorTestdata.java | 10 +++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 48c2c20e305..b60775e5c4c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -25,9 +25,6 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() - .flatMap(token -> new GetTenorTestdata(webClient, - query.replace("{", "%7b") - .replace("}", "%7d"), - token.value()).call()); + .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 4fb11101b5b..6afa47e8e16 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; @@ -13,7 +12,6 @@ import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import java.net.URI; import java.time.Duration; import java.util.concurrent.Callable; @@ -21,20 +19,22 @@ @RequiredArgsConstructor public class GetTenorTestdata implements Callable> { - private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg?kql="; + private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; private final WebClient webClient; private final String query; private final String token; @Override - @SneakyThrows public Mono call() { log.info("Query-parameter: {}", query); return webClient.get() - .uri(new URI(TENOR_QUERY_URL+query+"nokkelinformasjon:true")) + .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) + .queryParam("kql", query) + .queryParam("nokkelinformasjon", true) + .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .retrieve() From 442b739b72654359d2b2d3a057cf45e703e1e765 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 12 Jan 2024 13:43:38 +0100 Subject: [PATCH 33/69] =?UTF-8?q?Lagt=20p=C3=A5=20mere=20logging=20II=20#d?= =?UTF-8?q?eploy-tenor-search-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenorsearchservice/consumers/TenorClient.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index b60775e5c4c..bb81158da71 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -1,15 +1,19 @@ package no.nav.testnav.apps.tenorsearchservice.consumers; +import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; +@Slf4j @Service public class TenorClient { + private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; private final WebClient webClient; private final MaskinportenClient maskinportenClient; @@ -24,6 +28,16 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { public Mono getTestdata(String query) { + log.info("URI output: {}", new DefaultUriBuilderFactory().uriString(TENOR_QUERY_URL) + .queryParam("kql", query) + .queryParam("nokkelinformasjon", true) + .build()); + + log.info("URI output 2: {}", new DefaultUriBuilderFactory().uriString(TENOR_QUERY_URL) + .queryParam("kql", query) + .queryParam("nokkelinformasjon", true) + .build(false)); + return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } From 87dc3692dbb83ca2a0a3601edb52d25c48624f90 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Sat, 13 Jan 2024 15:39:24 +0100 Subject: [PATCH 34/69] Oppdatert dekoding #deploy-tenor-search-service --- .../consumers/TenorClient.java | 15 ++++----------- .../consumers/command/GetTenorTestdata.java | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index bb81158da71..3c90833af3a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -13,31 +13,24 @@ @Service public class TenorClient { - private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; private final WebClient webClient; private final MaskinportenClient maskinportenClient; public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { + var uriFactory = new DefaultUriBuilderFactory(); + uriFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); + this.webClient = WebClient .builder() .baseUrl(consumers.getTenorSearchService().getUrl()) + .uriBuilderFactory(uriFactory) .build(); this.maskinportenClient = maskinportenClient; } public Mono getTestdata(String query) { - log.info("URI output: {}", new DefaultUriBuilderFactory().uriString(TENOR_QUERY_URL) - .queryParam("kql", query) - .queryParam("nokkelinformasjon", true) - .build()); - - log.info("URI output 2: {}", new DefaultUriBuilderFactory().uriString(TENOR_QUERY_URL) - .queryParam("kql", query) - .queryParam("nokkelinformasjon", true) - .build(false)); - return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 6afa47e8e16..b4a64d1e520 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -9,9 +9,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.concurrent.Callable; @@ -30,11 +33,16 @@ public Mono call() { log.info("Query-parameter: {}", query); + var uri = new DefaultUriBuilderFactory(TENOR_QUERY_URL); + uri.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); + var ui = uri.builder() + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("nokkelinformasjon", true) + .build(); + log.info("URI output: {}", ui); + return webClient.get() - .uri(uriBuilder -> uriBuilder.path(TENOR_QUERY_URL) - .queryParam("kql", query) - .queryParam("nokkelinformasjon", true) - .build()) + .uri(ui) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .retrieve() From 3428ff4d193e4318e52e0b44c196107bf919eeb1 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Sat, 13 Jan 2024 15:53:04 +0100 Subject: [PATCH 35/69] Oppdatert dekoding II #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index b4a64d1e520..461e7b8093c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -7,9 +7,7 @@ import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; @@ -33,18 +31,13 @@ public Mono call() { log.info("Query-parameter: {}", query); - var uri = new DefaultUriBuilderFactory(TENOR_QUERY_URL); - uri.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); - var ui = uri.builder() - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) - .queryParam("nokkelinformasjon", true) - .build(); - log.info("URI output: {}", ui); - return webClient.get() - .uri(ui) + .uri(uriBuilder -> uriBuilder + .path(TENOR_QUERY_URL) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("nokkelinformasjon", true) + .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) - .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .retrieve() .bodyToMono(JsonNode.class) .map(response -> TenorResponse.builder() From 95c0b188fa8a4f1005af6feb395aff1526104f9e Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Mon, 15 Jan 2024 08:31:54 +0100 Subject: [PATCH 36/69] Oppdatert dekoding III #deploy-tenor-search-service --- .../consumers/TenorClient.java | 27 +++++++++++++++++++ .../consumers/command/GetTenorTestdata.java | 8 +++--- .../src/main/resources/application.yml | 4 +++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 3c90833af3a..3fb1ae22593 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -5,6 +5,7 @@ import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; @@ -24,13 +25,39 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.webClient = WebClient .builder() .baseUrl(consumers.getTenorSearchService().getUrl()) + .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest())) .uriBuilderFactory(uriFactory) .build(); this.maskinportenClient = maskinportenClient; } + private ExchangeFilterFunction logRequest() { + + return (clientRequest, next) -> { + var buffer = new StringBuilder(250) + .append("Request: ") + .append(clientRequest.method()) + .append(' ') + .append(clientRequest.url()) + .append(System.lineSeparator()); + + clientRequest.headers() + .forEach((name, values) -> values + .forEach(value -> buffer.append('\t') + .append(name) + .append('=') + .append(value.contains("Bearer ") ? "Bearer token" : value) + .append(System.lineSeparator()))); + log.trace(buffer.substring(0, buffer.length() - 1)); + return next.exchange(clientRequest); + }; + } + public Mono getTestdata(String query) { +// var token = ""; +// return new GetTenorTestdata(webClient, query, token).call(); + return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 461e7b8093c..ca12b4d2b8a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -9,11 +9,9 @@ import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; -import reactor.util.retry.Retry; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.time.Duration; import java.util.concurrent.Callable; @Slf4j @@ -34,7 +32,7 @@ public Mono call() { return webClient.get() .uri(uriBuilder -> uriBuilder .path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.UTF_8)) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) .queryParam("nokkelinformasjon", true) .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) @@ -45,8 +43,8 @@ public Mono call() { .data(response) .build()) .doOnError(WebClientFilter::logErrorMessage) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)) +// .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) +// .filter(WebClientFilter::is5xxException)) .onErrorResume(error -> Mono.just(TenorResponse.builder() .status(WebClientFilter.getStatus(error)) .error(WebClientFilter.getMessage(error)) diff --git a/apps/tenor-search-service/src/main/resources/application.yml b/apps/tenor-search-service/src/main/resources/application.yml index 55fe126c531..ae8b30ef805 100644 --- a/apps/tenor-search-service/src/main/resources/application.yml +++ b/apps/tenor-search-service/src/main/resources/application.yml @@ -46,6 +46,10 @@ server: servlet: encoding: charset: UTF-8 + enabled: true + force: true + force-request: true + force-response: true consumers: tenor-search-service: From a35d815368a7ec6b63e71bc8429404ee5f977089 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Mon, 15 Jan 2024 09:01:05 +0100 Subject: [PATCH 37/69] Oppdatert dekoding IV #deploy-tenor-search-service --- .../apps/tenorsearchservice/consumers/TenorClient.java | 8 ++------ .../consumers/command/GetTenorTestdata.java | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 3fb1ae22593..dcbdfe254d9 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -19,12 +19,11 @@ public class TenorClient { public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { - var uriFactory = new DefaultUriBuilderFactory(); + var uriFactory = new DefaultUriBuilderFactory(consumers.getTenorSearchService().getUrl()); uriFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); this.webClient = WebClient .builder() - .baseUrl(consumers.getTenorSearchService().getUrl()) .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest())) .uriBuilderFactory(uriFactory) .build(); @@ -55,10 +54,7 @@ private ExchangeFilterFunction logRequest() { public Mono getTestdata(String query) { -// var token = ""; -// return new GetTenorTestdata(webClient, query, token).call(); - return maskinportenClient.getAccessToken() .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); } -} +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index ca12b4d2b8a..71d7725bf26 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -9,9 +9,11 @@ import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; +import reactor.util.retry.Retry; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.concurrent.Callable; @Slf4j @@ -43,8 +45,8 @@ public Mono call() { .data(response) .build()) .doOnError(WebClientFilter::logErrorMessage) -// .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) -// .filter(WebClientFilter::is5xxException)) + .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) + .filter(WebClientFilter::is5xxException)) .onErrorResume(error -> Mono.just(TenorResponse.builder() .status(WebClientFilter.getStatus(error)) .error(WebClientFilter.getMessage(error)) From dee20688ede6f6d89885afd0ba7720747fc36482 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 16 Jan 2024 09:10:03 +0100 Subject: [PATCH 38/69] Oppdatert dekoding V #deploy-tenor-search-service --- .../consumers/TenorClient.java | 30 +------------------ .../consumers/command/GetTenorTestdata.java | 19 +++++++----- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index dcbdfe254d9..cf054537f93 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -5,9 +5,7 @@ import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; -import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; @Slf4j @@ -19,39 +17,13 @@ public class TenorClient { public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { - var uriFactory = new DefaultUriBuilderFactory(consumers.getTenorSearchService().getUrl()); - uriFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); - this.webClient = WebClient .builder() - .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest())) - .uriBuilderFactory(uriFactory) + .baseUrl(consumers.getTenorSearchService().getUrl()) .build(); this.maskinportenClient = maskinportenClient; } - private ExchangeFilterFunction logRequest() { - - return (clientRequest, next) -> { - var buffer = new StringBuilder(250) - .append("Request: ") - .append(clientRequest.method()) - .append(' ') - .append(clientRequest.url()) - .append(System.lineSeparator()); - - clientRequest.headers() - .forEach((name, values) -> values - .forEach(value -> buffer.append('\t') - .append(name) - .append('=') - .append(value.contains("Bearer ") ? "Bearer token" : value) - .append(System.lineSeparator()))); - log.trace(buffer.substring(0, buffer.length() - 1)); - return next.exchange(clientRequest); - }; - } - public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 71d7725bf26..4c7f135b845 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -8,12 +8,12 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.Duration; +import java.util.Map; import java.util.concurrent.Callable; @Slf4j @@ -29,14 +29,17 @@ public class GetTenorTestdata implements Callable> { @Override public Mono call() { - log.info("Query-parameter: {}", query); + var requestParams = Map.of("tenorQuery", query); + var uri = new DefaultUriBuilderFactory(TENOR_QUERY_URL) + .builder() + .queryParam("kql", "{tenorQuery}") + .queryParam("nokkelinformasjon", true) + .build(requestParams); + + log.info("Query-parameter: {}", uri); return webClient.get() - .uri(uriBuilder -> uriBuilder - .path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) - .queryParam("nokkelinformasjon", true) - .build()) + .uri(uri) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) From 26feb91b2466d92dd1d56bff54f6b5bec202268b Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 16 Jan 2024 10:09:40 +0100 Subject: [PATCH 39/69] Revert "Oppdatert dekoding V #deploy-tenor-search-service" This reverts commit dee20688ede6f6d89885afd0ba7720747fc36482. --- .../consumers/TenorClient.java | 30 ++++++++++++++++++- .../consumers/command/GetTenorTestdata.java | 19 +++++------- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index cf054537f93..dcbdfe254d9 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -5,7 +5,9 @@ import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; @Slf4j @@ -17,13 +19,39 @@ public class TenorClient { public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { + var uriFactory = new DefaultUriBuilderFactory(consumers.getTenorSearchService().getUrl()); + uriFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); + this.webClient = WebClient .builder() - .baseUrl(consumers.getTenorSearchService().getUrl()) + .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest())) + .uriBuilderFactory(uriFactory) .build(); this.maskinportenClient = maskinportenClient; } + private ExchangeFilterFunction logRequest() { + + return (clientRequest, next) -> { + var buffer = new StringBuilder(250) + .append("Request: ") + .append(clientRequest.method()) + .append(' ') + .append(clientRequest.url()) + .append(System.lineSeparator()); + + clientRequest.headers() + .forEach((name, values) -> values + .forEach(value -> buffer.append('\t') + .append(name) + .append('=') + .append(value.contains("Bearer ") ? "Bearer token" : value) + .append(System.lineSeparator()))); + log.trace(buffer.substring(0, buffer.length() - 1)); + return next.exchange(clientRequest); + }; + } + public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 4c7f135b845..71d7725bf26 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -8,12 +8,12 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; import reactor.util.retry.Retry; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.Map; import java.util.concurrent.Callable; @Slf4j @@ -29,17 +29,14 @@ public class GetTenorTestdata implements Callable> { @Override public Mono call() { - var requestParams = Map.of("tenorQuery", query); - var uri = new DefaultUriBuilderFactory(TENOR_QUERY_URL) - .builder() - .queryParam("kql", "{tenorQuery}") - .queryParam("nokkelinformasjon", true) - .build(requestParams); - - log.info("Query-parameter: {}", uri); + log.info("Query-parameter: {}", query); return webClient.get() - .uri(uri) + .uri(uriBuilder -> uriBuilder + .path(TENOR_QUERY_URL) + .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) + .queryParam("nokkelinformasjon", true) + .build()) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) From 80e69f304942beed10823d3348b246f732e1556c Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 16 Jan 2024 13:10:35 +0100 Subject: [PATCH 40/69] =?UTF-8?q?Oppdatert=20dekoding=20og=20lagt=20til=20?= =?UTF-8?q?flere=20s=C3=B8kemuligheter=20#deploy-tenor-search-service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumers/TenorClient.java | 30 +---- .../consumers/command/GetTenorTestdata.java | 8 +- .../domain/TenorRequest.java | 84 +++++++++++++- .../service/TenorSearchService.java | 108 +++++++++++++----- 4 files changed, 164 insertions(+), 66 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index dcbdfe254d9..cf054537f93 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -5,9 +5,7 @@ import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; -import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.util.DefaultUriBuilderFactory; import reactor.core.publisher.Mono; @Slf4j @@ -19,39 +17,13 @@ public class TenorClient { public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { - var uriFactory = new DefaultUriBuilderFactory(consumers.getTenorSearchService().getUrl()); - uriFactory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE); - this.webClient = WebClient .builder() - .filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(logRequest())) - .uriBuilderFactory(uriFactory) + .baseUrl(consumers.getTenorSearchService().getUrl()) .build(); this.maskinportenClient = maskinportenClient; } - private ExchangeFilterFunction logRequest() { - - return (clientRequest, next) -> { - var buffer = new StringBuilder(250) - .append("Request: ") - .append(clientRequest.method()) - .append(' ') - .append(clientRequest.url()) - .append(System.lineSeparator()); - - clientRequest.headers() - .forEach((name, values) -> values - .forEach(value -> buffer.append('\t') - .append(name) - .append('=') - .append(value.contains("Bearer ") ? "Bearer token" : value) - .append(System.lineSeparator()))); - log.trace(buffer.substring(0, buffer.length() - 1)); - return next.exchange(clientRequest); - }; - } - public Mono getTestdata(String query) { return maskinportenClient.getAccessToken() diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 71d7725bf26..2cf4b35fcec 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -11,9 +11,8 @@ import reactor.core.publisher.Mono; import reactor.util.retry.Retry; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.Duration; +import java.util.Map; import java.util.concurrent.Callable; @Slf4j @@ -30,13 +29,14 @@ public class GetTenorTestdata implements Callable> { public Mono call() { log.info("Query-parameter: {}", query); + var requestParams = Map.of("tenorQuery", query); return webClient.get() .uri(uriBuilder -> uriBuilder .path(TENOR_QUERY_URL) - .queryParam("kql", URLEncoder.encode(query, StandardCharsets.US_ASCII)) + .queryParam("kql", "{tenorQuery}") .queryParam("nokkelinformasjon", true) - .build()) + .build(requestParams)) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToMono(JsonNode.class) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 1c80c5b2f33..6ddfba4e593 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -5,6 +5,7 @@ import lombok.NoArgsConstructor; import java.time.LocalDate; +import java.time.YearMonth; import java.util.ArrayList; import java.util.List; @@ -48,10 +49,26 @@ public enum Hendelse { PersonErOpphoertSomDublett, PersonErOpprettet, PersonErReaktivert, PersonErUtflyttet, PersonErViderefoertSomGjeldendeVedSammenslaaing } - private enum BostedsadresseType {Vegadresse, Matrikkeladresse, Ukjent} - private enum CoAdresseType {Bostedsadresse, DeltBosted, Oppholdsadresse, Postadresse, PostadresseIUtlandet} - private List roller; + public enum BostedsadresseType {Vegadresse, Matrikkeladresse, Ukjent} + + public enum CoAdresseType {Bostedsadresse, DeltBosted, Oppholdsadresse, Postadresse, PostadresseIUtlandet} + + public enum Skattemeldingstype {KunUtkast, UtkastOgFastsatt} + + public enum Inntektstype {Loennsinntekt, Naeringsinntekt, PensjonEllerTrygd, YtelseFraOffentlige} + + public enum AOrdningBeskrivelse { + Alderspensjon, AlderspensjonSkjermingstillegg, AndreBeskrivelser, + Arbeidsavklaringspenger, AvtalefestetPensjon, Bil, Bonus, DagpengerVedArbeidsloeshet, Ektefelletillegg, + ElektroniskKommunikasjon, Fagforeningskontingent, FastBilgodtgjoerelse, Fastloenn, FastTillegg, Feriepenger, + Foreldrepenger, IpaEllerIpsPeriodiskeYtelser, Kvalifiseringsstoenad, NyAvtalefestetPensjonPrivatSektor, + PensjonOgLivrenterIArbeidsforhold, ReiseKostMedOvernattingPaaHybelMedKokEllerPrivat, + ReiseKostMedOvernattingPaaHybelUtenKokEllerPensjonatEllerBrakke, Sykepenger, Timeloenn, Ufoeretrygd + } + + public enum Forskuddstrekk {OrdinaertForskuddstrekk, Barnepensjon, KildeskattPaaPensjon, Svalbard, + JanMayenOgBilandene, BetaltTrygdeavgiftTilJanMayen} @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; @@ -73,6 +90,11 @@ private enum CoAdresseType {Bostedsadresse, DeltBosted, Oppholdsadresse, Postadr private Relasjoner relasjoner; private Hendelser hendelser; + private List roller; + private Tjenestepensjonsavtale tjenestepensjonsavtale; + private Skattemelding skattemelding; + private InntektAordningen inntektAordningen; + public List getUtenlandskPersonIdentifikasjon() { if (isNull(utenlandskPersonIdentifikasjon)) { @@ -102,7 +124,6 @@ public static class DatoIntervall { public static class Intervall { private Integer fraOgMed; - private Integer tilOgMed; } @@ -156,4 +177,59 @@ public static class Hendelser { private Hendelse hendelse; private Hendelse sisteHendelse; } + + @Data + @NoArgsConstructor + public static class Tjenestepensjonsavtale { + + @Schema(description = "Pensjonsinnretningen organisasjonsnummer, 9 siffre") + private String pensjonsinnretningOrgnr; + @Schema(description = "Periode, format: YYYY-MM") + private YearMonth periode; + } + + @Data + @NoArgsConstructor + public static class Skattemelding { + + @Schema(description = "Inntektsår, 4 siffre, årene 2018, 2019, 2020, 2021, 2022 ... osv opptil i forfjor") + private Integer Inntektsaar; + private Skattemeldingstype skattemeldingstype; + } + + @Data + @NoArgsConstructor + public static class InntektAordningen { + + private MonthInterval periode; + private String opplysningspliktig; + private List inntektstyper; + private AOrdningBeskrivelse beskrivelse; + private List forskuddstrekk; + private Boolean harHistorikk; + + public List getInntektstyper() { + + if (isNull(inntektstyper)) { + inntektstyper = new ArrayList<>(); + } + return inntektstyper; + } + + public List getForskuddstrekk() { + + if (isNull(forskuddstrekk)) { + forskuddstrekk = new ArrayList<>(); + } + return forskuddstrekk; + } + } + + @Data + @NoArgsConstructor + public static class MonthInterval { + + private YearMonth fraOgMed; + private YearMonth tilOgMed; + } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 7ebc9574ad5..a1fc4c383be 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -32,7 +32,7 @@ public Mono getTestdata(String testDataQuery) { public Mono getTestdata(TenorRequest searchData) { var builder = new StringBuilder() - .append(convertString("identifikator", searchData.getIdentifikator())) + .append(convertObject("identifikator", searchData.getIdentifikator())) .append(convertDatoer("foedselsdato", searchData.getFoedselsdato())) .append(convertDatoer("doedsdato", searchData.getDoedsdato())) .append(getIdentifikatorType(searchData.getIdentifikatorType())) @@ -42,26 +42,26 @@ public Mono getTestdata(TenorRequest searchData) { .append(getUtenlandskPersonidentifikasjon(searchData.getUtenlandskPersonIdentifikasjon())) .append(convertEnum("identitetsgrunnlagStatus", searchData.getIdentitetsgrunnlagStatus())) .append(convertEnum("adressebeskyttelse", searchData.getAdressebeskyttelse())) - .append(convertBoolean("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument())) - .append(convertBoolean("falskIdentitet", searchData.getHarFalskIdentitet())) - .append(convertBoolean("norskStatsborgerskap", searchData.getHarNorskStatsborgerskap())) - .append(convertBoolean("flereStatsborgerskap", searchData.getHarFlereStatsborgerskap())); + .append(convertObject("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument())) + .append(convertObject("falskIdentitet", searchData.getHarFalskIdentitet())) + .append(convertObject("norskStatsborgerskap", searchData.getHarNorskStatsborgerskap())) + .append(convertObject("flereStatsborgerskap", searchData.getHarFlereStatsborgerskap())); if (nonNull(searchData.getNavn())) { - builder.append(convertBoolean("flereFornavn", searchData.getNavn().getHarFlereFornavn())) + builder.append(convertObject("flereFornavn", searchData.getNavn().getHarFlereFornavn())) .append(getIntervall("navnLengde", searchData.getNavn().getNavnLengde())) .append(convertBooleanWildcard("mellomnavn", searchData.getNavn().getHarMellomnavn())) - .append(convertBoolean("navnSpesialtegn", searchData.getNavn().getHarNavnSpesialtegn())); + .append(convertObject("navnSpesialtegn", searchData.getNavn().getHarNavnSpesialtegn())); } if (nonNull(searchData.getAdresser())) { - builder.append(convertString("bostedsadresse", searchData.getAdresser().getBostedsadresseFritekst())) + builder.append(convertObject("bostedsadresse", searchData.getAdresser().getBostedsadresseFritekst())) .append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse())) .append(convertBooleanWildcard("oppholdAnnetSted", searchData.getAdresser().getHarOppholdAnnetSted())) .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge())) .append(convertBooleanWildcard("postadresseUtland", searchData.getAdresser().getHarPostadresseUtland())) .append(convertBooleanWildcard("kontaktinfoDoedsbo", searchData.getAdresser().getHarKontaktadresseDoedsbo())) - .append(convertBoolean("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())) + .append(convertObject("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())) .append(convertEnum("bostedsadresseType", searchData.getAdresser().getBostedsadresseType())) .append(convertEnum("coAdressenavnType", searchData.getAdresser().getCoAdresseType())); } @@ -73,9 +73,9 @@ public Mono getTestdata(TenorRequest searchData) { .append(getRelasjonMedFoedselsdato(searchData.getRelasjoner().getRelasjonMedFoedselsaar())) .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted())) .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())) - .append(convertBoolean("borMedFar", searchData.getRelasjoner().getBorMedFar())) - .append(convertBoolean("borMedMor", searchData.getRelasjoner().getBorMedMor())) - .append(convertBoolean("borMedMedMor", searchData.getRelasjoner().getBorMedMedmor())); + .append(convertObject("borMedFar", searchData.getRelasjoner().getBorMedFar())) + .append(convertObject("borMedMor", searchData.getRelasjoner().getBorMedMor())) + .append(convertObject("borMedMedMor", searchData.getRelasjoner().getBorMedMedmor())); } if (nonNull(searchData.getHendelser())) { @@ -83,14 +83,64 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertEnum("sisteHendelse", searchData.getHendelser().getSisteHendelse())); } builder.append(getRoller(searchData.getRoller())); + builder.append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale())); + builder.append(getSkattemelding(searchData.getSkattemelding())); + builder.append(getInntektAordningen(searchData.getInntektAordningen())); log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } - private String convertString(String navn, String verdi) { + private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { + + return (isNull(inntektAordningen)) ? "" : + "+and+tenorRelasjoner.inntekt:{" + new StringBuilder() + .append(getPeriode(inntektAordningen.getPeriode())) + .append(convertObject("opplysningspliktig", inntektAordningen.getOpplysningspliktig())) + .append(getInntektstyper(inntektAordningen.getInntektstyper())) + .append(convertEnum("beskrivelse", inntektAordningen.getBeskrivelse())) + .append(getForskuddstrekk(inntektAordningen.getForskuddstrekk())) + .append(convertObject("harHistorikk", inntektAordningen.getHarHistorikk())) + .substring(5) + "}"; + } + + private String getForskuddstrekk(List forskuddstrekk1) { + + return forskuddstrekk1.isEmpty() ? "" : "+and+forskuddstrekk:(%s)" + .formatted(forskuddstrekk1.stream() + .map(Enum::name) + .collect(Collectors.joining("+and+"))); + } + + private String getInntektstyper(List inntektstyper) { + + return inntektstyper.isEmpty() ? "" : "+and+inntektstype:(%s)" + .formatted(inntektstyper.stream() + .map(Enum::name) + .collect(Collectors.joining("+and+"))); + } + + private String getSkattemelding(TenorRequest.Skattemelding skattemelding) { + + return isNull(skattemelding) ? "" : + "+and+tenorRelasjoner.skattemelding:{" + new StringBuilder() + .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) + .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) + .substring(5) + "}"; + } + + private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tjenestepensjonsavtale) { - return isBlank(verdi) ? "" : "+and+%s:%s".formatted(navn, verdi); + return isNull(tjenestepensjonsavtale) ? "" : + "+and+tenorRelasjoner.tjenestepensjonavtale:{" + new StringBuilder() + .append(convertObject("pensjonsinnretningOrgnr", tjenestepensjonsavtale.getPensjonsinnretningOrgnr())) + .append(convertObject("periode", tjenestepensjonsavtale.getPeriode())) + .substring(5) + "}"; + } + + private String convertObject(String navn, Object verdi) { + + return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : "+and+%s:%s".formatted(navn, verdi); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { @@ -106,11 +156,6 @@ private String getRelasjon(TenorRequest.Relasjon relasjon) { return isNull(relasjon) ? "" : "+and+tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); } - private String convertBoolean(String booleanNavn, Boolean booleanVerdi) { - - return isNull(booleanVerdi) ? "" : "+and+%s:%s".formatted(booleanNavn, booleanVerdi); - } - private String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { return isNotTrue(booleanVerdi) ? "" : "+and+%s:*".formatted(booleanNavn); @@ -124,9 +169,17 @@ private String getIntervall(String intervallNavn, TenorRequest.Intervall interva isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); } + private String getPeriode(TenorRequest.MonthInterval intervall) { + + return isNull(intervall) ? "" : "+and+periode:[%s+to+%s]" + .formatted( + isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), + isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + } + private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { - return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : "+data+utenlandskPersonidentifikasjon:(%s)" + return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : "+and+utenlandskPersonidentifikasjon:(%s)" .formatted(utenlandskPersonIdentifikasjon.stream() .map(Enum::name) .collect(Collectors.joining("+and+"))); @@ -152,14 +205,11 @@ private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoInt private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { - if (isNull(identifikatorType)) { - return ""; - } - - return "+and+identifikatorType:" + switch (identifikatorType) { - case FNR -> "foedselsnummer"; - case DNR -> "dNummer"; - case FNR_TIDLIGERE_DNR -> "foedselsnummerOgTidligereDNummer"; - }; + return isNull(identifikatorType) ? "" : + "+and+identifikatorType:" + switch (identifikatorType) { + case FNR -> "foedselsnummer"; + case DNR -> "dNummer"; + case FNR_TIDLIGERE_DNR -> "foedselsnummerOgTidligereDNummer"; + }; } } From bf64193cd631d8deba81152316875af8125bd883 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 17 Jan 2024 08:11:31 +0100 Subject: [PATCH 41/69] =?UTF-8?q?Lagt=20til=20flere=20s=C3=B8k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/TenorRequest.java | 97 ++++++++++++++++++- .../service/TenorSearchService.java | 48 ++++++++- 2 files changed, 137 insertions(+), 8 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 6ddfba4e593..0e148520961 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -67,8 +67,24 @@ public enum AOrdningBeskrivelse { ReiseKostMedOvernattingPaaHybelUtenKokEllerPensjonatEllerBrakke, Sykepenger, Timeloenn, Ufoeretrygd } - public enum Forskuddstrekk {OrdinaertForskuddstrekk, Barnepensjon, KildeskattPaaPensjon, Svalbard, - JanMayenOgBilandene, BetaltTrygdeavgiftTilJanMayen} + public enum Forskuddstrekk { + OrdinaertForskuddstrekk, Barnepensjon, KildeskattPaaPensjon, Svalbard, + JanMayenOgBilandene, BetaltTrygdeavgiftTilJanMayen + } + + public enum Skattepliktstype {SkattepliktTilNorge, SkattepliktTilSvalbard} + + public enum SaerskiltSkatteplikt { + KildeskattepliktPaaLoenn, KildeskattepliktPaaPensjon, + SkattepliktAvNaeringsdriftEiendomMv, SkattepliktEtterPetroleumsskatteloven, + SkattepliktPaaLoennFraDenNorskeStatOpptjentIUtlandet, SkattepliktSomSjoemann, + SkattepliktSomUtenrikstjenestemann, SkattepliktVedUtenriksoppholdINorskStatstjenesteEllerNato + } + + public enum TilleggsskattType { + FradragForTvangsmulkt, SkjerpetTilleggsskattFraUriktigeOpplysninger, TilleggsskattFraUriktigeOpplysninger, + TilleggsskattFraManglendeInnlevering, SkjerpetTilleggsskattFraManglendeInnlevering + } @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; @@ -94,6 +110,14 @@ public enum Forskuddstrekk {OrdinaertForskuddstrekk, Barnepensjon, KildeskattPaa private Tjenestepensjonsavtale tjenestepensjonsavtale; private Skattemelding skattemelding; private InntektAordningen inntektAordningen; + private Skatteplikt skatteplikt; + private Tilleggsskatt tilleggsskatt; + private Arbeidsforhold arbeidsforhold; + private BeregnetSkatt beregnetSkatt; + private SummertSkattegrunnlag summertSkattegrunnlag; + private OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe; + private SamletReskontroInnsyn samletReskontroInnsyn; + private SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag; public List getUtenlandskPersonIdentifikasjon() { @@ -184,7 +208,7 @@ public static class Tjenestepensjonsavtale { @Schema(description = "Pensjonsinnretningen organisasjonsnummer, 9 siffre") private String pensjonsinnretningOrgnr; - @Schema(description = "Periode, format: YYYY-MM") + @Schema(type = "string", format = "YYYY-MM", example = "2020-07") private YearMonth periode; } @@ -193,7 +217,7 @@ public static class Tjenestepensjonsavtale { public static class Skattemelding { @Schema(description = "Inntektsår, 4 siffre, årene 2018, 2019, 2020, 2021, 2022 ... osv opptil i forfjor") - private Integer Inntektsaar; + private Integer inntektsaar; private Skattemeldingstype skattemeldingstype; } @@ -229,7 +253,72 @@ public List getForskuddstrekk() { @NoArgsConstructor public static class MonthInterval { + @Schema(type = "string", format = "YYYY-MM", example = "2020-07") private YearMonth fraOgMed; + @Schema(type = "string", format = "YYYY-MM", example = "2020-07") private YearMonth tilOgMed; } + + @Data + @NoArgsConstructor + public static class Skatteplikt { + + private Integer inntektsaar; + private List Skattepliktstyper; + private SaerskiltSkatteplikt saerskiltSkatteplikt; + + public List getSkattepliktstyper() { + + if (isNull(Skattepliktstyper)) { + Skattepliktstyper = new ArrayList<>(); + } + return Skattepliktstyper; + } + } + + @Data + @NoArgsConstructor + public static class Tilleggsskatt { + + private Integer inntektsaar; + private List tilleggsskattTyper; + + public List getTilleggsskattTyper() { + + if (isNull(tilleggsskattTyper)) { + tilleggsskattTyper = new ArrayList<>(); + } + return tilleggsskattTyper; + } + } + + @Data + @NoArgsConstructor + public static class Arbeidsforhold { + } + + @Data + @NoArgsConstructor + public static class BeregnetSkatt { + } + + @Data + @NoArgsConstructor + public static class SummertSkattegrunnlag { + } + + @Data + @NoArgsConstructor + public static class OpplysningerFraSkatteetatensInnsendingsmiljoe { + } + + @Data + @NoArgsConstructor + public static class SamletReskontroInnsyn { + } + + @Data + @NoArgsConstructor + public static class SpesisfisertSummertSkattegrunnlag { + } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index a1fc4c383be..ca0e4c2133f 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -82,15 +82,55 @@ public Mono getTestdata(TenorRequest searchData) { builder.append(convertEnum("hendelserMedSekvens.hendelse", searchData.getHendelser().getHendelse())) .append(convertEnum("sisteHendelse", searchData.getHendelser().getSisteHendelse())); } - builder.append(getRoller(searchData.getRoller())); - builder.append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale())); - builder.append(getSkattemelding(searchData.getSkattemelding())); - builder.append(getInntektAordningen(searchData.getInntektAordningen())); + builder.append(getRoller(searchData.getRoller())) + .append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale())) + .append(getSkattemelding(searchData.getSkattemelding())) + .append(getInntektAordningen(searchData.getInntektAordningen())) + .append(getSkatteplikt(searchData.getSkatteplikt())) + .append(getTilleggsskatt(searchData.getTilleggsskatt()); log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } + private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { + + return isNull(tilleggsskatt) ? "" : + "+and+tenorRelasjoner.tilleggsskatt:{%s}".formatted( + new StringBuilder() + .append(convertObject("inntektsaar", tilleggsskatt.getInntektsaar())) + .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper())) + .substring(5)); + } + + private String getTilleggsskattTyper(List tilleggsskattTyper) { + + return tilleggsskattTyper.isEmpty() ? "" : "+and+tilleggsskattstype:(%s)" + .formatted(tilleggsskattTyper.stream() + .map(Enum::name) + .collect(Collectors.joining("+and+"))); + } + + private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { + + return isNull(skatteplikt) ? "" : + "+and+tenorRelasjoner.skatteplikt:{%s}".formatted( + new StringBuilder() + .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) + .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) + .append(convertEnum("saerskiltSkatteplikt", skatteplikt.getSaerskiltSkatteplikt())) + .substring(5)); + } + + private String getSkattepliktstyper(List skattepliktstyper) { + + return skattepliktstyper.isEmpty() ? "" : "+and+" + .formatted(skattepliktstyper.stream() + .map(Enum::name) + .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) + .collect(Collectors.joining("+and+"))); + } + private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { return (isNull(inntektAordningen)) ? "" : From 965cd5226824435427a6fb2273e33e6469ef3962 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 17 Jan 2024 13:29:30 +0100 Subject: [PATCH 42/69] Oppdatert request + dekoding #deploy-tenor-search-service --- .../domain/TenorRequest.java | 28 +++++++++- .../service/TenorSearchService.java | 53 +++++++++++++++---- 2 files changed, 70 insertions(+), 11 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 0e148520961..b7e0fcd4244 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -86,6 +86,12 @@ public enum TilleggsskattType { TilleggsskattFraManglendeInnlevering, SkjerpetTilleggsskattFraManglendeInnlevering } + public enum Arbeidsforholdstype { + OrdinaertArbeidsforhold, MaritimtArbeidsforhold, FrilanserOppdragstakerHonorarPersonerMm + } + + public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} + @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; private IdentifikatorType identifikatorType; @@ -139,8 +145,10 @@ public List getRoller() { @NoArgsConstructor public static class DatoIntervall { - private LocalDate fra; - private LocalDate til; + @Schema(type = "string", format = "YYYY-MM-DD", example = "2018-07-01") + private LocalDate fraOgMed; + @Schema(type = "string", format = "YYYY-MM-DD", example = "2020-07-01") + private LocalDate tilOgMed; } @Data @@ -263,6 +271,7 @@ public static class MonthInterval { @NoArgsConstructor public static class Skatteplikt { + @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor") private Integer inntektsaar; private List Skattepliktstyper; private SaerskiltSkatteplikt saerskiltSkatteplikt; @@ -295,11 +304,26 @@ public List getTilleggsskattTyper() { @Data @NoArgsConstructor public static class Arbeidsforhold { + + private DatoIntervall startDatoPeriode; + private DatoIntervall sluttDatoPeriode; + private Boolean harPermisjoner; + private Boolean harPermitteringer; + private Boolean harArbeidsgiver; + private Boolean harTimerMedTimeloenn; + private Boolean harUtenlandsopphold; + private Boolean harHistorikk; + private Arbeidsforholdstype arbeidsforholdstype; } @Data @NoArgsConstructor public static class BeregnetSkatt { + + @Schema(description = "Inntektsår, 4 siffre, årene 2018, 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor") + private Integer inntektsaar; + private Oppgjoerstype oppgjoerstype; + private Boolean pensjonsgivendeInntekt; } @Data diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index ca0e4c2133f..e4699fe4134 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -87,12 +87,40 @@ public Mono getTestdata(TenorRequest searchData) { .append(getSkattemelding(searchData.getSkattemelding())) .append(getInntektAordningen(searchData.getInntektAordningen())) .append(getSkatteplikt(searchData.getSkatteplikt())) - .append(getTilleggsskatt(searchData.getTilleggsskatt()); + .append(getTilleggsskatt(searchData.getTilleggsskatt())) + .append(getArbeidsforhold(searchData.getArbeidsforhold())) + .append(getBeregnetSkatt(searchData.getBeregnetSkatt())); log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } + private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { + + return isNull(beregnetSkatt) ? "" : + "+and+tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) + .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) + .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) + .substring(5)); + } + + private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { + + return isNull(arbeidsforhold) ? "" : + "+and+tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder() + .append(convertDatoer("startDato", arbeidsforhold.getStartDatoPeriode())) + .append(convertDatoer("sluttDato", arbeidsforhold.getSluttDatoPeriode())) + .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner())) + .append(convertObject("harPermitteringer", arbeidsforhold.getHarPermitteringer())) + .append(convertObject("harArbeidsgiver", arbeidsforhold.getHarArbeidsgiver())) + .append(convertObject("harTimerMedLoenn", arbeidsforhold.getHarTimerMedTimeloenn())) + .append(convertObject("harUtenlandsopphold", arbeidsforhold.getHarUtenlandsopphold())) + .append(convertObject("harHistorikk", arbeidsforhold.getHarHistorikk())) + .append(convertEnum("arbeidsforholdtype", arbeidsforhold.getArbeidsforholdstype())) + .substring(5)); + } + private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { return isNull(tilleggsskatt) ? "" : @@ -105,10 +133,11 @@ private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { private String getTilleggsskattTyper(List tilleggsskattTyper) { - return tilleggsskattTyper.isEmpty() ? "" : "+and+tilleggsskattstype:(%s)" - .formatted(tilleggsskattTyper.stream() + return tilleggsskattTyper.isEmpty() ? "" : "+and+" + + tilleggsskattTyper.stream() .map(Enum::name) - .collect(Collectors.joining("+and+"))); + .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) + .collect(Collectors.joining("+and+")); } private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { @@ -118,17 +147,23 @@ private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { new StringBuilder() .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) - .append(convertEnum("saerskiltSkatteplikt", skatteplikt.getSaerskiltSkatteplikt())) + .append(convertEnumWildcard(skatteplikt.getSaerskiltSkatteplikt())) .substring(5)); } private String getSkattepliktstyper(List skattepliktstyper) { - return skattepliktstyper.isEmpty() ? "" : "+and+" - .formatted(skattepliktstyper.stream() + return skattepliktstyper.isEmpty() ? "" : "+and+" + + skattepliktstyper.stream() .map(Enum::name) .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) - .collect(Collectors.joining("+and+"))); + .collect(Collectors.joining("+and+")); + } + + private String convertEnumWildcard(Enum type) { + + return isNull(type) ? "" : "+and+%s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), + type.name().substring(1)); } private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { @@ -240,7 +275,7 @@ private String convertEnum(String enumNavn, Enum enumVerdi) { private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { return isNull(datoIntervall) ? "" : - "+and+%s:[%s+to+%s]".formatted(datoNavn, datoIntervall.getFra(), datoIntervall.getTil()); + "+and+%s:[%s+to+%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); } private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { From 7a78c701687cb7f0c6bf6a0dd6dc748d0cf115ec Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 17 Jan 2024 15:54:21 +0100 Subject: [PATCH 43/69] Oppdatert request + dekoding II #deploy-tenor-search-service --- .../domain/TenorRequest.java | 14 +++++++-- .../service/TenorSearchService.java | 29 +++++++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index b7e0fcd4244..3a59991be4f 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -120,8 +120,8 @@ public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} private Tilleggsskatt tilleggsskatt; private Arbeidsforhold arbeidsforhold; private BeregnetSkatt beregnetSkatt; - private SummertSkattegrunnlag summertSkattegrunnlag; private OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe; + private SummertSkattegrunnlag summertSkattegrunnlag; private SamletReskontroInnsyn samletReskontroInnsyn; private SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag; @@ -328,12 +328,20 @@ public static class BeregnetSkatt { @Data @NoArgsConstructor - public static class SummertSkattegrunnlag { + public static class OpplysningerFraSkatteetatensInnsendingsmiljoe { + + @Schema(description = "Inntektsår, 4 siffre, årene 2020, 2021, 2022, 2023 ... osv opptil i fjor") + private Integer inntektsaar; + @Schema(description = "Skattemelding utkast, merk at false indikerer har ikke skatteMeldingUtkast") + private Boolean harSkattemeldingUtkast; + @Schema(description = "Skattemelding fastsatt, merk at false indikerer har ikke skatteMeldingFastsatt") + private Boolean harSkattemeldingFastsatt; } @Data @NoArgsConstructor - public static class OpplysningerFraSkatteetatensInnsendingsmiljoe { + public static class SummertSkattegrunnlag { + } @Data diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index e4699fe4134..d08c2ffb05f 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -13,6 +13,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; +import static org.apache.commons.lang3.BooleanUtils.isFalse; import static org.apache.commons.lang3.BooleanUtils.isNotTrue; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -89,20 +90,36 @@ public Mono getTestdata(TenorRequest searchData) { .append(getSkatteplikt(searchData.getSkatteplikt())) .append(getTilleggsskatt(searchData.getTilleggsskatt())) .append(getArbeidsforhold(searchData.getArbeidsforhold())) - .append(getBeregnetSkatt(searchData.getBeregnetSkatt())); + .append(getBeregnetSkatt(searchData.getBeregnetSkatt())) + .append(getOpplysningerFraSkatteetatensInnsendingsMiljoe(searchData.getOpplysningerFraSkatteetatensInnsendingsmiljoe())); log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } + private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe) { + + return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" : + "+and+tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) + .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast())) + .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt())) + .substring(5)); + } + + private String convertBooleanSpecial(String navn, Boolean verdi) { + + return isNull(verdi) ? "" : "+%sand+%s:*".formatted((isFalse(verdi) ? "not+" : ""), navn); + } + private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { return isNull(beregnetSkatt) ? "" : - "+and+tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) - .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) - .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) - .substring(5)); + "+and+tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) + .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) + .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) + .substring(5)); } private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { From 0aa060c5d4a6d699ea6bd51fd9e326c4bca0d99b Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 07:57:53 +0100 Subject: [PATCH 44/69] Oppdatert request + dekoding III #deploy-tenor-search-service --- .../service/TenorSearchService.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index d08c2ffb05f..c89548d3073 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -100,7 +100,7 @@ public Mono getTestdata(TenorRequest searchData) { private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe) { return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" : - "+and+tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() + " and tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() .append(convertObject("inntektsaar", opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast())) .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt())) @@ -109,13 +109,13 @@ private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.Opp private String convertBooleanSpecial(String navn, Boolean verdi) { - return isNull(verdi) ? "" : "+%sand+%s:*".formatted((isFalse(verdi) ? "not+" : ""), navn); + return isNull(verdi) ? "" : " and %s%s:*".formatted((isFalse(verdi) ? " not " : ""), navn); } private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { return isNull(beregnetSkatt) ? "" : - "+and+tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() + " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) @@ -125,7 +125,7 @@ private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { return isNull(arbeidsforhold) ? "" : - "+and+tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder() + " and tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder() .append(convertDatoer("startDato", arbeidsforhold.getStartDatoPeriode())) .append(convertDatoer("sluttDato", arbeidsforhold.getSluttDatoPeriode())) .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner())) @@ -141,7 +141,7 @@ private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { return isNull(tilleggsskatt) ? "" : - "+and+tenorRelasjoner.tilleggsskatt:{%s}".formatted( + " and tenorRelasjoner.tilleggsskatt:{%s}".formatted( new StringBuilder() .append(convertObject("inntektsaar", tilleggsskatt.getInntektsaar())) .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper())) @@ -150,17 +150,17 @@ private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { private String getTilleggsskattTyper(List tilleggsskattTyper) { - return tilleggsskattTyper.isEmpty() ? "" : "+and+" + + return tilleggsskattTyper.isEmpty() ? "" : " and " + tilleggsskattTyper.stream() .map(Enum::name) .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) - .collect(Collectors.joining("+and+")); + .collect(Collectors.joining(" and ")); } private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { return isNull(skatteplikt) ? "" : - "+and+tenorRelasjoner.skatteplikt:{%s}".formatted( + " and tenorRelasjoner.skatteplikt:{%s}".formatted( new StringBuilder() .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) @@ -170,74 +170,74 @@ private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { private String getSkattepliktstyper(List skattepliktstyper) { - return skattepliktstyper.isEmpty() ? "" : "+and+" + + return skattepliktstyper.isEmpty() ? "" : " and " + skattepliktstyper.stream() .map(Enum::name) .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) - .collect(Collectors.joining("+and+")); + .collect(Collectors.joining(" and ")); } private String convertEnumWildcard(Enum type) { - return isNull(type) ? "" : "+and+%s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), + return isNull(type) ? "" : " and %s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), type.name().substring(1)); } private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { return (isNull(inntektAordningen)) ? "" : - "+and+tenorRelasjoner.inntekt:{" + new StringBuilder() + " and tenorRelasjoner.inntekt:{%s}".formatted(new StringBuilder() .append(getPeriode(inntektAordningen.getPeriode())) .append(convertObject("opplysningspliktig", inntektAordningen.getOpplysningspliktig())) .append(getInntektstyper(inntektAordningen.getInntektstyper())) .append(convertEnum("beskrivelse", inntektAordningen.getBeskrivelse())) .append(getForskuddstrekk(inntektAordningen.getForskuddstrekk())) .append(convertObject("harHistorikk", inntektAordningen.getHarHistorikk())) - .substring(5) + "}"; + .substring(5)); } private String getForskuddstrekk(List forskuddstrekk1) { - return forskuddstrekk1.isEmpty() ? "" : "+and+forskuddstrekk:(%s)" + return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)" .formatted(forskuddstrekk1.stream() .map(Enum::name) - .collect(Collectors.joining("+and+"))); + .collect(Collectors.joining(" and "))); } private String getInntektstyper(List inntektstyper) { - return inntektstyper.isEmpty() ? "" : "+and+inntektstype:(%s)" + return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)" .formatted(inntektstyper.stream() .map(Enum::name) - .collect(Collectors.joining("+and+"))); + .collect(Collectors.joining(" and "))); } private String getSkattemelding(TenorRequest.Skattemelding skattemelding) { return isNull(skattemelding) ? "" : - "+and+tenorRelasjoner.skattemelding:{" + new StringBuilder() - .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) - .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) - .substring(5) + "}"; + " and tenorRelasjoner.skattemelding:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) + .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) + .substring(5)); } private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tjenestepensjonsavtale) { return isNull(tjenestepensjonsavtale) ? "" : - "+and+tenorRelasjoner.tjenestepensjonavtale:{" + new StringBuilder() + " and tenorRelasjoner.tjenestepensjonavtale:{%s}".formatted(new StringBuilder() .append(convertObject("pensjonsinnretningOrgnr", tjenestepensjonsavtale.getPensjonsinnretningOrgnr())) .append(convertObject("periode", tjenestepensjonsavtale.getPeriode())) - .substring(5) + "}"; + .substring(5)); } private String convertObject(String navn, Object verdi) { - return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : "+and+%s:%s".formatted(navn, verdi); + return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : " and %s:%s".formatted(navn, verdi); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { - return isNull(relasjonMedFoedselsaar) ? "" : "+and+tenorRelasjoner.freg:{foedselsdato:[%s+to+%s]}" + return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%sto%s]}" .formatted( isNull(relasjonMedFoedselsaar.getFraOgMed()) ? "*" : relasjonMedFoedselsaar.getFraOgMed(), isNull(relasjonMedFoedselsaar.getTilOgMed()) ? "*" : relasjonMedFoedselsaar.getTilOgMed()); @@ -245,17 +245,17 @@ private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoed private String getRelasjon(TenorRequest.Relasjon relasjon) { - return isNull(relasjon) ? "" : "+and+tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); + return isNull(relasjon) ? "" : " and tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); } private String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { - return isNotTrue(booleanVerdi) ? "" : "+and+%s:*".formatted(booleanNavn); + return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn); } private String getIntervall(String intervallNavn, TenorRequest.Intervall intervall) { - return isNull(intervall) ? "" : "+and+%s:[%s+to+%s]" + return isNull(intervall) ? "" : " and %s:[%sto%s]" .formatted(intervallNavn, isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); @@ -263,7 +263,7 @@ private String getIntervall(String intervallNavn, TenorRequest.Intervall interva private String getPeriode(TenorRequest.MonthInterval intervall) { - return isNull(intervall) ? "" : "+and+periode:[%s+to+%s]" + return isNull(intervall) ? "" : " and periode:[%sto%s]" .formatted( isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); @@ -271,20 +271,20 @@ private String getPeriode(TenorRequest.MonthInterval intervall) { private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { - return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : "+and+utenlandskPersonidentifikasjon:(%s)" + return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : " and utenlandskPersonidentifikasjon:(%s)" .formatted(utenlandskPersonIdentifikasjon.stream() .map(Enum::name) - .collect(Collectors.joining("+and+"))); + .collect(Collectors.joining(" and "))); } private String getRoller(List roller) { - return (roller.isEmpty()) ? "" : "+and+tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; + return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; } private String convertEnum(String enumNavn, Enum enumVerdi) { - return isNull(enumVerdi) ? "" : "+and+%s:%s%s".formatted(enumNavn, + return isNull(enumVerdi) ? "" : " and %s:%s%s".formatted(enumNavn, enumVerdi.name().substring(0, 1).toUpperCase(), enumVerdi.name().substring(1)); } @@ -292,16 +292,16 @@ private String convertEnum(String enumNavn, Enum enumVerdi) { private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { return isNull(datoIntervall) ? "" : - "+and+%s:[%s+to+%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); + " and %s:[%sto%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); } private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { return isNull(identifikatorType) ? "" : - "+and+identifikatorType:" + switch (identifikatorType) { + " and identifikatorType:%s".formatted(switch (identifikatorType) { case FNR -> "foedselsnummer"; case DNR -> "dNummer"; case FNR_TIDLIGERE_DNR -> "foedselsnummerOgTidligereDNummer"; - }; + }); } } From d744bfa25e16f9a4705ad39ff33a303dea1892c0 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 09:59:23 +0100 Subject: [PATCH 45/69] Arbeid paagaar --- .../domain/TenorRequest.java | 50 +++++++++++++++++-- .../service/TenorSearchService.java | 6 +-- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 3a59991be4f..d85ceff8e9a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -13,6 +13,7 @@ @Data @NoArgsConstructor +@SuppressWarnings("java:S115") public class TenorRequest { public enum IdentifikatorType {FNR, DNR, FNR_TIDLIGERE_DNR} @@ -91,6 +92,41 @@ public enum Arbeidsforholdstype { } public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} + public enum Stadietype {Utkast, Fastsatt, Oppjoer} + + public enum TekniskNavn { + AlderspensjonFraFolketrygden, alderspensjonFraIPAOgIPS, AlminneligInntektFoerSaerfradrag, + AndelAvFellesgjeldISDF, AndelAvUnderskuddFraTidligereAarVedDriftAvVaaningshusSomAnvendesIAaret, + AndelIFellesTapVedSalgAvAndelISDF, AndelIFellesTilleggIAlminneligInntektFraSDF, + AndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering, + AndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem, + AndreFradragsberettigedeKostnader, AnnenArbeidsinntekt, AnnenGjeld, AnnenPensjonFoerAlderspensjon, + AnnenSkattepliktigKapitalinntektFraAnnetFinansprodukt, AnnenSkattepliktigKapitalinntektFraVirtuellValuta, + AnnetInntektsfradrag, Arbeidsavklaringspenger, ArbeidsinntektFraKompensasjonsytelseUtbetaltAvNav, + AvkortetFordelVedElektroniskKommunikasjon, BarnepensjonFraAndreEnnFolketrygden, BarnepensjonFraFolketrygden, + BarnepensjonFraIPAOgIPS, BetalteForsinkelsesrenter, BetaltPremieTilSykeOgUlykkesforsikringForNaeringsdrivende, + BetaltUnderholdsbidrag, BruttoFormue, DagpengerForFisker, DagpengerForNaeringsdrivende, + DagpengerForNaeringsdrivendeOgFiske, DagpengerVedSykehusoppholdMvFraBarneforsikring, EktefelletilleggTilPensjon, + EktefelletilleggTilUfoeretrygd, EngangsutbetalingFraIPSIPA, EtterlattepensjonFraFolketrygden, Foederaad, + FormuesverdiAvPrivatUtestaaendeFordring, FormuesverdiAvUtestaaendeFordring, + FormuesverdiForAndelIRentedelIVerdipapirfond, FormuesverdiForAnnenFastEiendom, + FormuesverdiForAnnenFastEiendomInnenforInntektsgivendeAktivitet, + FormuesverdiForAnnenFastEiendomUtenforInntektsgivendeAktivitet, FormuesverdiForAnnetFinansprodukt, + FormuesverdiForBorett, FormuesverdiForBuskap, FormuesverdiForEgenFritaksbehandletBolig, + FormuesverdiForFormuesobjekterINaeringIkkeOmfattetAvVerdsettingsrabatt, + FormuesverdiForFritidsbaatMedSalgsverdiOverSalgsverdigrense, FormuesverdiForGaardsbruk, + FormuesverdiForInnboLoesoereOgFritidsbaatUnderSalgsverdigrense, FormuesverdiForKjoeretoey, + FormuesverdiForKontanterIAksjesparekonto, FormuesverdiForKontanterMvIFondskonto, FormuesverdiForNaeringseiendom, + FormuesverdiForObligasjon, FormuesverdiForObligasjonerOpsjonerMvIkkeRegistrertIVerdipapirsentralen, + FormuesverdiForObligasjonerOpsjonerMvRegistrertIVerdipapirsentralen, FormuesverdiForPrimaerbolig, + FormuesverdiForRegnskapsbehandletBolig, FormuesverdiForSekundaerbolig, FormuesverdiForSkogeiendom, + FormuesverdiForTomt, FormuesverdiForUbetingetOpsjonIArbeidsforhold, FormuesverdiForUtestaaendeFordringerINaering, + FormuesverdiForUtleidFlerboligbygning, FormuesverdiForVarelager, FormuesverdiForVirtuellValuta, + Fortsettelsesforsikring, ForvaltningskostnaderFinans, + + + } + @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; @@ -121,8 +157,8 @@ public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} private Arbeidsforhold arbeidsforhold; private BeregnetSkatt beregnetSkatt; private OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe; - private SummertSkattegrunnlag summertSkattegrunnlag; private SamletReskontroInnsyn samletReskontroInnsyn; + private SummertSkattegrunnlag summertSkattegrunnlag; private SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag; public List getUtenlandskPersonIdentifikasjon() { @@ -340,13 +376,21 @@ public static class OpplysningerFraSkatteetatensInnsendingsmiljoe { @Data @NoArgsConstructor - public static class SummertSkattegrunnlag { + public static class SamletReskontroInnsyn { + private Boolean harKrav; + private Boolean harInnbetaling; } @Data @NoArgsConstructor - public static class SamletReskontroInnsyn { + public static class SummertSkattegrunnlag { + + @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor") + private Integer inntektsaar; + private Stadietype stadietype; + private Oppgjoerstype oppgjoerstype; + private TekniskNavn tekniskNavn; } @Data diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index c89548d3073..fc4f625c830 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -153,7 +153,6 @@ private String getTilleggsskattTyper(List tilleg return tilleggsskattTyper.isEmpty() ? "" : " and " + tilleggsskattTyper.stream() .map(Enum::name) - .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) .collect(Collectors.joining(" and ")); } @@ -173,7 +172,6 @@ private String getSkattepliktstyper(List skattepl return skattepliktstyper.isEmpty() ? "" : " and " + skattepliktstyper.stream() .map(Enum::name) - .map(type -> "%s%s:*".formatted(type.substring(0, 1).toLowerCase(), type.substring(1))) .collect(Collectors.joining(" and ")); } @@ -284,9 +282,7 @@ private String getRoller(List roller) { private String convertEnum(String enumNavn, Enum enumVerdi) { - return isNull(enumVerdi) ? "" : " and %s:%s%s".formatted(enumNavn, - enumVerdi.name().substring(0, 1).toUpperCase(), - enumVerdi.name().substring(1)); + return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi); } private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { From b03b1745bae879e6530a434101f59f83930ced3e Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 11:43:14 +0100 Subject: [PATCH 46/69] Oppdatert med mer funksjonalitet #deploy-tenor-search-service --- .../tenorsearchservice/domain/Hendelse.java | 49 ++ .../domain/Spesifiseringstype.java | 34 ++ .../domain/TekniskNavn.java | 429 ++++++++++++++++++ .../domain/TenorRequest.java | 58 +-- .../service/TenorConverterUtility.java | 61 +++ .../TenorEksterneRelasjonerUtility.java | 201 ++++++++ .../service/TenorSearchService.java | 202 +-------- 7 files changed, 792 insertions(+), 242 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java new file mode 100644 index 00000000000..9131d08a5b7 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java @@ -0,0 +1,49 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +public enum Hendelse { + + EndringIAdressebeskyttelse, + EndringIBostedsadresse, + EndringIBostedsadresseUtenFlytting, + EndringIBrukAvSamiskSpraak, + EndringIDeltBosted, + EndringIDoedsfall, + EndringIFalskIdentitet, + EndringIFamilierelasjon, + EndringIFoedsel, + EndringIFoedselINorge, + EndringIForeldreansvar, + EndringIFratattRettsligHandleevne, + EndringIIdentifikasjonsnummer, + EndringIIdentitetsgrunnlag, + EndringIInnflytting, + EndringIKjoenn, + EndringIKontaktinformasjon, + EndringIKontaktopplysningerForDoedsbo, + EndringILegitimasjonsdokument, + EndringINavn, + EndringIOpphold, + EndringIOppholdPaaSvalbard, + EndringIOppholdsadresse, + EndringIPerson, + EndringIRettsligHandleevne, + EndringISametingetsValgmanntall, + EndringISivilstand, + EndringIStatsborgerskap, + EndringIStatus, + EndringIUtenlandskPersonidentifikasjon, + EndringIUtflytting, + EndringIUtlendingsmyndighetenesIdentifikasjonsnummer, + EndringIVergemaal, + PersonErBosatt, + PersonErDoed, + PersonErEndretVedSplitting, + PersonErGjenopprettetVedSplitting, + PersonErOppdatert, + PersonErOpphoert, + PersonErOpphoertSomDublett, + PersonErOpprettet, + PersonErReaktivert, + PersonErUtflyttet, + PersonErViderefoertSomGjeldendeVedSammenslaaing +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java new file mode 100644 index 00000000000..5031e394274 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java @@ -0,0 +1,34 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +public enum Spesifiseringstype { + + AksjeIkkeIAksjonaerregisteret, + Aksjesparekonto, + AndreBeloepKnyttetTilBoligOgEiendeler, + AnnenKapitalkostnad, + AnnetFinansprodukt, + DeltakersAndelAvFormueOgInntekt, + Eiendom, + Fondskonto, + Fordring, + FritidsbaatMedSalgsverdiOverSalgsverdigrense, + Generisk, + GrunnlagKnyttetTilLottaker, + KapitalisertFesteavgift, + Kjoeretoey, + KollektivPensjonsordning, + Konto, + Livsforsikring, + LoennOgTilsvarendeYtelser, + Naeringsopplysninger, + ObligasjonOgSertifikat, + OekonomiskeForholdKnyttetTilBoligsameieEllerBoligselskap, + PrivatGjeldsforholdUtenforVirksomhet, + SamletGjeldOgFormuesobjekterINaering, + Skadeforsikring, + SkyldigRestskatt, + SykepengerOgAnnenInntektMvFraOppgavegiver, + Verdipapirfond, + VirtuellEiendel, + VirtuellValuta +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java new file mode 100644 index 00000000000..bd2d613c165 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java @@ -0,0 +1,429 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +public enum TekniskNavn { + AaretsFremfoerbareNegativPersoninntekt, + AarsavgiftForKontoIVerdipapirregister, + AlderspensjonFraFolketrygden, + AlderspensjonFraIPAOgIPS, + AlminneligInntektFoerSaerfradrag, + AndelAvFellesgjeldISDF, + AndelAvUnderskuddFraTidligereAarVedDriftAvVaaningshusSomAnvendesIAaret, + AndelIFellesTapVedSalgAvAndelISDF, + AndelIFellesTilleggIAlminneligInntektFraSDF, + AndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering, + AndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem, + AndreFradragsberettigedeKostnader, + AnnenArbeidsinntekt, + AnnenGjeld, + AnnenPensjonFoerAlderspensjon, + AnnenSkattepliktigKapitalinntektFraAnnetFinansprodukt, + AnnenSkattepliktigKapitalinntektFraVirtuellValuta, + AnnetInntektsfradrag, + Arbeidsavklaringspenger, + ArbeidsinntektFraKompensasjonsytelseUtbetaltAvNav, + AvkortetFordelVedElektroniskKommunikasjon, + BarnepensjonFraAndreEnnFolketrygden, + BarnepensjonFraFolketrygden, + BarnepensjonFraIPAOgIPS, + BetaltPremieTilSykeOgUlykkesforsikringForNaeringsdrivende, + BetaltUnderholdsbidrag, + BetalteForsinkelsesrenter, + Bruttoformue, + DagpengerForFisker, + DagpengerForNaeringsdrivende, + DagpengerForNaeringsdrivendeOgFisker, + DagpengerVedSykehusoppholdMvFraBarneforsikring, + EktefelletilleggTilPensjon, + EktefelletilleggTilUfoeretrygd, + EngangsutbetalingFraIPSIPA, + EtterlattepensjonFraFolketrygden, + Foederaad, + FormuesverdiAvPrivatUtestaaendeFordring, + FormuesverdiAvUtestaaendeFordring, + FormuesverdiForAndelIRentedelIVerdipapirfond, + FormuesverdiForAnnenFastEiendom, + FormuesverdiForAnnenFastEiendomInnenforInntektsgivendeAktivitet, + FormuesverdiForAnnenFastEiendomUtenforInntektsgivendeAktivitet, + FormuesverdiForAnnetFinansprodukt, + FormuesverdiForBorett, + FormuesverdiForBuskap, + FormuesverdiForEgenFritaksbehandletBolig, + FormuesverdiForFormuesobjekterINaeringIkkeOmfattetAvVerdsettingsrabatt, + FormuesverdiForFritidsbaatMedSalgsverdiOverSalgsverdigrense, + FormuesverdiForGaardsbruk, + FormuesverdiForInnboLoesoereOgFritidsbaatUnderSalgsverdigrense, + FormuesverdiForKjoeretoey, + FormuesverdiForKontanterIAksjesparekonto, + FormuesverdiForKontanterMvIFondskonto, + FormuesverdiForNaeringseiendom, + FormuesverdiForObligasjon, + FormuesverdiForObligasjonerOpsjonerMvIkkeRegistrertIVerdipapirsentralen, + FormuesverdiForObligasjonerOpsjonerMvRegistrertIVerdipapirsentralen, + FormuesverdiForPrimaerbolig, + FormuesverdiForRegnskapsbehandletBolig, + FormuesverdiForRegnskapsbehandletFritidseiendom, + FormuesverdiForSekundaerbolig, + FormuesverdiForSkogeiendom, + FormuesverdiForTomt, + FormuesverdiForUbetingetOpsjonIArbeidsforhold, + FormuesverdiForUtestaaendeFordringerINaering, + FormuesverdiForUtleidFlerboligbygning, + FormuesverdiForVarelager, + FormuesverdiForVirtuellValuta, + Fortsettelsesforsikring, + ForvaltningskostnadKnyttetTilAksjesparekonto, + ForvaltningskostnadKnyttetTilFondskonto, + ForvaltningskostnadKnyttetTilVerdipapirfond, + ForvaltningskostnaderFinans, + FradragForFagforeningskontingent, + FradragForGaverTilFrivilligeOrganisasjoner, + FradragForIndividuellSparingTilPensjon, + FradragForKostnaderKnyttetTilArbeid, + FradragForMerkostnadVedArbeidsoppholdUtenforHjemmet, + FradragForPengetilskudd, + FradragForVergegodtgjoerelse, + FradragsberettigedeFoederaadsytelserOgUnderholdsbidragTilAnnenPerson, + FradragsberettigetTapPaaKapitalforsikringsavtale, + FradragsberettigetTapVedRealisasjonAvFastEiendom, + FradragsberettigetTapVedRealisasjonAvFastEiendomIUtlandet, + FremfoerbartUnderskuddIEnkeltpersonforetak, + GevinstOgAnnenInntektFraVirtuellEiendel, + GevinstValutalaan, + GevinstVedRealisasjonAvAksje, + GevinstVedRealisasjonAvAksjeOgVerdipapirfondAksjedel, + GevinstVedRealisasjonAvAksjesparekonto, + GevinstVedRealisasjonAvAndelIAksjedelIVerdipapirfond, + GevinstVedRealisasjonAvAndelIRentedelIVerdipapirfond, + GevinstVedRealisasjonAvAnnetFinansprodukt, + GevinstVedRealisasjonAvFastEiendomMv, + GevinstVedRealisasjonAvFastEiendomMvIUtlandet, + GevinstVedRealisasjonAvObligasjonVerdipapirfondRentedelMv, + GevinstVedRealisasjonAvObligasjonerSertifikaterMv, + GevinstVedRealisasjonAvOgUttakFraAksjedelIFondskonto, + GevinstVedRealisasjonAvOgUttakFraRentedelIFondskonto, + GevinstVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel, + GevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel, + GevinstVedRealisasjonAvVirtuellValuta, + GevinstVedSalgAvAndelINOKUS, + GevinstVedSalgAvAndelISDF, + GjeldIInnenlandskeBanker, + GjeldINaering, + GjeldIUtlandet, + GjeldPaaAnnetFinansprodukt, + GjeldsfradragForKapitalisertFesteavgift, + GjeldsreduksjonForFastEiendomIUtlandetUnntattBeskatningINorgeEtterSkatteavtale, + GjeldsreduksjonForFastEiendomUtenforSvalbardUnntattBeskatningPaaSvalbard, + GjeldsrentereduksjonForFormueIUtlandetUnntattBeskatningINorgeEtterSkatteavtale, + GjeldsrentereduksjonForFormueUtenforSvalbardUnntattBeskatningPaaSvalbard, + GjenkjoepsverdiForLivsforsikring, + GrunnlagForKildeskattPaaPensjonOgUfoereytelser, + GrunnlagForSkattPaaAlminneligInntektSvalbard, + GrunnlagForSkattPaaNaeringsoverskuddSvalbard, + Innskudd, + InnskuddIUtlandet, + InntektFraGevinstOgTapskonto, + InntektFraLottEllerPartTilFiskerOgFangstmann, + InntektVedUtleieAvFritidseiendomSomSkattepliktigeHarBrukt, + InntektsfoeringAvNegativSaldo, + InntektsfradragAvRentefordelPaaLaanIArbeidsforhold, + InntektsfradragAvRentefordelPaaLaanIPensjonsforhold, + InntektsfradragFraGevinstOgTapskonto, + InntektsreduksjonVedAvkastningAvEngangserstatning, + Introduksjonsstoenad, + InvesteringIOppstartsselskap, + KaarytelseUtenforJordOgSkogbruksvirksomhet, + KapitalinntektFraSkogbruk, + KapitalkostnadFraSkogbruk, + KompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst, + Kontantbeloep, + Kvalifiseringsstoenad, + LatentEllerRealisertGevinstPaaAksjeAndelMvVedUtflytting, + LatentEllerRealisertGevinstPaaAnnetFinansproduktMvVedUtflytting, + LatentEllerRealisertTapPaaAksjeAndelMvVedUtflytting, + LatentEllerRealisertTapPaaAnnetFinansproduktMvVedUtflytting, + LivrenterIArbeidsforhold, + LivrenterUtenforArbeidsforhold, + LoennsinntektMedTrygdeavgiftspliktOmfattetAvLoennstrekkordningen, + LoennsinntektPaaSvalbardOver12G, + LoennsinntektTilBarn, + LoennsinntektUtenTrygdeavgiftspliktOgMedTrekkplikt, + LoennsinntektUtenTrygdeavgiftspliktOmfattetAvLoennstrekkordningen, + MinstefradragIBarnepensjon, + MinstefradragIBarnepensjonTilBarn, + MinstefradragIEktefelletillegg, + MinstefradragIInntekt, + MinstefradragIInntektTilBarn, + MottattFesteavgift, + NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenAnnenNaering, + NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenBarnepassIBarnepasserensHjem, + NaeringsinntektFraKompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst, + NegativAlminneligInntektOverfoertFraEktefelle, + NegativAlminneligInntektOverfoertTilEktefelle, + NegativFormueOverfoertFraEktefelle, + NettoLoennsinntektFraArbeidINorge, + Nettoformue, + NettoinntektVedUtleieAvFastEiendomMv, + OevrigInntekt, + OppjustertTilleggTilAndelIFellesTapVedSalgAvAndelISDF, + OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDF, + OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering, + OppjustertTilleggTilAndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem, + OppjustertTilleggTilGevinstVedRealisasjonAvAksje, + OppjustertTilleggTilGevinstVedRealisasjonAvAksjeOgVerdipapirfondAksjedel, + OppjustertTilleggTilGevinstVedRealisasjonAvAksjesparekonto, + OppjustertTilleggTilGevinstVedRealisasjonAvAndelIAksjedelIVerdipapirfond, + OppjustertTilleggTilGevinstVedRealisasjonAvOgUttakFraAksjedelIFondskonto, + OppjustertTilleggTilGevinstVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel, + OppjustertTilleggTilGevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel, + OppjustertTilleggTilGevinstVedSalgAvAndelINOKUS, + OppjustertTilleggTilGevinstVedSalgAvAndelISDF, + OppjustertTilleggTilLatentEllerRealisertGevinstPaaAksjeAndelMvVedUtflytting, + OppjustertTilleggTilLatentEllerRealisertTapPaaAksjeAndelMvVedUtflytting, + OppjustertTilleggTilRenteinntektMedEkstrabeskatningForLaanTilSelskap, + OppjustertTilleggTilSkattepliktigAksjegevinst, + OppjustertTilleggTilSkattepliktigUtbytteFraAksjeINOKUSIkkeRegistrertIVerdipapirsentralen, + OppjustertTilleggTilSkattepliktigUtbytteFraAksjeIkkeRegistrertIVerdipapirsentralen, + OppjustertTilleggTilSkattepliktigUtbytteFraAksjeOgVerdipapirfondAksjedel, + OppjustertTilleggTilSkattepliktigUtbytteFraAksjerRegistrertIVerdipapirsentralen, + OppjustertTilleggTilSkattepliktigUtbytteFraVerdipapirfondsandel, + OppjustertTilleggTilSkattepliktigUtbytteFraVerdipapirfondsandelTilBarn, + OppjustertTilleggTilTapVedRealisajonAvOgUttakFraAksjedelIFondskonto, + OppjustertTilleggTilTapVedRealisasjonAvAksje, + OppjustertTilleggTilTapVedRealisasjonAvAksjeOgVerdipapirfondAksjedel, + OppjustertTilleggTilTapVedRealisasjonAvAksjesparekonto, + OppjustertTilleggTilTapVedRealisasjonAvAndelIAksjedelIVerdipapirfond, + OppjustertTilleggTilTapVedRealisasjonAvOgUttakFraAksjedelIFondskonto, + OppjustertTilleggTilTapVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel, + OppjustertTilleggTilTapVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel, + OppjustertTilleggTilTapVedSalgAvAndelINOKUS, + OppjustertTilleggTilUtbytteFraAksje, + OppjustertTilleggTilUtbytteFraAksjesparekonto, + OppjustertTilleggTilUtbytteFraVerdipapirfond, + OpptjenteRenterFraPrivatUtestaaendeFordring, + OpptjenteRenterFraUtestaaendeFordring, + OvergangsstoenadTilEnsligForelder, + OverskuddAvEnkeltpersonforetakInnenAnnenNaeringUtenTrygdeavgiftsplikt, + OverskuddAvEnkeltpersonforetakInnenJordbrukGartneriPelsdyrMv, + OverskuddAvEnkeltpersonforetakInnenReindrift, + OverskuddAvEnkeltpersonforetakInnenSkiferproduksjon, + OverskuddAvEnkeltpersonforetakInnenSkogbruk, + OverskuddAvSDF, + OverskuddAvUtgiftsgodtgjoerelseVedSmusstillegg, + OverskuddFraNaeringsinntekt, + PaaloepteRenterFraAnnenGjeld, + PaaloepteRenterFraInkassoselskap, + PaaloepteRenterFraPrivatGjeld, + PensjonFraUtlandetSkattefriINorge, + PensjonFraUtlandetSkattepliktigINorge, + Pensjonsinnbetaling, + PensjonsinntektFritattForSkattEtterSkatteavtale, + PensjonsinntektIEOESTilsvarendeAlderspensjonEllerAFP, + PensjonsinntektOmfattetAvLoennstrekkordningen, + PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenAnnenNaering, + PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenBarnepassIBarnepasserensHjem, + PersoninntektFraKompensasjonsytelseUtbetaltAvNavInnenFiskeOgFangst, + PersoninntektFraSDFInnenAnnenNaering, + PersoninntektFraSDFInnenFiskeEllerBarnepassIBarnepasserensHjem, + PersoninntektFraSkattefriLottMedTrygdeavgiftspliktForUtenlandskFisker, + PositivPersoninntektFraEnkeltpersonforetakPaaSvalbard, + PremieTilEgenTilleggstrygdForNaeringsdrivende, + Premiefond, + PremiefondIndividuellPensjonsavtale, + PremiefondLivsforsikring, + PrivatGjeldsbeloep, + Reisefradrag, + RenteinntektAvAnnetFinansprodukt, + RenteinntektAvLivsforsikring, + RenteinntektAvObligasjon, + RenteinntektAvObligasjonVerdipapirfondRentedelMv, + RenteinntektAvObligasjonVerdipapirfondRentedelMvIUtlandet, + RenteinntektAvSkadeforsikring, + RenteinntektAvVerdipapirfondsandel, + RenteinntektMedEkstrabeskatningForLaanTilSelskap, + ReturAvPremieFraIndividuellPensjonssparing, + ReturprovisjonKnyttetTilAksjesparekonto, + ReturprovisjonKnyttetTilFondskonto, + ReturprovisjonKnyttetTilVerdipapirfond, + SaerfradragForEnsligForsoerger, + SaerfradragOverfoertFraBarn, + SaerfradragOverfoertFraEktefelle, + SaerfradragOverfoertTilEktefelle, + SaerfradragOverfoertTilForelder, + SaerskiltFradragForFiskereOgFangstfolk, + SaerskiltFradragForSjoefolk, + SaerskiltInntektsfradragIBarnsInntekt, + SamledeAndreOpptjenteRenter, + SamledeAndrePaaloepteRenter, + SamledeOpptjenteRenterIInnenlandskeBanker, + SamledeOpptjenteRenterIUtenlandskeBanker, + SamledeOpptjenteRenterIUtlandet, + SamledePaaloepteRenter, + SamledePaaloepteRenterPaaGjeldIInnenlandskeBanker, + SamledePaaloepteRenterPaaGjeldIUtlandet, + SamledeUfoererenterOgLivrenter, + SamledeUnderholdsbidrag, + SamletAndelAvFellesgjeldIBoligselskapEllerBoligsameie, + SamletAndelAvFradragsberettigetFelleskostnadForBoligselskapEllerBoligsameie, + SamletAndelAvInntektIBoligselskapEllerBoligsameie, + SamletAnnenGjeld, + SamletAnnenInntektForForskudd, + SamletAnnenPensjonMedTrekkpliktEksklusiveEktefelletillegg, + SamletAnnenPensjonUtenTrekkplikt, + SamletAnnenRenteinntekt, + SamletAvkastningAvKapitalforsikringsavtale, + SamletAvtalefestetPensjon, + SamletBarnepensjonOgLivrente, + SamletBarnepensjonOgLivrenteTilBarn, + SamletFormuesverdiAvPrivatUtestaaendeFordring, + SamletFormuesverdiAvUtestaaendeFordring, + SamletFormuesverdiForAndelAnnenFormueIBoligselskapEllerBoligsameie, + SamletFormuesverdiForAndelerIRentedelAvVerdipapirfond, + SamletFormuesverdiForAnnenFastEiendom, + SamletFormuesverdiForFastEiendomIUtlandet, + SamletFormuesverdiForOevrigFormue, + SamletFormuesverdiForOevrigFormueIUtlandet, + SamletFormuesverdiForSekundaerbolig, + SamletFormuesverdiForSelveidFritidseiendomEllerAndelIFritidsboligselskap, + SamletFradragsberettigetKostnadTilknyttetArbeidMv, + SamletFradragsberettigetUnderskuddVedUtleieAvFastEiendom, + SamletFremfoerbartUnderskuddFraTidligereAar, + SamletGevinstVedRealisasjonAvAndreFinansprodukter, + SamletGevinstVedRealisasjonAvVerdipapirfondsandelKnyttetTilRentedel, + SamletGjeld, + SamletGjenkjoepsverdiForLivsforsikring, + SamletGrunnlagForInntektsskattTilKommuneOgFylkeskommuneStatsskattOgFellesskatt, + SamletInnenlandskGjeld, + SamletInnskuddIInnenlandskeBanker, + SamletInntektSomGirRettTilSaerskiltFradragForSjoefolk, + SamletLoennsinntektMedTrygdeavgiftspliktOgMedTrekkplikt, + SamletLoennsinntektUtenTrygdeavgiftspliktOgMedTrekkplikt, + SamletLoennsinntektUtenTrygdeavgiftspliktOgUtenTrekkplikt, + SamletMerkostnadVedArbeidsoppholdUtenforHjem, + SamletOverskuddAvEnkeltpersonforetakInnenAnnenNaering, + SamletOverskuddAvEnkeltpersonforetakInnenFamiliebarnehageEllerDagmammaIEgetHjem, + SamletOverskuddAvEnkeltpersonforetakInnenFiskeOgFangst, + SamletOverskuddAvSDFInnenAnnenNaering, + SamletOverskuddAvSDFInnenFiskeEllerFamiliebarnehage, + SamletOverskuddPaaUtgiftsgodtgjoerelse, + SamletPensjonFraFolketrygden, + SamletPensjonsinnbetalingTilIndividuellPensjonsordning, + SamletPersoninntektFraEnkeltpersonforetakInnenFamiliebarnehageEllerDagmammaIEgetHjem, + SamletPersoninntektFraEnkeltpersonforetakInnenFiskeOgFangst, + SamletPersoninntektFraEnkeltpersonforetakInnenJordbrukReindriftSkiferproduksjonOgAnnenNaering, + SamletPremiefond, + SamletSaerfradrag, + SamletSaerfradragForStoreSykdomsutgifter, + SamletSaerfradragForUfoerhetIhtOvergangsregel, + SamletSaerskiltFradragForJordbrukReindriftOgSkiferproduksjon, + SamletSkattefriDelAvFormue, + SamletSkattepliktigGevinstVedRealisasjonAvObligasjonEllerVerdipapirfondsandel, + SamletSkattepliktigOverskuddFraUtleieAvFastEiendom, + SamletSkattepliktigOverskuddFraUtleieAvFastEiendomIUtlandet, + SamletTapVedRealisasjonAvVerdipapirfondsandelKnyttetTilRentedel, + SamletUfoeretrygdFraFolketrygdenEksklusiveEktefelletillegg, + SamletUfoereytelseFraAndreEnnFolketrygden, + SamletUnderskuddAvSDF, + SamletUnderskuddAvSDFPaaSvalbard, + SamletUnderskuddINaeringsvirksomhet, + SamletUnderskuddINaeringsvirksomhetPaaSvalbard, + SamletUtgiftsgodtgjoerelseMedTrekkplikt, + SkattefradragForFormuesskattBetaltIUtlandet, + SkattefriLoennsinntektMedTrygdeavgiftspliktOgMedTrekkplikt, + SkattepliktigAksjegevinst, + SkattepliktigAvkastningEllerKundeutbytte, + SkattepliktigEtterloennOgEtterpensjon, + SkattepliktigUtbytteFraAksjeINOKUSIkkeRegistrertIVerdipapirsentralen, + SkattepliktigUtbytteFraAksjeIkkeRegistrertIVerdipapirsentralen, + SkattepliktigUtbytteFraAksjeOgVerdipapirfondAksjedel, + SkattepliktigUtbytteFraAksjerRegistrertIVerdipapirsentralen, + SkattepliktigUtbytteFraVerdipapirfondsandel, + SkattepliktigUtbytteFraVerdipapirfondsandelTilBarn, + Skjermingsfradrag, + SkjermingstilleggTilAlderspensjon, + SkyldigRestskatt, + SkyldigUnderholdsbidrag, + Slitertillegg, + Standardfradrag, + StyrehonorarFraNorskSelskapTilSkattepliktigBosattIUtlandet, + SumFradragIAlminneligInntekt, + SumGjeldsreduksjon, + SumInntekterIAlminneligInntektFoerFordelingsfradrag, + SumMinstefradrag, + SumVerdsettingsrabatt, + SupplerendeStoenad, + SupplerendeStoenadTilUfoerFlyktning, + TapOgAnnenKostnadFraVirtuellEiendel, + TapValutalaan, + TapVedRealisajonAvOgUttakFraAksjedelIFondskonto, + TapVedRealisasjonAvAksje, + TapVedRealisasjonAvAksjeOgVerdipapirfondAksjedel, + TapVedRealisasjonAvAksjesparekonto, + TapVedRealisasjonAvAndelIAksjedelIVerdipapirfond, + TapVedRealisasjonAvAndelIRentedelIVerdipapirfond, + TapVedRealisasjonAvAnnetFinansprodukt, + TapVedRealisasjonAvObligasjonVerdipapirfondRentedelMv, + TapVedRealisasjonAvObligasjoner, + TapVedRealisasjonAvOgUttakFraAksjedelIFondskonto, + TapVedRealisasjonAvOgUttakFraRentedelIFondskonto, + TapVedRealisasjonAvVerdipapirfondsandelIKombifondKnyttetTilAksjedel, + TapVedRealisasjonAvVerdipapirfondsandelKnyttetTilAksjedel, + TapVedRealisasjonAvVirtuellValuta, + TapVedSalgAvAndelINOKUS, + UfoererenterOgLivrenterUtenforArbeidsforhold, + UfoeretrygdFoerAlderspensjon, + UfoeretrygdOmfattetAvLoennstrekkordningen, + UfoereytelseFraIPAOgIPS, + UfoereytelseFraUtlandet, + UnderholdsbidragFraTidligereEktefelle, + UnderholdsbidragTilGode, + UnderskuddAvEnkeltpersonforetakFordeltFraEktefelle, + UnderskuddAvEnkeltpersonforetakPaaSvalbard, + UnderskuddFraSDF, + UnderskuddOverfoertFraBarnOgFordelt, + UnderskuddOverfoertTilForeldre, + UnderskuddVedUtleieMvAvFastEiendomUtenforNaering, + UtbetalingFraAvtaleOmSkattefavorisertIndividuellSparingTilPensjonTegnetFomNov2017, + UtbetalingFraSkadeforsikring, + UtbytteFraAksje, + UtbytteFraAksjesparekonto, + UtbytteFraVerdipapirfond, + UtgiftVedRefinansieringAvLaan, + UtgifterTilPassOgStellAvHjemmevaerendeBarn, + VerdiFoerVerdsettingsrabattForAksje, + VerdiFoerVerdsettingsrabattForAksjeIUtlandet, + VerdiFoerVerdsettingsrabattForAksjeIVPS, + VerdiFoerVerdsettingsrabattForAksjeIkkeIVPS, + VerdiFoerVerdsettingsrabattForAksjeOgAksjefondIFondskonto, + VerdiFoerVerdsettingsrabattForAksjedelIAksjesparekonto, + VerdiFoerVerdsettingsrabattForAndelIAksjedelIVerdipapirfond, + VerdiFoerVerdsettingsrabattForAndelIFellesNettoformueISDF, + VerdiFoerVerdsettingsrabattForAndelINOKUS, + VerdiFoerVerdsettingsrabattForAnnenFormueFraDriftsmidlerAndelISDFMvGenerell, + VerdiFoerVerdsettingsrabattForAnnenFormueInnenforInntektsgivendeAktivitet, + VerdiFoerVerdsettingsrabattForBilerMaskinerOgInventar, + VerdiFoerVerdsettingsrabattForFormuesobjekterINaeringOmfattetAvVerdsettingsrabatt, + VerdiFoerVerdsettingsrabattForInventarLoesoereVedUtleie, + VerdiFoerVerdsettingsrabattForKapitalisertFesteavgift, + VerdiFoerVerdsettingsrabattForRettigheterKnyttetTilSkogUtmark, + VerdiFoerVerdsettingsrabattForSkipFiskeOgFangstfartoey, + VerdiFoerVerdsettingsrabattForVerdipapirfondsandel, + VerdiFoerVerdsettingsrabattForVerdipapirfondsandelTilBarn, + VerdsettingsrabattForAksje, + VerdsettingsrabattForAksjeIUtlandet, + VerdsettingsrabattForAksjeIVPS, + VerdsettingsrabattForAksjeIkkeIVPS, + VerdsettingsrabattForAksjeOgAksjefondIFondskonto, + VerdsettingsrabattForAksjedelIAksjesparekonto, + VerdsettingsrabattForAndelIAksjedelIVerdipapirfond, + VerdsettingsrabattForAndelIFellesNettoformueISDF, + VerdsettingsrabattForAndelINOKUS, + VerdsettingsrabattForAnnenFormueInnenforInntektsgivendeAktivitet, + VerdsettingsrabattForBilerMaskinerOgInventar, + VerdsettingsrabattForFormuesobjekterINaeringOmfattetAvVerdsettingsrabatt, + VerdsettingsrabattForInventarLoesoereVedUtleie, + VerdsettingsrabattForKapitalisertFesteavgift, + VerdsettingsrabattForRettigheterKnyttetTilSkogUtmark, + VerdsettingsrabattForSkipFiskeOgFangstfartoey, + VerdsettingsrabattForVerdipapirfondsandel, + VerdsettingsrabattForVerdipapirfondsandelTilBarn +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index d85ceff8e9a..6eff9f8d406 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -36,20 +36,6 @@ public enum AdresseGradering {Ugradert, Klientadresse, Fortrolig} public enum Relasjon {Barn, Far, Medmor, Mor, Partner} - public enum Hendelse { - EndringIAdressebeskyttelse, EndringIBostedsadresse, EndringIBostedsadresseUtenFlytting, - EndringIBrukAvSamiskSpraak, EndringIDeltBosted, EndringIDoedsfall, EndringIFalskIdentitet, EndringIFamilierelasjon, - EndringIForeldreansvar, EndringIFratattRettsligHandleevne, EndringIFoedsel, EndringIFoedselINorge, - EndringIIdentifikasjonsnummer, EndringIIdentitetsgrunnlag, EndringIInnflytting, EndringIKjoenn, - EndringIKontaktinformasjon, EndringIKontaktopplysningerForDoedsbo, EndringILegitimasjonsdokument, - EndringINavn, EndringIOpphold, EndringIOppholdPaaSvalbard, EndringIOppholdsadresse, EndringIPerson, - EndringIRettsligHandleevne, EndringISametingetsValgmanntall, EndringISivilstand, EndringIStatsborgerskap, - EndringIStatus, EndringIUtenlandskPersonidentifikasjon, EndringIUtflytting, - EndringIUtlendingsmyndighetenesIdentifikasjonsnummer, EndringIVergemaal, PersonErBosatt, PersonErDod, - PersonErEndretVedSplitting, PersonErGjenopprettetVedSplitting, PersonErOppdatert, PersonErOpphoert, - PersonErOpphoertSomDublett, PersonErOpprettet, PersonErReaktivert, PersonErUtflyttet, - PersonErViderefoertSomGjeldendeVedSammenslaaing - } public enum BostedsadresseType {Vegadresse, Matrikkeladresse, Ukjent} @@ -92,41 +78,8 @@ public enum Arbeidsforholdstype { } public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} - public enum Stadietype {Utkast, Fastsatt, Oppjoer} - - public enum TekniskNavn { - AlderspensjonFraFolketrygden, alderspensjonFraIPAOgIPS, AlminneligInntektFoerSaerfradrag, - AndelAvFellesgjeldISDF, AndelAvUnderskuddFraTidligereAarVedDriftAvVaaningshusSomAnvendesIAaret, - AndelIFellesTapVedSalgAvAndelISDF, AndelIFellesTilleggIAlminneligInntektFraSDF, - AndelIFellesTilleggIAlminneligInntektFraSDFInnenAnnenNaering, - AndelIFellesTilleggIAlminneligInntektFraSDFInnenBarnepassIBarnepasserensHjem, - AndreFradragsberettigedeKostnader, AnnenArbeidsinntekt, AnnenGjeld, AnnenPensjonFoerAlderspensjon, - AnnenSkattepliktigKapitalinntektFraAnnetFinansprodukt, AnnenSkattepliktigKapitalinntektFraVirtuellValuta, - AnnetInntektsfradrag, Arbeidsavklaringspenger, ArbeidsinntektFraKompensasjonsytelseUtbetaltAvNav, - AvkortetFordelVedElektroniskKommunikasjon, BarnepensjonFraAndreEnnFolketrygden, BarnepensjonFraFolketrygden, - BarnepensjonFraIPAOgIPS, BetalteForsinkelsesrenter, BetaltPremieTilSykeOgUlykkesforsikringForNaeringsdrivende, - BetaltUnderholdsbidrag, BruttoFormue, DagpengerForFisker, DagpengerForNaeringsdrivende, - DagpengerForNaeringsdrivendeOgFiske, DagpengerVedSykehusoppholdMvFraBarneforsikring, EktefelletilleggTilPensjon, - EktefelletilleggTilUfoeretrygd, EngangsutbetalingFraIPSIPA, EtterlattepensjonFraFolketrygden, Foederaad, - FormuesverdiAvPrivatUtestaaendeFordring, FormuesverdiAvUtestaaendeFordring, - FormuesverdiForAndelIRentedelIVerdipapirfond, FormuesverdiForAnnenFastEiendom, - FormuesverdiForAnnenFastEiendomInnenforInntektsgivendeAktivitet, - FormuesverdiForAnnenFastEiendomUtenforInntektsgivendeAktivitet, FormuesverdiForAnnetFinansprodukt, - FormuesverdiForBorett, FormuesverdiForBuskap, FormuesverdiForEgenFritaksbehandletBolig, - FormuesverdiForFormuesobjekterINaeringIkkeOmfattetAvVerdsettingsrabatt, - FormuesverdiForFritidsbaatMedSalgsverdiOverSalgsverdigrense, FormuesverdiForGaardsbruk, - FormuesverdiForInnboLoesoereOgFritidsbaatUnderSalgsverdigrense, FormuesverdiForKjoeretoey, - FormuesverdiForKontanterIAksjesparekonto, FormuesverdiForKontanterMvIFondskonto, FormuesverdiForNaeringseiendom, - FormuesverdiForObligasjon, FormuesverdiForObligasjonerOpsjonerMvIkkeRegistrertIVerdipapirsentralen, - FormuesverdiForObligasjonerOpsjonerMvRegistrertIVerdipapirsentralen, FormuesverdiForPrimaerbolig, - FormuesverdiForRegnskapsbehandletBolig, FormuesverdiForSekundaerbolig, FormuesverdiForSkogeiendom, - FormuesverdiForTomt, FormuesverdiForUbetingetOpsjonIArbeidsforhold, FormuesverdiForUtestaaendeFordringerINaering, - FormuesverdiForUtleidFlerboligbygning, FormuesverdiForVarelager, FormuesverdiForVirtuellValuta, - Fortsettelsesforsikring, ForvaltningskostnaderFinans, - - - } + public enum Stadietype {Utkast, Fastsatt, Oppjoer} @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; @@ -391,10 +344,19 @@ public static class SummertSkattegrunnlag { private Stadietype stadietype; private Oppgjoerstype oppgjoerstype; private TekniskNavn tekniskNavn; + private Intervall alminneligInntektFoerSaerfradragBeloep; } @Data @NoArgsConstructor public static class SpesisfisertSummertSkattegrunnlag { + + @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor") + private Integer inntektsaar; + private Stadietype stadietype; + private Oppgjoerstype oppgjoerstype; + private TekniskNavn tekniskNavn; + private Spesifiseringstype spesifiseringstype; + private Intervall alminneligInntektFoerSaerfradragBeloep; } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java new file mode 100644 index 00000000000..fb48643ade4 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -0,0 +1,61 @@ +package no.nav.testnav.apps.tenorsearchservice.service; + +import lombok.experimental.UtilityClass; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; + +import static java.util.Objects.isNull; +import static org.apache.commons.lang3.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isNotTrue; +import static org.apache.commons.lang3.StringUtils.isBlank; + +@UtilityClass +public class TenorConverterUtility { + + public static String convertBooleanSpecial(String navn, Boolean verdi) { + + return isNull(verdi) ? "" : " and %s%s:*".formatted((isFalse(verdi) ? " not " : ""), navn); + } + + public static String convertEnumWildcard(Enum type) { + + return isNull(type) ? "" : " and %s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), + type.name().substring(1)); + } + + public static String convertObject(String navn, Object verdi) { + + return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : " and %s:%s".formatted(navn, verdi); + } + + public static String convertIntervall(String intervallNavn, TenorRequest.Intervall intervall) { + + return isNull(intervall) ? "" : " and %s:[%sto%s]" + .formatted(intervallNavn, + isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), + isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + } + + public static String convertPeriode(TenorRequest.MonthInterval intervall) { + + return isNull(intervall) ? "" : " and periode:[%sto%s]" + .formatted( + isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), + isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + } + + public static String convertEnum(String enumNavn, Enum enumVerdi) { + + return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi); + } + + public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { + + return isNull(datoIntervall) ? "" : + " and %s:[%sto%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); + } + + public static String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { + + return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java new file mode 100644 index 00000000000..9158bb8dd00 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -0,0 +1,201 @@ +package no.nav.testnav.apps.tenorsearchservice.service; + +import lombok.experimental.UtilityClass; +import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; + +import java.util.List; +import java.util.stream.Collectors; + +import static java.util.Objects.isNull; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanSpecial; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanWildcard; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertDatoer; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnumWildcard; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertPeriode; + +@UtilityClass +public class TenorEksterneRelasjonerUtility { + + public static String getEksterneRelasjoner(TenorRequest searchData) { + + var builder = new StringBuilder() + .append(getRoller(searchData.getRoller())) + .append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale())) + .append(getSkattemelding(searchData.getSkattemelding())) + .append(getInntektAordningen(searchData.getInntektAordningen())) + .append(getSkatteplikt(searchData.getSkatteplikt())) + .append(getTilleggsskatt(searchData.getTilleggsskatt())) + .append(getArbeidsforhold(searchData.getArbeidsforhold())) + .append(getBeregnetSkatt(searchData.getBeregnetSkatt())) + .append(getOpplysningerFraSkatteetatensInnsendingsMiljoe(searchData.getOpplysningerFraSkatteetatensInnsendingsmiljoe())) + .append(getSamletReskontroInnsyn(searchData.getSamletReskontroInnsyn())) + .append(getSummertSkattegrunnlag(searchData.getSummertSkattegrunnlag())) + .append(getSpesifisertSummertSkattegrunnlag(searchData.getSpesisfisertSummertSkattegrunnlag())); + + return builder.toString(); + } + + private String getSpesifisertSummertSkattegrunnlag(TenorRequest.SpesisfisertSummertSkattegrunnlag spesisfisertSummertSkattegrunnlag) { + + return isNull(spesisfisertSummertSkattegrunnlag) ? "" : + " and tenorRelasjoner.spesifisertSummertSkattegrunnlag:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", spesisfisertSummertSkattegrunnlag.getInntektsaar())) + .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getStadietype())) + .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) + .append(convertEnum("tekniskNavn", spesisfisertSummertSkattegrunnlag.getTekniskNavn())) + .append(convertEnum("spesifiseringstype", spesisfisertSummertSkattegrunnlag.getSpesifiseringstype())) + .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", + spesisfisertSummertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep())) + .substring(5)); + } + + private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summertSkattegrunnlag) { + + return isNull(summertSkattegrunnlag) ? "" : + " and tenorRelasjoner.summertSkattegrunnlag:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", summertSkattegrunnlag.getInntektsaar())) + .append(convertEnumWildcard(summertSkattegrunnlag.getStadietype())) + .append(convertEnum("typeOppgjoer", summertSkattegrunnlag.getOppgjoerstype())) + .append(convertEnumWildcard(summertSkattegrunnlag.getTekniskNavn())) + .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", + summertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep())) + .substring(5)); + } + + private String getSamletReskontroInnsyn(TenorRequest.SamletReskontroInnsyn samletReskontroInnsyn) { + + return isNull(samletReskontroInnsyn) ? "" : + " and tenorRelasjoner.samletReskontroinnsyn{%s}".formatted(new StringBuilder() + .append(convertBooleanWildcard("harKrav", samletReskontroInnsyn.getHarKrav())) + .append(convertBooleanWildcard("harInnbetaling", samletReskontroInnsyn.getHarInnbetaling())) + .substring(5)); + } + + private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe) { + + return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" : + " and tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) + .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast())) + .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt())) + .substring(5)); + } + + private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { + + return isNull(beregnetSkatt) ? "" : + " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) + .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) + .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) + .substring(5)); + } + + private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { + + return isNull(arbeidsforhold) ? "" : + " and tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder() + .append(convertDatoer("startDato", arbeidsforhold.getStartDatoPeriode())) + .append(convertDatoer("sluttDato", arbeidsforhold.getSluttDatoPeriode())) + .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner())) + .append(convertObject("harPermitteringer", arbeidsforhold.getHarPermitteringer())) + .append(convertObject("harArbeidsgiver", arbeidsforhold.getHarArbeidsgiver())) + .append(convertObject("harTimerMedLoenn", arbeidsforhold.getHarTimerMedTimeloenn())) + .append(convertObject("harUtenlandsopphold", arbeidsforhold.getHarUtenlandsopphold())) + .append(convertObject("harHistorikk", arbeidsforhold.getHarHistorikk())) + .append(convertEnum("arbeidsforholdtype", arbeidsforhold.getArbeidsforholdstype())) + .substring(5)); + } + + private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { + + return isNull(tilleggsskatt) ? "" : + " and tenorRelasjoner.tilleggsskatt:{%s}".formatted( + new StringBuilder() + .append(convertObject("inntektsaar", tilleggsskatt.getInntektsaar())) + .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper())) + .substring(5)); + } + + private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { + + return (isNull(inntektAordningen)) ? "" : + " and tenorRelasjoner.inntekt:{%s}".formatted(new StringBuilder() + .append(convertPeriode(inntektAordningen.getPeriode())) + .append(convertObject("opplysningspliktig", inntektAordningen.getOpplysningspliktig())) + .append(getInntektstyper(inntektAordningen.getInntektstyper())) + .append(convertEnum("beskrivelse", inntektAordningen.getBeskrivelse())) + .append(getForskuddstrekk(inntektAordningen.getForskuddstrekk())) + .append(convertObject("harHistorikk", inntektAordningen.getHarHistorikk())) + .substring(5)); + } + + private String getForskuddstrekk(List forskuddstrekk1) { + + return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)" + .formatted(forskuddstrekk1.stream() + .map(Enum::name) + .collect(Collectors.joining(" and "))); + } + + private String getInntektstyper(List inntektstyper) { + + return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)" + .formatted(inntektstyper.stream() + .map(Enum::name) + .collect(Collectors.joining(" and "))); + } + + private String getSkattemelding(TenorRequest.Skattemelding skattemelding) { + + return isNull(skattemelding) ? "" : + " and tenorRelasjoner.skattemelding:{%s}".formatted(new StringBuilder() + .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) + .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) + .substring(5)); + } + + private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tjenestepensjonsavtale) { + + return isNull(tjenestepensjonsavtale) ? "" : + " and tenorRelasjoner.tjenestepensjonavtale:{%s}".formatted(new StringBuilder() + .append(convertObject("pensjonsinnretningOrgnr", tjenestepensjonsavtale.getPensjonsinnretningOrgnr())) + .append(convertObject("periode", tjenestepensjonsavtale.getPeriode())) + .substring(5)); + } + + private String getRoller(List roller) { + + return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; + } + + private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { + + return isNull(skatteplikt) ? "" : + " and tenorRelasjoner.skatteplikt:{%s}".formatted( + new StringBuilder() + .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) + .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) + .append(convertEnumWildcard(skatteplikt.getSaerskiltSkatteplikt())) + .substring(5)); + } + + private String getTilleggsskattTyper(List tilleggsskattTyper) { + + return tilleggsskattTyper.isEmpty() ? "" : " and " + + tilleggsskattTyper.stream() + .map(Enum::name) + .collect(Collectors.joining(" and ")); + } + + private String getSkattepliktstyper(List skattepliktstyper) { + + return skattepliktstyper.isEmpty() ? "" : " and " + + skattepliktstyper.stream() + .map(Enum::name) + .collect(Collectors.joining(" and ")); + } +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index fc4f625c830..8997cd88fba 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -13,23 +13,22 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static org.apache.commons.lang3.BooleanUtils.isFalse; -import static org.apache.commons.lang3.BooleanUtils.isNotTrue; -import static org.apache.commons.lang3.StringUtils.isBlank; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanWildcard; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertDatoer; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Slf4j @Service @RequiredArgsConstructor public class TenorSearchService { - private final TenorClient tenorClient; - public Mono getTestdata(String testDataQuery) { return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : ""); } - public Mono getTestdata(TenorRequest searchData) { var builder = new StringBuilder() @@ -50,7 +49,7 @@ public Mono getTestdata(TenorRequest searchData) { if (nonNull(searchData.getNavn())) { builder.append(convertObject("flereFornavn", searchData.getNavn().getHarFlereFornavn())) - .append(getIntervall("navnLengde", searchData.getNavn().getNavnLengde())) + .append(convertIntervall("navnLengde", searchData.getNavn().getNavnLengde())) .append(convertBooleanWildcard("mellomnavn", searchData.getNavn().getHarMellomnavn())) .append(convertObject("navnSpesialtegn", searchData.getNavn().getHarNavnSpesialtegn())); } @@ -69,7 +68,7 @@ public Mono getTestdata(TenorRequest searchData) { if (nonNull(searchData.getRelasjoner())) { builder.append(getRelasjon(searchData.getRelasjoner().getRelasjon())) - .append(getIntervall("antallBarn", searchData.getRelasjoner().getAntallBarn())) + .append(convertIntervall("antallBarn", searchData.getRelasjoner().getAntallBarn())) .append(convertBooleanWildcard("foreldreansvar", searchData.getRelasjoner().getHarForeldreAnsvar())) .append(getRelasjonMedFoedselsdato(searchData.getRelasjoner().getRelasjonMedFoedselsaar())) .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted())) @@ -83,156 +82,11 @@ public Mono getTestdata(TenorRequest searchData) { builder.append(convertEnum("hendelserMedSekvens.hendelse", searchData.getHendelser().getHendelse())) .append(convertEnum("sisteHendelse", searchData.getHendelser().getSisteHendelse())); } - builder.append(getRoller(searchData.getRoller())) - .append(getTjenestepensjonsavtale(searchData.getTjenestepensjonsavtale())) - .append(getSkattemelding(searchData.getSkattemelding())) - .append(getInntektAordningen(searchData.getInntektAordningen())) - .append(getSkatteplikt(searchData.getSkatteplikt())) - .append(getTilleggsskatt(searchData.getTilleggsskatt())) - .append(getArbeidsforhold(searchData.getArbeidsforhold())) - .append(getBeregnetSkatt(searchData.getBeregnetSkatt())) - .append(getOpplysningerFraSkatteetatensInnsendingsMiljoe(searchData.getOpplysningerFraSkatteetatensInnsendingsmiljoe())); + builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); log.info("Søker med query: {}", builder.substring(5)); return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); } - - private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.OpplysningerFraSkatteetatensInnsendingsmiljoe opplysningerFraSkatteetatensInnsendingsmiljoe) { - - return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" : - " and tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) - .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast())) - .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt())) - .substring(5)); - } - - private String convertBooleanSpecial(String navn, Boolean verdi) { - - return isNull(verdi) ? "" : " and %s%s:*".formatted((isFalse(verdi) ? " not " : ""), navn); - } - - private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { - - return isNull(beregnetSkatt) ? "" : - " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) - .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) - .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) - .substring(5)); - } - - private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { - - return isNull(arbeidsforhold) ? "" : - " and tenorRelasjoner.arbeidsforhold:{%s}".formatted(new StringBuilder() - .append(convertDatoer("startDato", arbeidsforhold.getStartDatoPeriode())) - .append(convertDatoer("sluttDato", arbeidsforhold.getSluttDatoPeriode())) - .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner())) - .append(convertObject("harPermitteringer", arbeidsforhold.getHarPermitteringer())) - .append(convertObject("harArbeidsgiver", arbeidsforhold.getHarArbeidsgiver())) - .append(convertObject("harTimerMedLoenn", arbeidsforhold.getHarTimerMedTimeloenn())) - .append(convertObject("harUtenlandsopphold", arbeidsforhold.getHarUtenlandsopphold())) - .append(convertObject("harHistorikk", arbeidsforhold.getHarHistorikk())) - .append(convertEnum("arbeidsforholdtype", arbeidsforhold.getArbeidsforholdstype())) - .substring(5)); - } - - private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { - - return isNull(tilleggsskatt) ? "" : - " and tenorRelasjoner.tilleggsskatt:{%s}".formatted( - new StringBuilder() - .append(convertObject("inntektsaar", tilleggsskatt.getInntektsaar())) - .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper())) - .substring(5)); - } - - private String getTilleggsskattTyper(List tilleggsskattTyper) { - - return tilleggsskattTyper.isEmpty() ? "" : " and " + - tilleggsskattTyper.stream() - .map(Enum::name) - .collect(Collectors.joining(" and ")); - } - - private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { - - return isNull(skatteplikt) ? "" : - " and tenorRelasjoner.skatteplikt:{%s}".formatted( - new StringBuilder() - .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) - .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) - .append(convertEnumWildcard(skatteplikt.getSaerskiltSkatteplikt())) - .substring(5)); - } - - private String getSkattepliktstyper(List skattepliktstyper) { - - return skattepliktstyper.isEmpty() ? "" : " and " + - skattepliktstyper.stream() - .map(Enum::name) - .collect(Collectors.joining(" and ")); - } - - private String convertEnumWildcard(Enum type) { - - return isNull(type) ? "" : " and %s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), - type.name().substring(1)); - } - - private String getInntektAordningen(TenorRequest.InntektAordningen inntektAordningen) { - - return (isNull(inntektAordningen)) ? "" : - " and tenorRelasjoner.inntekt:{%s}".formatted(new StringBuilder() - .append(getPeriode(inntektAordningen.getPeriode())) - .append(convertObject("opplysningspliktig", inntektAordningen.getOpplysningspliktig())) - .append(getInntektstyper(inntektAordningen.getInntektstyper())) - .append(convertEnum("beskrivelse", inntektAordningen.getBeskrivelse())) - .append(getForskuddstrekk(inntektAordningen.getForskuddstrekk())) - .append(convertObject("harHistorikk", inntektAordningen.getHarHistorikk())) - .substring(5)); - } - - private String getForskuddstrekk(List forskuddstrekk1) { - - return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)" - .formatted(forskuddstrekk1.stream() - .map(Enum::name) - .collect(Collectors.joining(" and "))); - } - - private String getInntektstyper(List inntektstyper) { - - return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)" - .formatted(inntektstyper.stream() - .map(Enum::name) - .collect(Collectors.joining(" and "))); - } - - private String getSkattemelding(TenorRequest.Skattemelding skattemelding) { - - return isNull(skattemelding) ? "" : - " and tenorRelasjoner.skattemelding:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) - .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) - .substring(5)); - } - - private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tjenestepensjonsavtale) { - - return isNull(tjenestepensjonsavtale) ? "" : - " and tenorRelasjoner.tjenestepensjonavtale:{%s}".formatted(new StringBuilder() - .append(convertObject("pensjonsinnretningOrgnr", tjenestepensjonsavtale.getPensjonsinnretningOrgnr())) - .append(convertObject("periode", tjenestepensjonsavtale.getPeriode())) - .substring(5)); - } - - private String convertObject(String navn, Object verdi) { - - return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : " and %s:%s".formatted(navn, verdi); - } - private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%sto%s]}" @@ -240,33 +94,10 @@ private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoed isNull(relasjonMedFoedselsaar.getFraOgMed()) ? "*" : relasjonMedFoedselsaar.getFraOgMed(), isNull(relasjonMedFoedselsaar.getTilOgMed()) ? "*" : relasjonMedFoedselsaar.getTilOgMed()); } - private String getRelasjon(TenorRequest.Relasjon relasjon) { return isNull(relasjon) ? "" : " and tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); } - - private String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { - - return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn); - } - - private String getIntervall(String intervallNavn, TenorRequest.Intervall intervall) { - - return isNull(intervall) ? "" : " and %s:[%sto%s]" - .formatted(intervallNavn, - isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), - isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); - } - - private String getPeriode(TenorRequest.MonthInterval intervall) { - - return isNull(intervall) ? "" : " and periode:[%sto%s]" - .formatted( - isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), - isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); - } - private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : " and utenlandskPersonidentifikasjon:(%s)" @@ -274,23 +105,6 @@ private String getUtenlandskPersonidentifikasjon(List roller) { - - return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; - } - - private String convertEnum(String enumNavn, Enum enumVerdi) { - - return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi); - } - - private String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { - - return isNull(datoIntervall) ? "" : - " and %s:[%sto%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); - } - private String getIdentifikatorType(TenorRequest.IdentifikatorType identifikatorType) { return isNull(identifikatorType) ? "" : From da7d7ed14394537cd0f168d18af3f7ec2458629b Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 12:36:01 +0100 Subject: [PATCH 47/69] Sonar + rettet feil #deploy-tenor-search-service --- .../testnav/apps/tenorsearchservice/domain/Hendelse.java | 1 + .../apps/tenorsearchservice/domain/Spesifiseringstype.java | 1 + .../testnav/apps/tenorsearchservice/domain/TekniskNavn.java | 1 + .../tenorsearchservice/service/TenorConverterUtility.java | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java index 9131d08a5b7..35e200d7c54 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Hendelse.java @@ -1,5 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.domain; +@SuppressWarnings("java:S115") public enum Hendelse { EndringIAdressebeskyttelse, diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java index 5031e394274..d8ea58a86bc 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Spesifiseringstype.java @@ -1,5 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.domain; +@SuppressWarnings("java:S115") public enum Spesifiseringstype { AksjeIkkeIAksjonaerregisteret, diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java index bd2d613c165..1295be4f517 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TekniskNavn.java @@ -1,5 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.domain; +@SuppressWarnings("java:S115") public enum TekniskNavn { AaretsFremfoerbareNegativPersoninntekt, AarsavgiftForKontoIVerdipapirregister, diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java index fb48643ade4..91fd6b03723 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -29,7 +29,7 @@ public static String convertObject(String navn, Object verdi) { public static String convertIntervall(String intervallNavn, TenorRequest.Intervall intervall) { - return isNull(intervall) ? "" : " and %s:[%sto%s]" + return isNull(intervall) ? "" : " and %s:[%s to %s]" .formatted(intervallNavn, isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); @@ -37,7 +37,7 @@ public static String convertIntervall(String intervallNavn, TenorRequest.Interva public static String convertPeriode(TenorRequest.MonthInterval intervall) { - return isNull(intervall) ? "" : " and periode:[%sto%s]" + return isNull(intervall) ? "" : " and periode:[%s to %s]" .formatted( isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); @@ -51,7 +51,7 @@ public static String convertEnum(String enumNavn, Enum enumVerdi) { public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { return isNull(datoIntervall) ? "" : - " and %s:[%sto%s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); + " and %s:[%s to %s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); } public static String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { From dcff41971d6e0e1da5a626c23e93e112a980f03a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 12:57:18 +0100 Subject: [PATCH 48/69] Sonar + rettet feil II #deploy-tenor-search-service --- .../provider/TenorSearchController.java | 2 -- .../TenorEksterneRelasjonerUtility.java | 31 +++++++++++-------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index d33c1fb59d4..e20b2688755 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -1,6 +1,5 @@ package no.nav.testnav.apps.tenorsearchservice.provider; -import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient; import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken; @@ -9,7 +8,6 @@ import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.Mapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index 9158bb8dd00..d597b02fd64 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -18,6 +18,10 @@ @UtilityClass public class TenorEksterneRelasjonerUtility { + + private static final String INNTEKTSAAR = "inntektsaar"; + private static final String AND = " and "; + public static String getEksterneRelasjoner(TenorRequest searchData) { @@ -42,7 +46,7 @@ private String getSpesifisertSummertSkattegrunnlag(TenorRequest.SpesisfisertSumm return isNull(spesisfisertSummertSkattegrunnlag) ? "" : " and tenorRelasjoner.spesifisertSummertSkattegrunnlag:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", spesisfisertSummertSkattegrunnlag.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, spesisfisertSummertSkattegrunnlag.getInntektsaar())) .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getStadietype())) .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) .append(convertEnum("tekniskNavn", spesisfisertSummertSkattegrunnlag.getTekniskNavn())) @@ -56,7 +60,7 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe return isNull(summertSkattegrunnlag) ? "" : " and tenorRelasjoner.summertSkattegrunnlag:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", summertSkattegrunnlag.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, summertSkattegrunnlag.getInntektsaar())) .append(convertEnumWildcard(summertSkattegrunnlag.getStadietype())) .append(convertEnum("typeOppgjoer", summertSkattegrunnlag.getOppgjoerstype())) .append(convertEnumWildcard(summertSkattegrunnlag.getTekniskNavn())) @@ -78,7 +82,7 @@ private String getOpplysningerFraSkatteetatensInnsendingsMiljoe(TenorRequest.Opp return isNull(opplysningerFraSkatteetatensInnsendingsmiljoe) ? "" : " and tenorRelasjoner.testinnsendingSkattPerson:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, opplysningerFraSkatteetatensInnsendingsmiljoe.getInntektsaar())) .append(convertBooleanSpecial("harSkattemeldingUtkast", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingUtkast())) .append(convertBooleanSpecial("harSkattemeldingFastsatt", opplysningerFraSkatteetatensInnsendingsmiljoe.getHarSkattemeldingFastsatt())) .substring(5)); @@ -88,7 +92,7 @@ private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { return isNull(beregnetSkatt) ? "" : " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", beregnetSkatt.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, beregnetSkatt.getInntektsaar())) .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) .substring(5)); @@ -115,7 +119,7 @@ private String getTilleggsskatt(TenorRequest.Tilleggsskatt tilleggsskatt) { return isNull(tilleggsskatt) ? "" : " and tenorRelasjoner.tilleggsskatt:{%s}".formatted( new StringBuilder() - .append(convertObject("inntektsaar", tilleggsskatt.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, tilleggsskatt.getInntektsaar())) .append(getTilleggsskattTyper(tilleggsskatt.getTilleggsskattTyper())) .substring(5)); } @@ -138,7 +142,7 @@ private String getForskuddstrekk(List forskuddstrek return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)" .formatted(forskuddstrekk1.stream() .map(Enum::name) - .collect(Collectors.joining(" and "))); + .collect(Collectors.joining(AND))); } private String getInntektstyper(List inntektstyper) { @@ -146,14 +150,14 @@ private String getInntektstyper(List inntektstyper) { return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)" .formatted(inntektstyper.stream() .map(Enum::name) - .collect(Collectors.joining(" and "))); + .collect(Collectors.joining(AND))); } private String getSkattemelding(TenorRequest.Skattemelding skattemelding) { return isNull(skattemelding) ? "" : " and tenorRelasjoner.skattemelding:{%s}".formatted(new StringBuilder() - .append(convertObject("inntektsaar", skattemelding.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, skattemelding.getInntektsaar())) .append(convertEnum("skattemeldingstype", skattemelding.getSkattemeldingstype())) .substring(5)); } @@ -177,7 +181,7 @@ private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { return isNull(skatteplikt) ? "" : " and tenorRelasjoner.skatteplikt:{%s}".formatted( new StringBuilder() - .append(convertObject("inntektsaar", skatteplikt.getInntektsaar())) + .append(convertObject(INNTEKTSAAR, skatteplikt.getInntektsaar())) .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) .append(convertEnumWildcard(skatteplikt.getSaerskiltSkatteplikt())) .substring(5)); @@ -185,17 +189,18 @@ private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { private String getTilleggsskattTyper(List tilleggsskattTyper) { - return tilleggsskattTyper.isEmpty() ? "" : " and " + + return tilleggsskattTyper.isEmpty() ? "" : AND + tilleggsskattTyper.stream() .map(Enum::name) - .collect(Collectors.joining(" and ")); + .collect(Collectors.joining(AND)); } private String getSkattepliktstyper(List skattepliktstyper) { - return skattepliktstyper.isEmpty() ? "" : " and " + + return skattepliktstyper.isEmpty() ? "" : AND + skattepliktstyper.stream() .map(Enum::name) - .collect(Collectors.joining(" and ")); + .map("%s:*"::formatted) + .collect(Collectors.joining(AND)); } } \ No newline at end of file From c018086d939def45b954b0033bf864ac7704b24b Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 13:22:32 +0100 Subject: [PATCH 49/69] Sonar + rettet feil III #deploy-tenor-search-service --- .../service/TenorConverterUtility.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java index 91fd6b03723..581545d7f12 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -31,16 +31,16 @@ public static String convertIntervall(String intervallNavn, TenorRequest.Interva return isNull(intervall) ? "" : " and %s:[%s to %s]" .formatted(intervallNavn, - isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), - isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + convertObject(intervall.getFraOgMed()), + convertObject(intervall.getTilOgMed())); } public static String convertPeriode(TenorRequest.MonthInterval intervall) { return isNull(intervall) ? "" : " and periode:[%s to %s]" .formatted( - isNull(intervall.getFraOgMed()) ? "*" : intervall.getFraOgMed(), - isNull(intervall.getTilOgMed()) ? "*" : intervall.getTilOgMed()); + convertObject(intervall.getFraOgMed()), + convertObject(intervall.getTilOgMed())); } public static String convertEnum(String enumNavn, Enum enumVerdi) { @@ -51,11 +51,18 @@ public static String convertEnum(String enumNavn, Enum enumVerdi) { public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { return isNull(datoIntervall) ? "" : - " and %s:[%s to %s]".formatted(datoNavn, datoIntervall.getFraOgMed(), datoIntervall.getTilOgMed()); + " and %s:[%s to %s]".formatted(datoNavn, + convertObject(datoIntervall.getFraOgMed()), + convertObject(datoIntervall.getTilOgMed())); } public static String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn); } + + private static String convertObject(Object object) { + + return isNull(object) ? "*" : object.toString(); + } } From 28630005e6a63e545aef4704fd2b60b08fa455fc Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 14:38:47 +0100 Subject: [PATCH 50/69] Sonar + rettet feil IV #deploy-tenor-search-service --- .../apps/tenorsearchservice/domain/TenorRequest.java | 8 ++++---- .../tenorsearchservice/service/TenorConverterUtility.java | 5 ++--- .../service/TenorEksterneRelasjonerUtility.java | 2 +- .../tenorsearchservice/service/TenorSearchService.java | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 6eff9f8d406..fd79f368c68 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -262,15 +262,15 @@ public static class Skatteplikt { @Schema(description = "Inntektsår, 4 siffre, årene 2019, 2019, 2020, 2021, 2022, 2023 ... osv opptil i fjor") private Integer inntektsaar; - private List Skattepliktstyper; + private List skattepliktstyper; private SaerskiltSkatteplikt saerskiltSkatteplikt; public List getSkattepliktstyper() { - if (isNull(Skattepliktstyper)) { - Skattepliktstyper = new ArrayList<>(); + if (isNull(skattepliktstyper)) { + skattepliktstyper = new ArrayList<>(); } - return Skattepliktstyper; + return skattepliktstyper; } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java index 581545d7f12..abc60acd51a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -18,8 +18,7 @@ public static String convertBooleanSpecial(String navn, Boolean verdi) { public static String convertEnumWildcard(Enum type) { - return isNull(type) ? "" : " and %s%s:*".formatted(type.name().substring(0, 1).toLowerCase(), - type.name().substring(1)); + return isNull(type) ? "" : " and %s:*".formatted(type.name()); } public static String convertObject(String navn, Object verdi) { @@ -45,7 +44,7 @@ public static String convertPeriode(TenorRequest.MonthInterval intervall) { public static String convertEnum(String enumNavn, Enum enumVerdi) { - return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi); + return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi.name()); } public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index d597b02fd64..cb03cee3d64 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -107,7 +107,7 @@ private String getArbeidsforhold(TenorRequest.Arbeidsforhold arbeidsforhold) { .append(convertObject("harPermisjoner", arbeidsforhold.getHarPermisjoner())) .append(convertObject("harPermitteringer", arbeidsforhold.getHarPermitteringer())) .append(convertObject("harArbeidsgiver", arbeidsforhold.getHarArbeidsgiver())) - .append(convertObject("harTimerMedLoenn", arbeidsforhold.getHarTimerMedTimeloenn())) + .append(convertObject("harTimerMedTimeloenn", arbeidsforhold.getHarTimerMedTimeloenn())) .append(convertObject("harUtenlandsopphold", arbeidsforhold.getHarUtenlandsopphold())) .append(convertObject("harHistorikk", arbeidsforhold.getHarHistorikk())) .append(convertEnum("arbeidsforholdtype", arbeidsforhold.getArbeidsforholdstype())) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 8997cd88fba..506c55993aa 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -89,7 +89,7 @@ public Mono getTestdata(TenorRequest searchData) { } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { - return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%sto%s]}" + return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%s to %s]}" .formatted( isNull(relasjonMedFoedselsaar.getFraOgMed()) ? "*" : relasjonMedFoedselsaar.getFraOgMed(), isNull(relasjonMedFoedselsaar.getTilOgMed()) ? "*" : relasjonMedFoedselsaar.getTilOgMed()); From f686a6be81d549ca0e98bacc0849275b5e754b19 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 15:10:22 +0100 Subject: [PATCH 51/69] Sonar + rettet feil V #deploy-tenor-search-service --- .../service/TenorEksterneRelasjonerUtility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index cb03cee3d64..ef1b8a45598 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -61,7 +61,7 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe return isNull(summertSkattegrunnlag) ? "" : " and tenorRelasjoner.summertSkattegrunnlag:{%s}".formatted(new StringBuilder() .append(convertObject(INNTEKTSAAR, summertSkattegrunnlag.getInntektsaar())) - .append(convertEnumWildcard(summertSkattegrunnlag.getStadietype())) + .append(convertEnum("stadie", summertSkattegrunnlag.getStadietype())) .append(convertEnum("typeOppgjoer", summertSkattegrunnlag.getOppgjoerstype())) .append(convertEnumWildcard(summertSkattegrunnlag.getTekniskNavn())) .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", @@ -72,7 +72,7 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe private String getSamletReskontroInnsyn(TenorRequest.SamletReskontroInnsyn samletReskontroInnsyn) { return isNull(samletReskontroInnsyn) ? "" : - " and tenorRelasjoner.samletReskontroinnsyn{%s}".formatted(new StringBuilder() + " and tenorRelasjoner.samletReskontroinnsyn:{%s}".formatted(new StringBuilder() .append(convertBooleanWildcard("harKrav", samletReskontroInnsyn.getHarKrav())) .append(convertBooleanWildcard("harInnbetaling", samletReskontroInnsyn.getHarInnbetaling())) .substring(5)); From 892d2ed1ec03f4a953c7d81fc01d368c968f4489 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Thu, 18 Jan 2024 15:27:00 +0100 Subject: [PATCH 52/69] Sonar + rettet feil VI #deploy-tenor-search-service --- .../testnav/apps/tenorsearchservice/domain/TenorRequest.java | 2 +- .../service/TenorEksterneRelasjonerUtility.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index fd79f368c68..7f0bc2e6983 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -79,7 +79,7 @@ public enum Arbeidsforholdstype { public enum Oppgjoerstype {Fastland, Svalbard, KildeskattPaaLoenn} - public enum Stadietype {Utkast, Fastsatt, Oppjoer} + public enum Stadietype {Utkast, Fastsatt, Oppgjoer} @Schema(description = "Personidentifikator, fødselsnummer eller d-nummer") private String identifikator; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index ef1b8a45598..a0fdc179c85 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -63,7 +63,7 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe .append(convertObject(INNTEKTSAAR, summertSkattegrunnlag.getInntektsaar())) .append(convertEnum("stadie", summertSkattegrunnlag.getStadietype())) .append(convertEnum("typeOppgjoer", summertSkattegrunnlag.getOppgjoerstype())) - .append(convertEnumWildcard(summertSkattegrunnlag.getTekniskNavn())) + .append(convertEnum("tekniskNavn", summertSkattegrunnlag.getTekniskNavn())) .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", summertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep())) .substring(5)); From e05e64dea8d2c2332f6057863416f8b34de92e0f Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 07:51:08 +0100 Subject: [PATCH 53/69] Refactor method calls in TenorEksterneRelasjonerUtility.java This commit addresses a bug in the method calls of TenorEksterneRelasjonerUtility.java. The `convertEnumWildcard` method calls have been replaced with `convertEnum` to properly handle 'stadie' and 'typeOppgjoer' enum types. --- .../service/TenorEksterneRelasjonerUtility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index a0fdc179c85..5896c300fc5 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -47,8 +47,8 @@ private String getSpesifisertSummertSkattegrunnlag(TenorRequest.SpesisfisertSumm return isNull(spesisfisertSummertSkattegrunnlag) ? "" : " and tenorRelasjoner.spesifisertSummertSkattegrunnlag:{%s}".formatted(new StringBuilder() .append(convertObject(INNTEKTSAAR, spesisfisertSummertSkattegrunnlag.getInntektsaar())) - .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getStadietype())) - .append(convertEnumWildcard(spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) + .append(convertEnum("stadie", spesisfisertSummertSkattegrunnlag.getStadietype())) + .append(convertEnum("typeOppgjoer", spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) .append(convertEnum("tekniskNavn", spesisfisertSummertSkattegrunnlag.getTekniskNavn())) .append(convertEnum("spesifiseringstype", spesisfisertSummertSkattegrunnlag.getSpesifiseringstype())) .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", From 97e77d73c60ab71c526f3decbb0023b70b3905f6 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 08:04:32 +0100 Subject: [PATCH 54/69] Sonar trivia + deploy #deploy-tenor-search-service --- .../service/TenorConverterUtility.java | 9 ++++++++- .../service/TenorEksterneRelasjonerUtility.java | 7 ++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java index abc60acd51a..30589cebd31 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -11,9 +11,16 @@ @UtilityClass public class TenorConverterUtility { + private static final String NOT_OPERATOR = " not "; + public static String convertBooleanSpecial(String navn, Boolean verdi) { - return isNull(verdi) ? "" : " and %s%s:*".formatted((isFalse(verdi) ? " not " : ""), navn); + return isNull(verdi) ? "" : " and %s%s:*".formatted(convertNotOperator(verdi), navn); + } + + private static String convertNotOperator(Boolean verdi) { + + return isFalse(verdi) ? NOT_OPERATOR : ""; } public static String convertEnumWildcard(Enum type) { diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index 5896c300fc5..8308e449d6b 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -20,6 +20,7 @@ public class TenorEksterneRelasjonerUtility { private static final String INNTEKTSAAR = "inntektsaar"; + private static final String TYPE_OPPGJOER = "typeOppgjoer"; private static final String AND = " and "; @@ -48,7 +49,7 @@ private String getSpesifisertSummertSkattegrunnlag(TenorRequest.SpesisfisertSumm " and tenorRelasjoner.spesifisertSummertSkattegrunnlag:{%s}".formatted(new StringBuilder() .append(convertObject(INNTEKTSAAR, spesisfisertSummertSkattegrunnlag.getInntektsaar())) .append(convertEnum("stadie", spesisfisertSummertSkattegrunnlag.getStadietype())) - .append(convertEnum("typeOppgjoer", spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) + .append(convertEnum(TYPE_OPPGJOER, spesisfisertSummertSkattegrunnlag.getOppgjoerstype())) .append(convertEnum("tekniskNavn", spesisfisertSummertSkattegrunnlag.getTekniskNavn())) .append(convertEnum("spesifiseringstype", spesisfisertSummertSkattegrunnlag.getSpesifiseringstype())) .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", @@ -62,7 +63,7 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe " and tenorRelasjoner.summertSkattegrunnlag:{%s}".formatted(new StringBuilder() .append(convertObject(INNTEKTSAAR, summertSkattegrunnlag.getInntektsaar())) .append(convertEnum("stadie", summertSkattegrunnlag.getStadietype())) - .append(convertEnum("typeOppgjoer", summertSkattegrunnlag.getOppgjoerstype())) + .append(convertEnum(TYPE_OPPGJOER, summertSkattegrunnlag.getOppgjoerstype())) .append(convertEnum("tekniskNavn", summertSkattegrunnlag.getTekniskNavn())) .append(convertIntervall("alminneligInntektFoerSaerfradragBeloep", summertSkattegrunnlag.getAlminneligInntektFoerSaerfradragBeloep())) @@ -93,7 +94,7 @@ private String getBeregnetSkatt(TenorRequest.BeregnetSkatt beregnetSkatt) { return isNull(beregnetSkatt) ? "" : " and tenorRelasjoner.beregnetSkatt:{%s}".formatted(new StringBuilder() .append(convertObject(INNTEKTSAAR, beregnetSkatt.getInntektsaar())) - .append(convertEnum("typeOppgjoer", beregnetSkatt.getOppgjoerstype())) + .append(convertEnum(TYPE_OPPGJOER, beregnetSkatt.getOppgjoerstype())) .append(convertObject("pensjonsgivendeInntekt", beregnetSkatt.getPensjonsgivendeInntekt())) .substring(5)); } From 608bf13ef64a9473fa45b9d41a2c58d7f898f08f Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 09:00:31 +0100 Subject: [PATCH 55/69] Sonar trivia + rettet feil deploy #deploy-tenor-search-service --- .../service/TenorConverterUtility.java | 23 ++++++++----------- .../TenorEksterneRelasjonerUtility.java | 6 ++--- .../service/TenorSearchService.java | 5 ++-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java index 30589cebd31..66d4934cd23 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorConverterUtility.java @@ -23,11 +23,6 @@ private static String convertNotOperator(Boolean verdi) { return isFalse(verdi) ? NOT_OPERATOR : ""; } - public static String convertEnumWildcard(Enum type) { - - return isNull(type) ? "" : " and %s:*".formatted(type.name()); - } - public static String convertObject(String navn, Object verdi) { return isNull(verdi) || verdi instanceof String string && isBlank(string) ? "" : " and %s:%s".formatted(navn, verdi); @@ -37,29 +32,31 @@ public static String convertIntervall(String intervallNavn, TenorRequest.Interva return isNull(intervall) ? "" : " and %s:[%s to %s]" .formatted(intervallNavn, - convertObject(intervall.getFraOgMed()), - convertObject(intervall.getTilOgMed())); + convertObjectWildCard(intervall.getFraOgMed()), + convertObjectWildCard(intervall.getTilOgMed())); } public static String convertPeriode(TenorRequest.MonthInterval intervall) { return isNull(intervall) ? "" : " and periode:[%s to %s]" .formatted( - convertObject(intervall.getFraOgMed()), - convertObject(intervall.getTilOgMed())); + convertObjectWildCard(intervall.getFraOgMed()), + convertObjectWildCard(intervall.getTilOgMed())); } public static String convertEnum(String enumNavn, Enum enumVerdi) { - return isNull(enumVerdi) ? "" : " and %s:%s".formatted(enumNavn, enumVerdi.name()); + return isNull(enumVerdi) ? "" : " and %s:%s%s".formatted(enumNavn, + enumVerdi.name().substring(0,1).toLowerCase(), + enumVerdi.name().substring(1)); } public static String convertDatoer(String datoNavn, TenorRequest.DatoIntervall datoIntervall) { return isNull(datoIntervall) ? "" : " and %s:[%s to %s]".formatted(datoNavn, - convertObject(datoIntervall.getFraOgMed()), - convertObject(datoIntervall.getTilOgMed())); + convertObjectWildCard(datoIntervall.getFraOgMed()), + convertObjectWildCard(datoIntervall.getTilOgMed())); } public static String convertBooleanWildcard(String booleanNavn, Boolean booleanVerdi) { @@ -67,7 +64,7 @@ public static String convertBooleanWildcard(String booleanNavn, Boolean booleanV return isNotTrue(booleanVerdi) ? "" : " and %s:*".formatted(booleanNavn); } - private static String convertObject(Object object) { + public static String convertObjectWildCard(Object object) { return isNull(object) ? "*" : object.toString(); } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index 8308e449d6b..cc7b3b402af 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -11,14 +11,13 @@ import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertBooleanWildcard; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertDatoer; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum; -import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnumWildcard; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertPeriode; @UtilityClass public class TenorEksterneRelasjonerUtility { - + private static final String INNTEKTSAAR = "inntektsaar"; private static final String TYPE_OPPGJOER = "typeOppgjoer"; private static final String AND = " and "; @@ -184,7 +183,7 @@ private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { new StringBuilder() .append(convertObject(INNTEKTSAAR, skatteplikt.getInntektsaar())) .append(getSkattepliktstyper(skatteplikt.getSkattepliktstyper())) - .append(convertEnumWildcard(skatteplikt.getSaerskiltSkatteplikt())) + .append(convertEnum("saerskiltSkatteplikt", skatteplikt.getSaerskiltSkatteplikt())) .substring(5)); } @@ -201,6 +200,7 @@ private String getSkattepliktstyper(List skattepl return skattepliktstyper.isEmpty() ? "" : AND + skattepliktstyper.stream() .map(Enum::name) + .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1))) .map("%s:*"::formatted) .collect(Collectors.joining(AND)); } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 506c55993aa..01f27408601 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -18,6 +18,7 @@ import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; +import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObjectWildCard; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Slf4j @@ -91,8 +92,8 @@ private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoed return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%s to %s]}" .formatted( - isNull(relasjonMedFoedselsaar.getFraOgMed()) ? "*" : relasjonMedFoedselsaar.getFraOgMed(), - isNull(relasjonMedFoedselsaar.getTilOgMed()) ? "*" : relasjonMedFoedselsaar.getTilOgMed()); + convertObjectWildCard(relasjonMedFoedselsaar.getFraOgMed()), + convertObjectWildCard(relasjonMedFoedselsaar.getTilOgMed())); } private String getRelasjon(TenorRequest.Relasjon relasjon) { From 1f1de4d97655248e1862956954284a8282391854 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 15:00:14 +0100 Subject: [PATCH 56/69] Sonar trivia + lagt til endepunkt for oppslag #deploy-tenor-search-service --- .../consumers/MaskinportenClient.java | 5 ++- .../tenorsearchservice/domain/Lookups.java | 38 +++++++++++++++++++ .../domain/TenorRequest.java | 2 +- .../provider/TenorSearchController.java | 30 +++++++-------- .../service/LookupService.java | 19 ++++++++++ .../TenorEksterneRelasjonerUtility.java | 6 ++- 6 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java index 7c0f22fac42..61bc44f20f1 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/MaskinportenClient.java @@ -15,8 +15,10 @@ import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetAccessTokenCommand; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetWellKnownCommand; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.AccessToken; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.server.ResponseStatusException; import reactor.core.publisher.Mono; import java.time.Duration; @@ -84,8 +86,7 @@ private SignedJWT createSignedJWT(RSAKey rsaJwk, JWTClaimsSet claimsSet) { signedJWT.sign(signer); return signedJWT; } catch (JOSEException e) { - throw new RuntimeException(e); + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Failed to sign JWT", e); } } - } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java new file mode 100644 index 00000000000..ab23d94d816 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java @@ -0,0 +1,38 @@ +package no.nav.testnav.apps.tenorsearchservice.domain; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public enum Lookups { + + AOrdningBeskrivelse(TenorRequest.AOrdningBeskrivelse.class), + AdresseGradering(TenorRequest.AdresseGradering.class), + Adressebeskyttelse(TenorRequest.Adressebeskyttelse.class), + Arbeidsforholdstype(TenorRequest.Arbeidsforholdstype.class), + BostedsadresseType(TenorRequest.BostedsadresseType.class), + CoAdresseType(TenorRequest.CoAdresseType.class), + Forskuddstrekk(TenorRequest.Forskuddstrekk.class), + Hendelse(no.nav.testnav.apps.tenorsearchservice.domain.Hendelse.class), + IdentifikatorType(TenorRequest.IdentifikatorType.class), + IdentitetsgrunnlagStatus(TenorRequest.IdentitetsgrunnlagStatus.class), + Inntektstype(TenorRequest.Inntektstype.class), + Kjoenn(TenorRequest.Kjoenn.class), + Oppgjoerstype(TenorRequest.Oppgjoerstype.class), + Personstatus(TenorRequest.Personstatus.class), + Relasjon(TenorRequest.Relasjon.class), + Roller(TenorRequest.Roller.class), + SaerskiltSkatteplikt(TenorRequest.SaerskiltSkatteplikt.class), + Sivilstatus(TenorRequest.Sivilstatus.class), + Skattemeldingstype(TenorRequest.Skattemeldingstype.class), + Skattepliktstype(TenorRequest.Skattepliktstype.class), + Spesifiseringstype(no.nav.testnav.apps.tenorsearchservice.domain.Spesifiseringstype.class), + Stadietype(TenorRequest.Stadietype.class), + TekniskNavn(no.nav.testnav.apps.tenorsearchservice.domain.TekniskNavn.class), + TilleggsskattType(TenorRequest.TilleggsskattType.class), + UtenlandskPersonIdentifikasjon(TenorRequest.UtenlandskPersonIdentifikasjon.class); + + private final Class value; +} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 7f0bc2e6983..f1a0ae3738d 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -223,7 +223,7 @@ public static class Skattemelding { public static class InntektAordningen { private MonthInterval periode; - private String opplysningspliktig; + private Integer opplysningspliktig; private List inntektstyper; private AOrdningBeskrivelse beskrivelse; private List forskuddstrekk; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index e20b2688755..94ad58fa919 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -3,23 +3,21 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient; import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken; +import no.nav.testnav.apps.tenorsearchservice.domain.Lookups; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; +import no.nav.testnav.apps.tenorsearchservice.service.LookupService; import no.nav.testnav.apps.tenorsearchservice.service.TenorSearchService; -import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.reactive.function.server.RequestPredicates; -import org.springframework.web.reactive.function.server.RouterFunction; -import org.springframework.web.reactive.function.server.RouterFunctions; -import org.springframework.web.reactive.function.server.ServerResponse; -import org.webjars.NotFoundException; import reactor.core.publisher.Mono; +import java.util.List; + @RestController @RequestMapping("/api/v1/tenor") @RequiredArgsConstructor @@ -27,21 +25,26 @@ public class TenorSearchController { private final TenorSearchService tenorSearchService; private final MaskinportenClient maskinportenClient; + private final LookupService lookupService; @GetMapping("/testdata/raw") public Mono getTestdata(@RequestParam(required = false) String searchData) { return tenorSearchService - .getTestdata(searchData) - .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); + .getTestdata(searchData); } @PostMapping("/testdata") public Mono getTestdata(@RequestBody TenorRequest searchData) { return tenorSearchService - .getTestdata(searchData) - .switchIfEmpty(Mono.error(new NotFoundException("Spørring " + searchData + " ga ingen treff"))); + .getTestdata(searchData); + } + + @GetMapping("/testdata/domain") + public List getTestdataDomain(@RequestParam Lookups lookup) { + + return lookupService.getLookup(lookup); } @GetMapping("/testdata/token") @@ -50,11 +53,4 @@ public Mono getToken() { return maskinportenClient.getAccessToken() .map(AccessToken::value); } - - @Bean - public RouterFunction notFound() { - return RouterFunctions - .route(RequestPredicates.GET("/statuses/not-found"), - request -> ServerResponse.notFound().build()); - } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java new file mode 100644 index 00000000000..8aa91a61b12 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java @@ -0,0 +1,19 @@ +package no.nav.testnav.apps.tenorsearchservice.service; + +import no.nav.testnav.apps.tenorsearchservice.domain.Lookups; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +@Service +public class LookupService { + + public List getLookup(Lookups lookup) { + + return Arrays.stream(lookup.getValue().getEnumConstants()) + .map(Object::toString) + .sorted() + .toList(); + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index cc7b3b402af..7918c0b4fba 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -14,6 +14,7 @@ import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertPeriode; +import static org.apache.commons.lang3.BooleanUtils.isNotTrue; @UtilityClass public class TenorEksterneRelasjonerUtility { @@ -71,7 +72,8 @@ private String getSummertSkattegrunnlag(TenorRequest.SummertSkattegrunnlag summe private String getSamletReskontroInnsyn(TenorRequest.SamletReskontroInnsyn samletReskontroInnsyn) { - return isNull(samletReskontroInnsyn) ? "" : + return isNull(samletReskontroInnsyn) || + (isNotTrue(samletReskontroInnsyn.getHarKrav()) && isNotTrue(samletReskontroInnsyn.getHarInnbetaling())) ? "" : " and tenorRelasjoner.samletReskontroinnsyn:{%s}".formatted(new StringBuilder() .append(convertBooleanWildcard("harKrav", samletReskontroInnsyn.getHarKrav())) .append(convertBooleanWildcard("harInnbetaling", samletReskontroInnsyn.getHarInnbetaling())) @@ -142,6 +144,7 @@ private String getForskuddstrekk(List forskuddstrek return forskuddstrekk1.isEmpty() ? "" : " and forskuddstrekk:(%s)" .formatted(forskuddstrekk1.stream() .map(Enum::name) + .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1))) .collect(Collectors.joining(AND))); } @@ -150,6 +153,7 @@ private String getInntektstyper(List inntektstyper) { return inntektstyper.isEmpty() ? "" : " and inntektstype:(%s)" .formatted(inntektstyper.stream() .map(Enum::name) + .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1))) .collect(Collectors.joining(AND))); } From 4b5bf258f5055b6448b061ca2569708d1a1aa32d Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 15:16:21 +0100 Subject: [PATCH 57/69] Rettet feil #deploy-tenor-search-service --- .../service/TenorEksterneRelasjonerUtility.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index 7918c0b4fba..1842c100734 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -196,6 +196,8 @@ private String getTilleggsskattTyper(List tilleg return tilleggsskattTyper.isEmpty() ? "" : AND + tilleggsskattTyper.stream() .map(Enum::name) + .map(type -> "%s%s".formatted(type.substring(0,1).toLowerCase(), type.substring(1))) + .map("%s:*"::formatted) .collect(Collectors.joining(AND)); } From c5675b42eb16cd83dffdd7d11f052d47ccafd01c Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 15:49:21 +0100 Subject: [PATCH 58/69] Rettet feil + oppdatert personidentifikator #deploy-tenor-search-service --- .../tenorsearchservice/domain/TenorRequest.java | 2 +- .../service/TenorSearchService.java | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index f1a0ae3738d..7eceb9e1a33 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -16,7 +16,7 @@ @SuppressWarnings("java:S115") public class TenorRequest { - public enum IdentifikatorType {FNR, DNR, FNR_TIDLIGERE_DNR} + public enum IdentifikatorType {Foedselsnummer, DNummer, FoedselsnummerOgTidligereDNummer} public enum Kjoenn {Mann, Kvinne} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 01f27408601..3225205b7e3 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -36,7 +36,7 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertObject("identifikator", searchData.getIdentifikator())) .append(convertDatoer("foedselsdato", searchData.getFoedselsdato())) .append(convertDatoer("doedsdato", searchData.getDoedsdato())) - .append(getIdentifikatorType(searchData.getIdentifikatorType())) + .append(convertEnum("identifikatorType", searchData.getIdentifikatorType())) .append(convertEnum("kjoenn", searchData.getKjoenn())) .append(convertEnum("personstatus", searchData.getPersonstatus())) .append(convertEnum("sivilstatus", searchData.getSivilstatus())) @@ -85,8 +85,8 @@ public Mono getTestdata(TenorRequest searchData) { } builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); - log.info("Søker med query: {}", builder.substring(5)); - return tenorClient.getTestdata(!builder.isEmpty() ? builder.substring(5) : ""); + var query = builder.substring(0, builder.isEmpty() ? 0 : 5); + return tenorClient.getTestdata(query); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { @@ -106,13 +106,4 @@ private String getUtenlandskPersonidentifikasjon(List "foedselsnummer"; - case DNR -> "dNummer"; - case FNR_TIDLIGERE_DNR -> "foedselsnummerOgTidligereDNummer"; - }); - } } From 48108b72b20009afa27b01cbe23f6ec158b94c7a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 16:43:24 +0100 Subject: [PATCH 59/69] Rettet feil #deploy-tenor-search-service --- .../apps/tenorsearchservice/service/TenorSearchService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 3225205b7e3..3a76b062ee8 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -85,7 +85,7 @@ public Mono getTestdata(TenorRequest searchData) { } builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); - var query = builder.substring(0, builder.isEmpty() ? 0 : 5); + var query = builder.substring(builder.isEmpty() ? 0 : 5, builder.length()); return tenorClient.getTestdata(query); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { From 5f017b1d0afdbeaa9e3c3d766f131ca6754243f2 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Fri, 19 Jan 2024 16:52:39 +0100 Subject: [PATCH 60/69] Rettet feil II #deploy-tenor-search-service --- .../testnav/apps/tenorsearchservice/domain/TenorRequest.java | 2 +- .../testnav/apps/tenorsearchservice/service/LookupService.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 7eceb9e1a33..95ac55c0ed6 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -16,7 +16,7 @@ @SuppressWarnings("java:S115") public class TenorRequest { - public enum IdentifikatorType {Foedselsnummer, DNummer, FoedselsnummerOgTidligereDNummer} + public enum IdentifikatorType {Foedselsnummer, DNummer, DNummerOgFoedselsnr} public enum Kjoenn {Mann, Kvinne} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java index 8aa91a61b12..36582b04335 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/LookupService.java @@ -13,7 +13,6 @@ public List getLookup(Lookups lookup) { return Arrays.stream(lookup.getValue().getEnumConstants()) .map(Object::toString) - .sorted() .toList(); } } From dd6a863e36137097d85ac1e2f89618edfc9d3328 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Mon, 22 Jan 2024 08:21:55 +0100 Subject: [PATCH 61/69] Rettet feil III #deploy-tenor-search-service --- .../apps/tenorsearchservice/domain/TenorRequest.java | 1 - .../tenorsearchservice/service/TenorSearchService.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index 95ac55c0ed6..cb791c2cf28 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -163,7 +163,6 @@ public static class Navn { public static class Adresser { @Schema(description = "Adressesøk, fritekst") - private String bostedsadresseFritekst; private AdresseGradering adresseGradering; private Integer kommunenummer; private Boolean harBostedsadresse; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 3a76b062ee8..4aa8e2e12f1 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -42,8 +42,8 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertEnum("sivilstatus", searchData.getSivilstatus())) .append(getUtenlandskPersonidentifikasjon(searchData.getUtenlandskPersonIdentifikasjon())) .append(convertEnum("identitetsgrunnlagStatus", searchData.getIdentitetsgrunnlagStatus())) - .append(convertEnum("adressebeskyttelse", searchData.getAdressebeskyttelse())) - .append(convertObject("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument())) + .append(convertEnum("adresseBeskyttelse", searchData.getAdressebeskyttelse())) + .append(convertBooleanWildcard("legitimasjonsdokument", searchData.getHarLegitimasjonsdokument())) .append(convertObject("falskIdentitet", searchData.getHarFalskIdentitet())) .append(convertObject("norskStatsborgerskap", searchData.getHarNorskStatsborgerskap())) .append(convertObject("flereStatsborgerskap", searchData.getHarFlereStatsborgerskap())); @@ -56,7 +56,8 @@ public Mono getTestdata(TenorRequest searchData) { } if (nonNull(searchData.getAdresser())) { - builder.append(convertObject("bostedsadresse", searchData.getAdresser().getBostedsadresseFritekst())) + builder.append(convertEnum("adresseGradering", searchData.getAdresser().getAdresseGradering())) + .append(convertObject("kommunenr", searchData.getAdresser().getKommunenummer())) .append(convertBooleanWildcard("bostedsadresse", searchData.getAdresser().getHarBostedsadresse())) .append(convertBooleanWildcard("oppholdAnnetSted", searchData.getAdresser().getHarOppholdAnnetSted())) .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge())) From 034c1b17e56d99a034c3b8d36da493314ef5f7a9 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Mon, 22 Jan 2024 13:48:37 +0100 Subject: [PATCH 62/69] Rettet feil + lagt til funksjonalitet #deploy-tenor-search-service --- .../testnav/apps/tenorsearchservice/domain/Lookups.java | 2 -- .../apps/tenorsearchservice/domain/TenorRequest.java | 8 +------- .../tenorsearchservice/service/TenorSearchService.java | 7 +++---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java index ab23d94d816..2586bd2c3aa 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java @@ -12,8 +12,6 @@ public enum Lookups { AdresseGradering(TenorRequest.AdresseGradering.class), Adressebeskyttelse(TenorRequest.Adressebeskyttelse.class), Arbeidsforholdstype(TenorRequest.Arbeidsforholdstype.class), - BostedsadresseType(TenorRequest.BostedsadresseType.class), - CoAdresseType(TenorRequest.CoAdresseType.class), Forskuddstrekk(TenorRequest.Forskuddstrekk.class), Hendelse(no.nav.testnav.apps.tenorsearchservice.domain.Hendelse.class), IdentifikatorType(TenorRequest.IdentifikatorType.class), diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index cb791c2cf28..c00e3a1e289 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -36,11 +36,6 @@ public enum AdresseGradering {Ugradert, Klientadresse, Fortrolig} public enum Relasjon {Barn, Far, Medmor, Mor, Partner} - - public enum BostedsadresseType {Vegadresse, Matrikkeladresse, Ukjent} - - public enum CoAdresseType {Bostedsadresse, DeltBosted, Oppholdsadresse, Postadresse, PostadresseIUtlandet} - public enum Skattemeldingstype {KunUtkast, UtkastOgFastsatt} public enum Inntektstype {Loennsinntekt, Naeringsinntekt, PensjonEllerTrygd, YtelseFraOffentlige} @@ -171,8 +166,6 @@ public static class Adresser { private Boolean harPostadresseUtland; private Boolean harKontaktadresseDoedsbo; private Boolean harAdresseSpesialtegn; - private BostedsadresseType bostedsadresseType; - private CoAdresseType coAdresseType; } @Data @@ -188,6 +181,7 @@ public static class Relasjoner { private Boolean borMedMor; private Boolean borMedFar; private Boolean borMedMedmor; + private Boolean foreldreHarSammeAdresse; } @Data diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 4aa8e2e12f1..f3cd661abdb 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -63,9 +63,7 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertBooleanWildcard("postadresse", searchData.getAdresser().getHarPostadresseNorge())) .append(convertBooleanWildcard("postadresseUtland", searchData.getAdresser().getHarPostadresseUtland())) .append(convertBooleanWildcard("kontaktinfoDoedsbo", searchData.getAdresser().getHarKontaktadresseDoedsbo())) - .append(convertObject("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())) - .append(convertEnum("bostedsadresseType", searchData.getAdresser().getBostedsadresseType())) - .append(convertEnum("coAdressenavnType", searchData.getAdresser().getCoAdresseType())); + .append(convertObject("adresseSpesialtegn", searchData.getAdresser().getHarAdresseSpesialtegn())); } if (nonNull(searchData.getRelasjoner())) { @@ -77,7 +75,8 @@ public Mono getTestdata(TenorRequest searchData) { .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())) .append(convertObject("borMedFar", searchData.getRelasjoner().getBorMedFar())) .append(convertObject("borMedMor", searchData.getRelasjoner().getBorMedMor())) - .append(convertObject("borMedMedMor", searchData.getRelasjoner().getBorMedMedmor())); + .append(convertObject("borMedMedmor", searchData.getRelasjoner().getBorMedMedmor())) + .append(convertObject("foreldreHarSammeAdresse", searchData.getRelasjoner().getForeldreHarSammeAdresse())); } if (nonNull(searchData.getHendelser())) { From 204f90020370d49d1acdafade26bc4f31fdf7c3f Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Mon, 22 Jan 2024 15:13:40 +0100 Subject: [PATCH 63/69] Rettet feil + lagt til nytt parameter #deploy-tenor-search-service --- .../consumers/TenorClient.java | 5 ++-- .../consumers/command/GetTenorTestdata.java | 25 ++++++++++++++++--- .../consumers/dto/InfoType.java | 8 ++++++ .../provider/TenorSearchController.java | 11 +++++--- .../service/TenorSearchService.java | 9 ++++--- 5 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index cf054537f93..7dba345d2b5 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -3,6 +3,7 @@ import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; @@ -24,9 +25,9 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.maskinportenClient = maskinportenClient; } - public Mono getTestdata(String query) { + public Mono getTestdata(String query, InfoType type) { return maskinportenClient.getAccessToken() - .flatMap(token -> new GetTenorTestdata(webClient, query, token.value()).call()); + .flatMap(token -> new GetTenorTestdata(webClient, query, type, token.value()).call()); } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 2cf4b35fcec..f7f109db9af 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; @@ -15,27 +16,33 @@ import java.util.Map; import java.util.concurrent.Callable; +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; + @Slf4j @RequiredArgsConstructor public class GetTenorTestdata implements Callable> { - private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/freg"; + private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/{kilde}"; + private static final String TENOR_UTVIDET_QUERY_URL = "/api/testnorge/v2/soek/{kilde}/utvidet"; private final WebClient webClient; private final String query; + private final InfoType type; private final String token; @Override public Mono call() { log.info("Query-parameter: {}", query); - var requestParams = Map.of("tenorQuery", query); + var requestParams = Map.of("tenorQuery", query, + "kilde", "freg"); return webClient.get() .uri(uriBuilder -> uriBuilder - .path(TENOR_QUERY_URL) + .path(getUrl(type)) .queryParam("kql", "{tenorQuery}") - .queryParam("nokkelinformasjon", true) + .queryParam("nokkelinformasjon", isNoekkelinfo(type)) .build(requestParams)) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() @@ -52,4 +59,14 @@ public Mono call() { .error(WebClientFilter.getMessage(error)) .build())); } + + private String getUrl(InfoType type) { + + return isNull(type) || type != InfoType.Kildedokument ? TENOR_QUERY_URL : TENOR_UTVIDET_QUERY_URL; + } + + private boolean isNoekkelinfo(InfoType type) { + + return nonNull(type) && type == InfoType.Noekkelinfo; + } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java new file mode 100644 index 00000000000..a23b7dd1673 --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java @@ -0,0 +1,8 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.dto; + +public enum InfoType { + + IdenterKun, + Noekkelinfo, + Kildedokument +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 94ad58fa919..0a3611e2aa8 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -2,6 +2,7 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken; import no.nav.testnav.apps.tenorsearchservice.domain.Lookups; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; @@ -28,17 +29,19 @@ public class TenorSearchController { private final LookupService lookupService; @GetMapping("/testdata/raw") - public Mono getTestdata(@RequestParam(required = false) String searchData) { + public Mono getTestdata(@RequestParam(required = false) String searchData, + @RequestParam(required = false) InfoType type) { return tenorSearchService - .getTestdata(searchData); + .getTestdata(searchData, type); } @PostMapping("/testdata") - public Mono getTestdata(@RequestBody TenorRequest searchData) { + public Mono getTestdata(@RequestBody TenorRequest searchData, + @RequestParam(required = false) InfoType type) { return tenorSearchService - .getTestdata(searchData); + .getTestdata(searchData, type); } @GetMapping("/testdata/domain") diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index f3cd661abdb..17d9d0a3bb6 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; @@ -26,11 +27,11 @@ @RequiredArgsConstructor public class TenorSearchService { private final TenorClient tenorClient; - public Mono getTestdata(String testDataQuery) { + public Mono getTestdata(String testDataQuery, InfoType type) { - return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : ""); + return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", type); } - public Mono getTestdata(TenorRequest searchData) { + public Mono getTestdata(TenorRequest searchData, InfoType type) { var builder = new StringBuilder() .append(convertObject("identifikator", searchData.getIdentifikator())) @@ -86,7 +87,7 @@ public Mono getTestdata(TenorRequest searchData) { builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); var query = builder.substring(builder.isEmpty() ? 0 : 5, builder.length()); - return tenorClient.getTestdata(query); + return tenorClient.getTestdata(query, type); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { From 667a61c28af92629b0b08d71ccba6a98775e4de2 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 23 Jan 2024 11:36:13 +0100 Subject: [PATCH 64/69] Lagt til nye parametere for soek #deploy-tenor-search-service --- .../consumers/TenorClient.java | 5 +++-- .../consumers/command/GetTenorTestdata.java | 12 +++++++++++- .../tenorsearchservice/consumers/dto/Kilde.java | 16 ++++++++++++++++ .../provider/TenorSearchController.java | 13 +++++++++---- .../service/TenorSearchService.java | 14 ++++++++++---- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 7dba345d2b5..391dcc16e1c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -4,6 +4,7 @@ import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; @@ -25,9 +26,9 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.maskinportenClient = maskinportenClient; } - public Mono getTestdata(String query, InfoType type) { + public Mono getTestdata(String query, Kilde kilde, InfoType type, Integer seed) { return maskinportenClient.getAccessToken() - .flatMap(token -> new GetTenorTestdata(webClient, query, type, token.value()).call()); + .flatMap(token -> new GetTenorTestdata(webClient, query, kilde, type, seed, token.value()).call()); } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index f7f109db9af..40c57d96f94 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.http.HttpHeaders; @@ -14,6 +15,7 @@ import java.time.Duration; import java.util.Map; +import java.util.Optional; import java.util.concurrent.Callable; import static java.util.Objects.isNull; @@ -28,7 +30,9 @@ public class GetTenorTestdata implements Callable> { private final WebClient webClient; private final String query; + private final Kilde kilde; private final InfoType type; + private final Integer seed; private final String token; @Override @@ -36,13 +40,14 @@ public Mono call() { log.info("Query-parameter: {}", query); var requestParams = Map.of("tenorQuery", query, - "kilde", "freg"); + "kilde", getKilde(kilde).getKilde()); return webClient.get() .uri(uriBuilder -> uriBuilder .path(getUrl(type)) .queryParam("kql", "{tenorQuery}") .queryParam("nokkelinformasjon", isNoekkelinfo(type)) + .queryParamIfPresent("seed", Optional.ofNullable(seed)) .build(requestParams)) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() @@ -60,6 +65,11 @@ public Mono call() { .build())); } + private Kilde getKilde(Kilde kilde) { + + return isNull(kilde) ? Kilde.FREG : kilde; + } + private String getUrl(InfoType type) { return isNull(type) || type != InfoType.Kildedokument ? TENOR_QUERY_URL : TENOR_UTVIDET_QUERY_URL; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java new file mode 100644 index 00000000000..0459d60696d --- /dev/null +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java @@ -0,0 +1,16 @@ +package no.nav.testnav.apps.tenorsearchservice.consumers.dto; + +import lombok.Getter; + +@Getter +public enum Kilde { + + FREG("freg"), + FORETAKSREGISTRET("brreg-er-fr"); + + private final String kilde; + + Kilde(String kilde) { + this.kilde = kilde; + } +} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 0a3611e2aa8..95cbdf72dbb 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import no.nav.testnav.apps.tenorsearchservice.consumers.MaskinportenClient; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde; import no.nav.testnav.apps.tenorsearchservice.domain.AccessToken; import no.nav.testnav.apps.tenorsearchservice.domain.Lookups; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; @@ -30,18 +31,22 @@ public class TenorSearchController { @GetMapping("/testdata/raw") public Mono getTestdata(@RequestParam(required = false) String searchData, - @RequestParam(required = false) InfoType type) { + @RequestParam(required = false) Kilde kilde, + @RequestParam(required = false) InfoType type, + @RequestParam(required = false) Integer seed) { return tenorSearchService - .getTestdata(searchData, type); + .getTestdata(searchData, kilde, type, seed); } @PostMapping("/testdata") public Mono getTestdata(@RequestBody TenorRequest searchData, - @RequestParam(required = false) InfoType type) { + @RequestParam(required = false) Kilde kilde, + @RequestParam(required = false) InfoType type, + @RequestParam(required = false) Integer seed) { return tenorSearchService - .getTestdata(searchData, type); + .getTestdata(searchData, kilde, type, seed); } @GetMapping("/testdata/domain") diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 17d9d0a3bb6..1108065fa5a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.consumers.TenorClient; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; +import no.nav.testnav.apps.tenorsearchservice.consumers.dto.Kilde; import no.nav.testnav.apps.tenorsearchservice.domain.TenorRequest; import no.nav.testnav.apps.tenorsearchservice.domain.TenorResponse; import org.springframework.stereotype.Service; @@ -27,11 +28,13 @@ @RequiredArgsConstructor public class TenorSearchService { private final TenorClient tenorClient; - public Mono getTestdata(String testDataQuery, InfoType type) { - return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", type); + public Mono getTestdata(String testDataQuery, Kilde kilde, InfoType type, Integer seed) { + + return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", kilde, type, seed); } - public Mono getTestdata(TenorRequest searchData, InfoType type) { + + public Mono getTestdata(TenorRequest searchData, Kilde kilde, InfoType type, Integer seed) { var builder = new StringBuilder() .append(convertObject("identifikator", searchData.getIdentifikator())) @@ -87,8 +90,9 @@ public Mono getTestdata(TenorRequest searchData, InfoType type) { builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); var query = builder.substring(builder.isEmpty() ? 0 : 5, builder.length()); - return tenorClient.getTestdata(query, type); + return tenorClient.getTestdata(query, kilde, type, seed); } + private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%s to %s]}" @@ -96,10 +100,12 @@ private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoed convertObjectWildCard(relasjonMedFoedselsaar.getFraOgMed()), convertObjectWildCard(relasjonMedFoedselsaar.getTilOgMed())); } + private String getRelasjon(TenorRequest.Relasjon relasjon) { return isNull(relasjon) ? "" : " and tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); } + private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { return (utenlandskPersonIdentifikasjon.isEmpty()) ? "" : " and utenlandskPersonidentifikasjon:(%s)" From cd7fd4c2905b10f9693793066441ebb438332100 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 23 Jan 2024 13:11:28 +0100 Subject: [PATCH 65/69] Lagt til nye parametere for soek II #deploy-tenor-search-service --- .../consumers/TenorClient.java | 4 +-- .../consumers/command/GetTenorTestdata.java | 29 +++++++++++++------ .../consumers/dto/InfoType.java | 5 ++-- .../provider/TenorSearchController.java | 6 ++-- .../service/TenorSearchService.java | 8 ++--- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index 391dcc16e1c..f92c03fd505 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -26,9 +26,9 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.maskinportenClient = maskinportenClient; } - public Mono getTestdata(String query, Kilde kilde, InfoType type, Integer seed) { + public Mono getTestdata(String query, Kilde kilde, InfoType type, String fields, Integer seed) { return maskinportenClient.getAccessToken() - .flatMap(token -> new GetTenorTestdata(webClient, query, kilde, type, seed, token.value()).call()); + .flatMap(token -> new GetTenorTestdata(webClient, query, kilde, type, fields, seed, token.value()).call()); } } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 40c57d96f94..d94e35a0bec 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -26,12 +26,12 @@ public class GetTenorTestdata implements Callable> { private static final String TENOR_QUERY_URL = "/api/testnorge/v2/soek/{kilde}"; - private static final String TENOR_UTVIDET_QUERY_URL = "/api/testnorge/v2/soek/{kilde}/utvidet"; private final WebClient webClient; private final String query; private final Kilde kilde; private final InfoType type; + private final String fields; private final Integer seed; private final String token; @@ -39,15 +39,17 @@ public class GetTenorTestdata implements Callable> { public Mono call() { log.info("Query-parameter: {}", query); - var requestParams = Map.of("tenorQuery", query, - "kilde", getKilde(kilde).getKilde()); + var requestParams = Map.of( + "kilde", getKilde(kilde).getKilde(), + "query", query); return webClient.get() .uri(uriBuilder -> uriBuilder - .path(getUrl(type)) - .queryParam("kql", "{tenorQuery}") + .path(TENOR_QUERY_URL) + .queryParam("kql", "{query}") .queryParam("nokkelinformasjon", isNoekkelinfo(type)) .queryParamIfPresent("seed", Optional.ofNullable(seed)) + .queryParamIfPresent("vis", Optional.ofNullable(getVisning(type))) .build(requestParams)) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() @@ -65,14 +67,23 @@ public Mono call() { .build())); } - private Kilde getKilde(Kilde kilde) { + private String getVisning(InfoType type) { - return isNull(kilde) ? Kilde.FREG : kilde; + if (nonNull(type)) { + return switch (type) { + case Kildedata -> "tenorMetadata.kildedata"; + case AlleFelter -> "*"; + case Spesifikt -> fields; + default -> null; + }; + } else { + return null; + } } - private String getUrl(InfoType type) { + private Kilde getKilde(Kilde kilde) { - return isNull(type) || type != InfoType.Kildedokument ? TENOR_QUERY_URL : TENOR_UTVIDET_QUERY_URL; + return isNull(kilde) ? Kilde.FREG : kilde; } private boolean isNoekkelinfo(InfoType type) { diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java index a23b7dd1673..88c28c09237 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java @@ -1,8 +1,9 @@ package no.nav.testnav.apps.tenorsearchservice.consumers.dto; public enum InfoType { - IdenterKun, Noekkelinfo, - Kildedokument + Kildedata, + AlleFelter, + Spesifikt } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java index 95cbdf72dbb..3407bbf1f97 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/provider/TenorSearchController.java @@ -33,20 +33,22 @@ public class TenorSearchController { public Mono getTestdata(@RequestParam(required = false) String searchData, @RequestParam(required = false) Kilde kilde, @RequestParam(required = false) InfoType type, + @RequestParam(required = false) String fields, @RequestParam(required = false) Integer seed) { return tenorSearchService - .getTestdata(searchData, kilde, type, seed); + .getTestdata(searchData, kilde, type, fields, seed); } @PostMapping("/testdata") public Mono getTestdata(@RequestBody TenorRequest searchData, @RequestParam(required = false) Kilde kilde, @RequestParam(required = false) InfoType type, + @RequestParam(required = false) String fields, @RequestParam(required = false) Integer seed) { return tenorSearchService - .getTestdata(searchData, kilde, type, seed); + .getTestdata(searchData, kilde, type, fields, seed); } @GetMapping("/testdata/domain") diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index 1108065fa5a..d0666375e93 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -29,12 +29,12 @@ public class TenorSearchService { private final TenorClient tenorClient; - public Mono getTestdata(String testDataQuery, Kilde kilde, InfoType type, Integer seed) { + public Mono getTestdata(String testDataQuery, Kilde kilde, InfoType type, String fields, Integer seed) { - return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", kilde, type, seed); + return tenorClient.getTestdata(isNotBlank(testDataQuery) ? testDataQuery : "", kilde, type, fields, seed); } - public Mono getTestdata(TenorRequest searchData, Kilde kilde, InfoType type, Integer seed) { + public Mono getTestdata(TenorRequest searchData, Kilde kilde, InfoType type, String fields, Integer seed) { var builder = new StringBuilder() .append(convertObject("identifikator", searchData.getIdentifikator())) @@ -90,7 +90,7 @@ public Mono getTestdata(TenorRequest searchData, Kilde kilde, Inf builder.append(TenorEksterneRelasjonerUtility.getEksterneRelasjoner(searchData)); var query = builder.substring(builder.isEmpty() ? 0 : 5, builder.length()); - return tenorClient.getTestdata(query, kilde, type, seed); + return tenorClient.getTestdata(query, kilde, type, fields, seed); } private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { From f840cdd3f5cde1b592289b298e035ffc5d4c100a Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 23 Jan 2024 14:29:45 +0100 Subject: [PATCH 66/69] Feilretting #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index d94e35a0bec..a2e8dbe8c55 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -20,6 +20,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; +import static org.apache.logging.log4j.util.Strings.isNotBlank; @Slf4j @RequiredArgsConstructor @@ -41,7 +42,8 @@ public Mono call() { log.info("Query-parameter: {}", query); var requestParams = Map.of( "kilde", getKilde(kilde).getKilde(), - "query", query); + "query", query, + "alle", "*"); return webClient.get() .uri(uriBuilder -> uriBuilder @@ -72,8 +74,8 @@ private String getVisning(InfoType type) { if (nonNull(type)) { return switch (type) { case Kildedata -> "tenorMetadata.kildedata"; - case AlleFelter -> "*"; - case Spesifikt -> fields; + case AlleFelter -> "{alle}"; + case Spesifikt -> isNotBlank(fields) ? fields : "id"; default -> null; }; } else { From 403435e29675082c1b1538f1ecd91e2189aadeb9 Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Tue, 23 Jan 2024 14:56:16 +0100 Subject: [PATCH 67/69] Sonar trivia #deploy-tenor-search-service --- .../consumers/command/GetTenorTestdata.java | 2 +- .../apps/tenorsearchservice/consumers/dto/InfoType.java | 1 + .../apps/tenorsearchservice/consumers/dto/Kilde.java | 6 +++--- .../nav/testnav/apps/tenorsearchservice/domain/Lookups.java | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index a2e8dbe8c55..9cdc41d3e2c 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -41,7 +41,7 @@ public Mono call() { log.info("Query-parameter: {}", query); var requestParams = Map.of( - "kilde", getKilde(kilde).getKilde(), + "kilde", getKilde(kilde).getTenorKilde(), "query", query, "alle", "*"); diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java index 88c28c09237..1c38ab34e20 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/InfoType.java @@ -1,5 +1,6 @@ package no.nav.testnav.apps.tenorsearchservice.consumers.dto; +@SuppressWarnings("java:S115") public enum InfoType { IdenterKun, Noekkelinfo, diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java index 0459d60696d..2dd7f055213 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/dto/Kilde.java @@ -8,9 +8,9 @@ public enum Kilde { FREG("freg"), FORETAKSREGISTRET("brreg-er-fr"); - private final String kilde; + private final String tenorKilde; - Kilde(String kilde) { - this.kilde = kilde; + Kilde(String tenorKilde) { + this.tenorKilde = tenorKilde; } } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java index 2586bd2c3aa..a06f4026e49 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/Lookups.java @@ -5,6 +5,7 @@ import lombok.Getter; @Getter +@SuppressWarnings("java:S115") @AllArgsConstructor(access = AccessLevel.PRIVATE) public enum Lookups { From a584704796b8659ed55bc95fb29436e58620bedd Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 24 Jan 2024 13:39:08 +0100 Subject: [PATCH 68/69] Rettet feil #deploy-tenor-search-service --- .../config/JacksonConfig.java | 27 ------------------- .../consumers/TenorClient.java | 4 +-- .../consumers/command/GetTenorTestdata.java | 11 +++++++- .../domain/TenorRequest.java | 2 +- .../domain/TenorResponse.java | 1 + .../TenorEksterneRelasjonerUtility.java | 5 +++- .../service/TenorSearchService.java | 21 ++++++--------- 7 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java deleted file mode 100644 index 2c9f6771716..00000000000 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/config/JacksonConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package no.nav.testnav.apps.tenorsearchservice.config; - -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.codec.ServerCodecConfigurer; -import org.springframework.http.codec.json.Jackson2JsonDecoder; -import org.springframework.http.codec.json.Jackson2JsonEncoder; -import org.springframework.web.reactive.config.WebFluxConfigurer; - -@Configuration -@RequiredArgsConstructor -public class JacksonConfig implements WebFluxConfigurer { - - private final ObjectMapper objectMapper; - - @Override - public void configureHttpMessageCodecs(ServerCodecConfigurer configurer) { - configurer.defaultCodecs().jackson2JsonEncoder( - new Jackson2JsonEncoder(objectMapper) - ); - - configurer.defaultCodecs().jackson2JsonDecoder( - new Jackson2JsonDecoder(objectMapper) - ); - } -} \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java index f92c03fd505..80083b0abef 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/TenorClient.java @@ -1,6 +1,5 @@ package no.nav.testnav.apps.tenorsearchservice.consumers; -import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tenorsearchservice.config.Consumers; import no.nav.testnav.apps.tenorsearchservice.consumers.command.GetTenorTestdata; import no.nav.testnav.apps.tenorsearchservice.consumers.dto.InfoType; @@ -10,7 +9,6 @@ import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; -@Slf4j @Service public class TenorClient { @@ -22,6 +20,8 @@ public TenorClient(Consumers consumers, MaskinportenClient maskinportenClient) { this.webClient = WebClient .builder() .baseUrl(consumers.getTenorSearchService().getUrl()) + .codecs(configurer -> configurer.defaultCodecs() + .maxInMemorySize(32 * 1024 * 1024)) .build(); this.maskinportenClient = maskinportenClient; } diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java index 9cdc41d3e2c..f2781a8ac9b 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/consumers/command/GetTenorTestdata.java @@ -52,6 +52,7 @@ public Mono call() { .queryParam("nokkelinformasjon", isNoekkelinfo(type)) .queryParamIfPresent("seed", Optional.ofNullable(seed)) .queryParamIfPresent("vis", Optional.ofNullable(getVisning(type))) + .queryParamIfPresent("skjul", Optional.ofNullable(getSkjul(type))) .build(requestParams)) .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() @@ -59,6 +60,7 @@ public Mono call() { .map(response -> TenorResponse.builder() .status(HttpStatus.OK) .data(response) + .query(query) .build()) .doOnError(WebClientFilter::logErrorMessage) .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) @@ -66,14 +68,21 @@ public Mono call() { .onErrorResume(error -> Mono.just(TenorResponse.builder() .status(WebClientFilter.getStatus(error)) .error(WebClientFilter.getMessage(error)) + .query(query) .build())); } + private String getSkjul(InfoType type) { + + return isNull(type) || type != InfoType.Kildedata ? + "*.kildedata" : null; + } + private String getVisning(InfoType type) { if (nonNull(type)) { return switch (type) { - case Kildedata -> "tenorMetadata.kildedata"; + case Kildedata -> "*.kildedata"; case AlleFelter -> "{alle}"; case Spesifikt -> isNotBlank(fields) ? fields : "id"; default -> null; diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java index c00e3a1e289..0245a60314a 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorRequest.java @@ -20,7 +20,7 @@ public enum IdentifikatorType {Foedselsnummer, DNummer, DNummerOgFoedselsnr} public enum Kjoenn {Mann, Kvinne} - public enum Roller {DAGLIG_LEDER} + public enum Roller {DagligLeder} public enum Personstatus {Bosatt, Doed, Forsvunnet, Foedselsregistrert, IkkeBosatt, Inaktiv, Midlertidig, Opphoert, Utflyttet} diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java index ee824904d3f..1aa52d3d7da 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/domain/TenorResponse.java @@ -15,5 +15,6 @@ public class TenorResponse { private HttpStatus status; private JsonNode data; + private String query; private String error; } \ No newline at end of file diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java index 1842c100734..76c0a845060 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorEksterneRelasjonerUtility.java @@ -177,7 +177,10 @@ private String getTjenestepensjonsavtale(TenorRequest.Tjenestepensjonsavtale tje private String getRoller(List roller) { - return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{dagligLeder:*}"; + return (roller.isEmpty()) ? "" : " and tenorRelasjoner.brreg-er-fr:{%s}".formatted(roller.stream() + .map(Enum::name) + .map(type -> "%s%s:*".formatted(type.substring(0,1).toLowerCase(), type.substring(1))) + .collect(Collectors.joining(AND))); } private String getSkatteplikt(TenorRequest.Skatteplikt skatteplikt) { diff --git a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java index d0666375e93..9c22a38b598 100644 --- a/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java +++ b/apps/tenor-search-service/src/main/java/no/nav/testnav/apps/tenorsearchservice/service/TenorSearchService.java @@ -20,7 +20,6 @@ import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertEnum; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertIntervall; import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObject; -import static no.nav.testnav.apps.tenorsearchservice.service.TenorConverterUtility.convertObjectWildCard; import static org.apache.commons.lang3.StringUtils.isNotBlank; @Slf4j @@ -71,10 +70,9 @@ public Mono getTestdata(TenorRequest searchData, Kilde kilde, Inf } if (nonNull(searchData.getRelasjoner())) { - builder.append(getRelasjon(searchData.getRelasjoner().getRelasjon())) + builder.append(getFregRelasjoner(searchData.getRelasjoner())) .append(convertIntervall("antallBarn", searchData.getRelasjoner().getAntallBarn())) .append(convertBooleanWildcard("foreldreansvar", searchData.getRelasjoner().getHarForeldreAnsvar())) - .append(getRelasjonMedFoedselsdato(searchData.getRelasjoner().getRelasjonMedFoedselsaar())) .append(convertBooleanWildcard("deltBosted", searchData.getRelasjoner().getHarDeltBosted())) .append(convertBooleanWildcard("vergemaalType", searchData.getRelasjoner().getHarVergemaalEllerFremtidsfullmakt())) .append(convertObject("borMedFar", searchData.getRelasjoner().getBorMedFar())) @@ -93,17 +91,14 @@ public Mono getTestdata(TenorRequest searchData, Kilde kilde, Inf return tenorClient.getTestdata(query, kilde, type, fields, seed); } - private String getRelasjonMedFoedselsdato(TenorRequest.Intervall relasjonMedFoedselsaar) { + private String getFregRelasjoner(TenorRequest.Relasjoner relasjoner) { - return isNull(relasjonMedFoedselsaar) ? "" : " and tenorRelasjoner.freg:{foedselsdato:[%s to %s]}" - .formatted( - convertObjectWildCard(relasjonMedFoedselsaar.getFraOgMed()), - convertObjectWildCard(relasjonMedFoedselsaar.getTilOgMed())); - } - - private String getRelasjon(TenorRequest.Relasjon relasjon) { - - return isNull(relasjon) ? "" : " and tenorRelasjoner.freg:{tenorRelasjonsnavn:%s}".formatted(relasjon.name()); + return isNull(relasjoner.getRelasjon()) && isNull(relasjoner.getRelasjonMedFoedselsaar()) ? "" : + " and tenorRelasjoner.freg:{%s}" + .formatted(new StringBuilder() + .append(convertObject("tenorRelasjonsnavn", relasjoner.getRelasjon())) + .append(convertIntervall("foedselsdato", relasjoner.getRelasjonMedFoedselsaar())) + .substring(5)); } private String getUtenlandskPersonidentifikasjon(List utenlandskPersonIdentifikasjon) { From 73d37fc4bbde9006622b025b3e831c5eaeeb5bec Mon Sep 17 00:00:00 2001 From: kristenhaerum Date: Wed, 24 Jan 2024 13:54:02 +0100 Subject: [PATCH 69/69] Oppdatert gradle config #deploy-tenor-search-service --- apps/tenor-search-service/build.gradle | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 47d05bc2561..1e768192ae4 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-service/build.gradle @@ -1,25 +1,14 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" - id 'io.spring.dependency-management' version "1.1.3" + id "org.sonarqube" version "4.4.1.3373" + id 'org.springframework.boot' version "3.2.1" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } test { useJUnitPlatform() } -def test = tasks.named("test") { - useJUnitPlatform { - excludeTags "integration" - } -} -def iTest = tasks.register("iTest", Test) { - useJUnitPlatform { - includeTags "integration" - } - shouldRunAfter test -} jacocoTestReport { reports { @@ -29,7 +18,7 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" @@ -55,7 +44,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -76,7 +65,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test'