Skip to content

TFP-6067: utvide ArbeidsforholdDto med Permisjon #1619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 31, 2025
Merged

Conversation

sirimykland
Copy link
Contributor

No description provided.

Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR extends the ArbeidsforholdDto functionality by introducing support for permisjoner, along with the required mapping and test updates.

  • Updated test scenarios to include examples for permisjoner
  • Added a new PermisjonMapper and corresponding contract definitions
  • Refactored related mappers to integrate the new permisjoner mappings

Reviewed Changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
server/src/test/java/no/nav/foreldrepenger/vtp/server/api/scenario/TestscenarioV2RestTjenesteTest.java Updated test to build ArbeidsforholdDto with permisjoner
server/src/main/java/no/nav/foreldrepenger/vtp/server/api/scenario/mapper/PermisjonMapper.java New mapper implementation for mapping PermisjonDto
server/src/main/java/no/nav/foreldrepenger/vtp/server/api/scenario/mapper/InntektkomponentMapper.java Updated to integrate permisjoner where applicable
server/src/main/java/no/nav/foreldrepenger/vtp/server/api/scenario/mapper/InntektYtelseModellMapper.java Refactored to use updated mapping methods
server/src/main/java/no/nav/foreldrepenger/vtp/server/api/scenario/mapper/ArbeidsavtaleMapper.java Newly added mapper for ArbeidsavtaleDto mapping
kontrakter/src/main/java/no/nav/foreldrepenger/vtp/kontrakter/v2/Permisjonstype.java & PermisjonDto.java New contract definitions for permisjon data
kontrakter/src/main/java/no/nav/foreldrepenger/vtp/kontrakter/v2/ArbeidsforholdDto.java Modified to include a new permisjoner field in the builder
Comments suppressed due to low confidence (1)

kontrakter/src/main/java/no/nav/foreldrepenger/vtp/kontrakter/v2/ArbeidsforholdDto.java:29

  • To avoid potential null pointer issues, default the permisjoner field to an empty list in the builder constructor if no value is provided.
private List<PermisjonDto> permisjoner;

@sirimykland sirimykland merged commit b170fc3 into master Mar 31, 2025
7 of 8 checks passed
@sirimykland sirimykland deleted the feature/TFP-6067 branch March 31, 2025 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants