TFP-6461: Fjerner fpfordel og erstatter med fpmottak

.github/workflows/autotest.yml

@@ -80,9 +80,9 @@ jobs:
           if [[ ${{ inputs.test-suite }} == 'fpkalkulus' ]]; then
             services=("fpkalkulus")
           elif [[ ${{ inputs.test-suite }} == 'fplos' ]]; then
-            services=("fplos" "fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpfordel" "fpsoknad" "fpkalkulus" "fpinntektsmelding")
+            services=("fplos" "fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpmottak" "fpsoknad" "fpkalkulus" "fpinntektsmelding")
           else
-            services=("fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpabonnent" "fpfordel" "fpsoknad" "fpoversikt" "fpkalkulus" "fpinntektsmelding")
+            services=("fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpabonnent" "fpmottak" "fpsoknad" "fpoversikt" "fpkalkulus" "fpinntektsmelding")
           fi
 
           cd resources/pipeline
@@ -105,7 +105,7 @@ jobs:
           elif [[ ${{ inputs.test-suite }} == 'verdikjede' ]]; then
             mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen
           elif [[ ${{ inputs.test-suite }} == 'fplos' ]]; then
-            mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent,fpoppdrag,fpfordel
+            mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent,fpoppdrag
           elif [[ ${{ inputs.test-suite }} == 'fpsak' ]]; then
             mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent
           else

README.md

@@ -21,19 +21,19 @@ For øyeblikket har vi to test suits som tester enten fpsak eller fptilbake. Vi
 
 ### Status
 
-| Prosjekt        | Status                                                                                                                                                                                                                                                                                                                                         |
-|:----------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| vtp             | [![](https://github.com/navikt/vtp/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/vtp/actions?query=workflow%3A%22Bygg+og+deploy%22)                                                                                                                                                                                       |
-| fp-abakus       | [![](https://github.com/navikt/fp-abakus/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-abakus/actions?query=workflow%3A%22Bygg+og+deploy%22)                                                                                                                                                                           |
-| fp-sak          | [![](https://github.com/navikt/fp-sak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-sak/actions/workflows/build.yml)                                                                                                                                                                                                    |
-| fpfordel        | [![](https://github.com/navikt/fpfordel/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpfordel/actions/workflows/build.yml)                                                                                                                                                                                                |
-| fpoversikt      | [![](https://github.com/navikt/fp-oversikt/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpoversikt/actions/workflows/build.yml)                                                                                                                                                                                           |
-| fp-dokgen       | [![](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml)                                                                                                                                                                                              |
-| fp-formidling   | [![](https://github.com/navikt/fp-formidling/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-formidling/actions?query=workflow%3A%22Bygg+og+deploy%22) |
-| fpoppdrag       | [![](https://github.com/navikt/fpoppdrag/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fpoppdrag/actions?query=workflow%3A%22Bygg+og+deploy%22)                 |
-| fptilbake       | [![](https://github.com/navikt/fptilbake/workflows/Bygg%20og%20deploy%20Fptilbake/badge.svg)](https://github.com/navikt/fptilbake/actions?query=workflow%3A%22Bygg+og+deploy+Fptilbake%22)  |
-| fp-risk         | [![](https://github.com/navikt/fp-risk/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-risk/actions?query=workflow%3A%22Bygg+og+deploy%22)                              |
-| fpabonnent      | [![](https://github.com/navikt/fpabonnent/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpabonnent/actions/workflows/build.yml)                                                                                                                                                                                            |
+| Prosjekt        | Status                                                                                                                                                                                     |
+|:----------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| vtp             | [![](https://github.com/navikt/vtp/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/vtp/actions?query=workflow%3A%22Bygg+og+deploy%22)                                   |
+| fp-abakus       | [![](https://github.com/navikt/fp-abakus/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-abakus/actions?query=workflow%3A%22Bygg+og+deploy%22)                       |
+| fp-sak          | [![](https://github.com/navikt/fp-sak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-sak/actions/workflows/build.yml)                                                |
+| fp-mottak        | [![](https://github.com/navikt/fp-mottak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-mottak/actions/workflows/build.yml)                                           |
+| fpoversikt      | [![](https://github.com/navikt/fp-oversikt/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpoversikt/actions/workflows/build.yml)                                       |
+| fp-dokgen       | [![](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml)                                          |
+| fp-formidling   | [![](https://github.com/navikt/fp-formidling/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-formidling/actions?query=workflow%3A%22Bygg+og+deploy%22)               |
+| fpoppdrag       | [![](https://github.com/navikt/fpoppdrag/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fpoppdrag/actions?query=workflow%3A%22Bygg+og+deploy%22)                       |
+| fptilbake       | [![](https://github.com/navikt/fptilbake/workflows/Bygg%20og%20deploy%20Fptilbake/badge.svg)](https://github.com/navikt/fptilbake/actions?query=workflow%3A%22Bygg+og+deploy+Fptilbake%22) |
+| fp-risk         | [![](https://github.com/navikt/fp-risk/workflows/Bygg%20og%20deploy/badge.svg)](https://github.com/navikt/fp-risk/actions?query=workflow%3A%22Bygg+og+deploy%22)                           |
+| fpabonnent      | [![](https://github.com/navikt/fpabonnent/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpabonnent/actions/workflows/build.yml)                                        |
 
 ## Interne avhengigheter til fp-autotest
 Fpsak-autotest er avhengig av følgende repo:

docs/arkitektur.md

@@ -34,7 +34,6 @@ Aktører bruker en eller flere klienter
 Eksempler:
 	+ Saksbehandler
 	+ Gosys
-	+ FpFordel
 
 ### Klienter
 

lokal-utvikling/setup-lokal-utvikling.sh

@@ -24,9 +24,9 @@ settPorterSomSkalErstattes () {
       replace_port_array=("8080")
       with_port_array=("8075")
       ;;
-    fpfordel)
+    fpmottak)
       replace_port_array=("8080")
-      with_port_array=("8090")
+      with_port_array=("8900")
       ;;
     fpabonnent)
       replace_port_array=("8080")

resources/pipeline/common.env

@@ -6,7 +6,7 @@ FPOPPDRAG_OVERRIDE_URL=http://fpoppdrag:8080/fpoppdrag
 FPTILBAKE_OVERRIDE_URL=http://fptilbake:8080/fptilbake
 FPFORMIDLING_OVERRIDE_URL=http://fpformidling:8080/fpformidling
 FPRISK_OVERRIDE_URL=http://fprisk:8080/fprisk
-FPFORDEL_OVERRIDE_URL=http://fpfordel:8080/fpfordel
+FPMOTTAK_OVERRIDE_URL=http://fpmottak:8080/fpmottak
 FPSOKNAD_URL=http://fpsoknad:8999/fpsoknad
 FPOVERSIKT_OVERRIDE_URL=http://fpoversikt:8080/fpoversikt
 FPWSPROXY_OVERRIDE_URL=http://vtp:8060/rest/api/fpwsproxy

resources/pipeline/compose-github.yml

@@ -15,7 +15,7 @@ services:
     mem_limit: 3gb
   fpfrontend:
     mem_limit: 64mb
-  fpfordel:
+  fpmottak:
     mem_limit: 1gb
   fpformidling:
     mem_limit: 1gb

resources/pipeline/compose.yml

@@ -261,9 +261,9 @@ services:
                     "url": "http://fplos:8080"
                 },
                 {
-                    "path": "/fpfordel/api",
-                    "scopes": "api://vtp.teamforeldrepenger.fpfordel/.default",
-                    "url": "http://fpfordel:8080"
+                    "path": "/fpmottak/api",
+                    "scopes": "api://vtp.teamforeldrepenger.fpmottak/.default",
+                    "url": "http://fpmottak:8080"
                 }
             ]
         }
@@ -368,9 +368,9 @@ services:
         {
             "apis": [
                 {
-                    "path": "/fpfordel/api",
-                    "scopes": "api://vtp.teamforeldrepenger.fpfordel/.default",
-                    "url": "http://fpfordel:8080"
+                    "path": "/fpmottak/api",
+                    "scopes": "api://vtp.teamforeldrepenger.fpmottak/.default",
+                    "url": "http://fpmottak:8080"
                 }
             ]
         }
@@ -383,7 +383,7 @@ services:
         condition: service_started
       fpsak:
         condition: service_started
-      fpfordel:
+      fpmottak:
         condition: service_started
   wonderwall-fpjournalforing:
     <<: *default-konfigurasjon
@@ -403,37 +403,36 @@ services:
       - "127.0.0.1:9005:9005"
     env_file:
       - *common-properties
-
-  fpfordel:
+  fpmottak:
     <<: *default-konfigurasjon
-    image: $FPFORDEL_IMAGE
-    container_name: fpfordel
-    mem_limit: 512mb
+    image: $FPMOTTAK_IMAGE
+    container_name: fpmottak
     environment:
-      NAIS_APP_NAME: fpfordel
-      DOKARKIV_BASE_URL: http://vtp:8060/rest/dokarkiv/rest/journalpostapi/v1/journalpost
+      NAIS_APP_NAME: fpmottak
     env_file:
       - *common-properties
+      - fpmottak_datasource.env
     volumes:
       - *sertifikat-volum
-      - *default-oracle-jdbc-config
-      - ./vault-init/fpfordel:/var/run/secrets/nais.io/
-      - ./tokenx:/tokenx
     ports:
-      - "127.0.0.1:8090:8080"
+      - "127.0.0.1:8900:8080"
     healthcheck:
-      test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpfordel/internal/health/isReady" ]
+      test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpmottak/internal/health/isReady" ]
       interval: 3s
       timeout: 5s
       retries: 30
       start_period: 10s
     depends_on:
-      oracle:
-        condition: service_healthy
       vtp:
         condition: service_healthy
+      postgres:
+        condition: service_healthy
+      fptilgang:
+        condition: service_started
       fpsak:
         condition: service_started
+      fptilbake:
+        condition: service_started
   fpformidling:
     <<: *default-konfigurasjon
     image: $FPFORMIDLING_IMAGE
@@ -915,12 +914,6 @@ services:
                     "url": "http://fplos:8080",
                     "name": "fp-los"
                 },
-                {
-                    "path": "/fpfordel/api",
-                    "scopes": "api://vtp.teamforeldrepenger.fpfordel/swagger",
-                    "url": "http://fpfordel:8080",
-                    "name": "fp-fordel"
-                },
                 {
                     "path": "/fpabakus/forvaltning/api",
                     "scopes": "api://vtp.teamforeldrepenger.fpabakus/swagger",
@@ -956,6 +949,12 @@ services:
                     "scopes": "api://vtp.teamforeldrepenger.fpsoknad/swagger",
                     "url": "http://fpsoknad:8080",
                     "name": "fp-soknad"
+                },
+                {
+                    "path": "/fpmottak/forvaltning/api",
+                    "scopes": "api://vtp.teamforeldrepenger.fpmottak/swagger",
+                    "url": "http://fpmottak:8080",
+                    "name": "fp-mottak"
                 }
             ]
         }

resources/pipeline/fpmottak_datasource.env

@@ -0,0 +1,3 @@
+DB_JDBC_URL=jdbc:postgresql://postgres:5999/fpmottak?reWriteBatchedInserts=true
+DB_USERNAME=fpmottak
+DB_PASSWORD=fpmottak

resources/pipeline/postgres-init/fpmottak.sql

@@ -0,0 +1,5 @@
+CREATE DATABASE fpmottak;
+CREATE USER fpmottak WITH PASSWORD 'fpmottak';
+GRANT ALL ON DATABASE fpmottak TO fpmottak;
+ALTER DATABASE fpmottak SET timezone TO 'Europe/Oslo';
+ALTER DATABASE fpmottak OWNER TO fpmottak;

resources/pipeline/update-versions.sh

@@ -31,9 +31,9 @@ echo FPOPPDRAG_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-manageme
 echo FPTILBAKE_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fptilbake")" >> .env
 echo FPRISK_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-risk")" >> .env
 echo FPABONNENT_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fpabonnent")" >> .env
-echo FPFORDEL_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fpfordel")" >> .env
 echo FPLOS_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fplos")" >> .env
 echo FPSOKNAD_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-soknad")" >> .env
+echo FPMOTTAK_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/fp-mottak")" >> .env
 echo FORELDREPENGESOKNAD_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/foreldrepengesoknad/foreldrepengesoknad")" >> .env
 echo FORELDREPENGEOVERSIKT_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/foreldrepengesoknad/foreldrepengeoversikt")" >> .env
 echo SVANGERSKAPSPENGESOKNAD_IMAGE="$(imageVersion "europe-north1-docker.pkg.dev/nais-management-233d/teamforeldrepenger/navikt/foreldrepengesoknad/svangerskapspengesoknad")" >> .env