Skip to content

Commit 30393dc

Browse files
espenwaagajolarsen
espenwaaga
authored and
jolarsen
committed
TFP-6461: Fjerner fpfordel og erstatter med fpmottak
1 parent 3344383 commit 30393dc

File tree

13 files changed

+55
-86
lines changed

13 files changed

+55
-86
lines changed

‎.github/workflows/autotest.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ jobs:
8080
if [[ ${{ inputs.test-suite }} == 'fpkalkulus' ]]; then
8181
services=("fpkalkulus")
8282
elif [[ ${{ inputs.test-suite }} == 'fplos' ]]; then
83-
services=("fplos" "fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpfordel" "fpsoknad" "fpkalkulus" "fpinntektsmelding")
83+
services=("fplos" "fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpmottak" "fpsoknad" "fpkalkulus" "fpinntektsmelding")
8484
else
85-
services=("fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpabonnent" "fpfordel" "fpsoknad" "fpoversikt" "fpkalkulus" "fpinntektsmelding")
85+
services=("fpsak" "fpformidling" "fpdokgen" "fpoppdrag" "fptilbake" "fprisk" "fpabonnent" "fpmottak" "fpsoknad" "fpoversikt" "fpkalkulus" "fpinntektsmelding")
8686
fi
8787
8888
cd resources/pipeline
@@ -105,7 +105,7 @@ jobs:
105105
elif [[ ${{ inputs.test-suite }} == 'verdikjede' ]]; then
106106
mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen
107107
elif [[ ${{ inputs.test-suite }} == 'fplos' ]]; then
108-
mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent,fpoppdrag,fpfordel
108+
mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent,fpoppdrag
109109
elif [[ ${{ inputs.test-suite }} == 'fpsak' ]]; then
110110
mvn test -e --batch-mode -s settings.xml -Djuipter.parallelism=${{ inputs.parallellitet }} -P logger -DikkeSjekkLengdeAvContainer=fpdokgen,fpabonnent
111111
else

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ For øyeblikket har vi to test suits som tester enten fpsak eller fptilbake. Vi
2121

2222
### Status
2323

24-
| Prosjekt | Status |
25-
|:----------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
26-
| 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) |
27-
| 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) |
28-
| fp-sak | [![](https://github.com/navikt/fp-sak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-sak/actions/workflows/build.yml) |
29-
| fpfordel | [![](https://github.com/navikt/fpfordel/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpfordel/actions/workflows/build.yml) |
30-
| fpoversikt | [![](https://github.com/navikt/fp-oversikt/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpoversikt/actions/workflows/build.yml) |
31-
| fp-dokgen | [![](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml) |
32-
| 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) |
33-
| 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) |
34-
| 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) |
35-
| 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) |
36-
| fpabonnent | [![](https://github.com/navikt/fpabonnent/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpabonnent/actions/workflows/build.yml) |
24+
| Prosjekt | Status |
25+
|:----------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
26+
| 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) |
27+
| 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) |
28+
| fp-sak | [![](https://github.com/navikt/fp-sak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-sak/actions/workflows/build.yml) |
29+
| fp-mottak | [![](https://github.com/navikt/fp-mottak/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-mottak/actions/workflows/build.yml) |
30+
| fpoversikt | [![](https://github.com/navikt/fp-oversikt/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpoversikt/actions/workflows/build.yml) |
31+
| fp-dokgen | [![](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fp-dokgen/actions/workflows/build.yml) |
32+
| 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) |
33+
| 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) |
34+
| 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) |
35+
| 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) |
36+
| fpabonnent | [![](https://github.com/navikt/fpabonnent/actions/workflows/build.yml/badge.svg)](https://github.com/navikt/fpabonnent/actions/workflows/build.yml) |
3737

3838
## Interne avhengigheter til fp-autotest
3939
Fpsak-autotest er avhengig av følgende repo:

‎docs/arkitektur.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Aktører bruker en eller flere klienter
3434
Eksempler:
3535
+ Saksbehandler
3636
+ Gosys
37-
+ FpFordel
3837

3938
### Klienter
4039

‎lokal-utvikling/setup-lokal-utvikling.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ settPorterSomSkalErstattes () {
2424
replace_port_array=("8080")
2525
with_port_array=("8075")
2626
;;
27-
fpfordel)
27+
fpmottak)
2828
replace_port_array=("8080")
29-
with_port_array=("8090")
29+
with_port_array=("8900")
3030
;;
3131
fpabonnent)
3232
replace_port_array=("8080")

‎resources/pipeline/common.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FPOPPDRAG_OVERRIDE_URL=http://fpoppdrag:8080/fpoppdrag
66
FPTILBAKE_OVERRIDE_URL=http://fptilbake:8080/fptilbake
77
FPFORMIDLING_OVERRIDE_URL=http://fpformidling:8080/fpformidling
88
FPRISK_OVERRIDE_URL=http://fprisk:8080/fprisk
9-
FPFORDEL_OVERRIDE_URL=http://fpfordel:8080/fpfordel
9+
FPMOTTAK_OVERRIDE_URL=http://fpmottak:8080/fpmottak
1010
FPSOKNAD_URL=http://fpsoknad:8999/fpsoknad
1111
FPOVERSIKT_OVERRIDE_URL=http://fpoversikt:8080/fpoversikt
1212
FPWSPROXY_OVERRIDE_URL=http://vtp:8060/rest/api/fpwsproxy

‎resources/pipeline/compose-github.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
mem_limit: 3gb
1616
fpfrontend:
1717
mem_limit: 64mb
18-
fpfordel:
18+
fpmottak:
1919
mem_limit: 1gb
2020
fpformidling:
2121
mem_limit: 1gb

‎resources/pipeline/compose.yml‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ services:
261261
"url": "http://fplos:8080"
262262
},
263263
{
264-
"path": "/fpfordel/api",
265-
"scopes": "api://vtp.teamforeldrepenger.fpfordel/.default",
266-
"url": "http://fpfordel:8080"
264+
"path": "/fpmottak/api",
265+
"scopes": "api://vtp.teamforeldrepenger.fpmottak/.default",
266+
"url": "http://fpmottak:8080"
267267
}
268268
]
269269
}
@@ -368,9 +368,9 @@ services:
368368
{
369369
"apis": [
370370
{
371-
"path": "/fpfordel/api",
372-
"scopes": "api://vtp.teamforeldrepenger.fpfordel/.default",
373-
"url": "http://fpfordel:8080"
371+
"path": "/fpmottak/api",
372+
"scopes": "api://vtp.teamforeldrepenger.fpmottak/.default",
373+
"url": "http://fpmottak:8080"
374374
}
375375
]
376376
}
@@ -383,7 +383,7 @@ services:
383383
condition: service_started
384384
fpsak:
385385
condition: service_started
386-
fpfordel:
386+
fpmottak:
387387
condition: service_started
388388
wonderwall-fpjournalforing:
389389
<<: *default-konfigurasjon
@@ -403,37 +403,36 @@ services:
403403
- "127.0.0.1:9005:9005"
404404
env_file:
405405
- *common-properties
406-
407-
fpfordel:
406+
fpmottak:
408407
<<: *default-konfigurasjon
409-
image: $FPFORDEL_IMAGE
410-
container_name: fpfordel
411-
mem_limit: 512mb
408+
image: $FPMOTTAK_IMAGE
409+
container_name: fpmottak
412410
environment:
413-
NAIS_APP_NAME: fpfordel
414-
DOKARKIV_BASE_URL: http://vtp:8060/rest/dokarkiv/rest/journalpostapi/v1/journalpost
411+
NAIS_APP_NAME: fpmottak
415412
env_file:
416413
- *common-properties
414+
- fpmottak_datasource.env
417415
volumes:
418416
- *sertifikat-volum
419-
- *default-oracle-jdbc-config
420-
- ./vault-init/fpfordel:/var/run/secrets/nais.io/
421-
- ./tokenx:/tokenx
422417
ports:
423-
- "127.0.0.1:8090:8080"
418+
- "127.0.0.1:8900:8080"
424419
healthcheck:
425-
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpfordel/internal/health/isReady" ]
420+
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpmottak/internal/health/isReady" ]
426421
interval: 3s
427422
timeout: 5s
428423
retries: 30
429424
start_period: 10s
430425
depends_on:
431-
oracle:
432-
condition: service_healthy
433426
vtp:
434427
condition: service_healthy
428+
postgres:
429+
condition: service_healthy
430+
fptilgang:
431+
condition: service_started
435432
fpsak:
436433
condition: service_started
434+
fptilbake:
435+
condition: service_started
437436
fpformidling:
438437
<<: *default-konfigurasjon
439438
image: $FPFORMIDLING_IMAGE
@@ -915,12 +914,6 @@ services:
915914
"url": "http://fplos:8080",
916915
"name": "fp-los"
917916
},
918-
{
919-
"path": "/fpfordel/api",
920-
"scopes": "api://vtp.teamforeldrepenger.fpfordel/swagger",
921-
"url": "http://fpfordel:8080",
922-
"name": "fp-fordel"
923-
},
924917
{
925918
"path": "/fpabakus/forvaltning/api",
926919
"scopes": "api://vtp.teamforeldrepenger.fpabakus/swagger",
@@ -956,6 +949,12 @@ services:
956949
"scopes": "api://vtp.teamforeldrepenger.fpsoknad/swagger",
957950
"url": "http://fpsoknad:8080",
958951
"name": "fp-soknad"
952+
},
953+
{
954+
"path": "/fpmottak/forvaltning/api",
955+
"scopes": "api://vtp.teamforeldrepenger.fpmottak/swagger",
956+
"url": "http://fpmottak:8080",
957+
"name": "fp-mottak"
959958
}
960959
]
961960
}

‎resources/pipeline/fpmottak_datasource.env‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DB_JDBC_URL=jdbc:postgresql://postgres:5999/fpmottak?reWriteBatchedInserts=true
2+
DB_USERNAME=fpmottak
3+
DB_PASSWORD=fpmottak

‎resources/pipeline/oracle-init/02_fpfordel.sql‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎resources/pipeline/postgres-init/fpmottak.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CREATE DATABASE fpmottak;
2+
CREATE USER fpmottak WITH PASSWORD 'fpmottak';
3+
GRANT ALL ON DATABASE fpmottak TO fpmottak;
4+
ALTER DATABASE fpmottak SET timezone TO 'Europe/Oslo';
5+
ALTER DATABASE fpmottak OWNER TO fpmottak;

0 commit comments

Comments
 (0)