feat. filter for å skjule mentor avtaler med opphav arena #1434

Majjki · 2025-11-24T14:00:56Z

Filtrer skjuler avtaler som har opphav ARENA og er mentoravtaler for rolle som ikke er beslutter/veileder

…lgangssjekk

Copilot

Pull request overview

This PR introduces filtering logic to hide mentor agreements migrated from ARENA for users who are not internal users (veileder/beslutter). The filter is applied both when listing agreements and when checking individual agreement access.

Added filtering in hentAvtalerMedLesetilgang to exclude ARENA mentor agreements from list results
Added access check in sjekkTilgang to prevent direct access to hidden ARENA mentor agreements
Implemented harTilgangTilMentorArenaMigrering method containing the filtering logic

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-25T11:52:12Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtalepart.java

        if (!avtalenEksisterer(avtale)) {
            throw new RessursFinnesIkkeException();
        }
+        if (skalSkjulesMentorArenaMigrering(avtale)) {


The method skalSkjulesMentorArenaMigrering does not exist. This should be harTilgangTilMentorArenaMigrering(avtale) to match the method defined on line 223. Additionally, the logic needs to be inverted since harTilgangTilMentorArenaMigrering returns false when the agreement should be hidden, so the condition should be !harTilgangTilMentorArenaMigrering(avtale).

Suggested change

if (skalSkjulesMentorArenaMigrering(avtale)) {

if (!harTilgangTilMentorArenaMigrering(avtale)) {

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtalepart.java

…ge exception

…ikke ingått for arbeidsgiver Co-authored-by: Odd Andreas Sørsæther <[email protected]>

…att familjetilknytting Co-authored-by: Odd Andreas Sørsæther <[email protected]>

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-27T09:57:54Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Arbeidsgiver.java

                }
                return new Tilgang.Tillat();
            }));
        return tilgangsmappe;


The removed avtalenEksisterer override previously hid ALL Arena agreements that weren't concluded (!erAvtaleInngått()) from employers. The new filtering logic in Avtalepart only hides MENTOR Arena agreements based on completion status. This means non-mentor Arena agreements that aren't concluded will now be visible to employers. If this behavior change is intentional, consider documenting it; otherwise, the old logic may need to be preserved or combined with the new filter.

Copilot · 2025-11-27T09:57:54Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtale.java


+    public boolean sjekkOmAlltErFylltUtUntattFamiljeTilknyting() {
+
+        if (!felterSomIkkeErFyltUt().stream().filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty()) {


The double negation with .filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty() makes this logic confusing. This checks if the filtered list is empty, which means all unfilled fields are "harFamilietilknytning". Consider simplifying to:

if (felterSomIkkeErFyltUt().stream().anyMatch(x -> !x.equals("harFamilietilknytning")))

This is clearer: "if any unfilled field is NOT harFamilietilknytning, return false".

Suggested change

if (!felterSomIkkeErFyltUt().stream().filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty()) {

if (felterSomIkkeErFyltUt().stream().anyMatch(x -> !x.equals("harFamilietilknytning"))) {

Copilot · 2025-11-27T09:57:55Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtale.java

        }
    }

+    public boolean sjekkOmAlltErFylltUtUntattFamiljeTilknyting() {


Method name has a typo: "Allt" should be "Alt" (singular, consistent with sjekkOmAltErKlarTilGodkjenning on line 788). Additionally, "FamiljeTilknyting" doesn't match the field name "Familietilknytning" used elsewhere, though this inconsistency exists throughout method names in this class.

Copilot · 2025-11-27T09:57:55Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtale.java

+    public boolean erKlarForVisningAvMigrertMentorAvtale() {
+            return sjekkOmAlltErFylltUtUntattFamiljeTilknyting();
+    }


This method is a simple wrapper that adds no additional logic or documentation. Consider removing it and directly calling sjekkOmAlltErFylltUtUntattFamiljeTilknyting() from the caller in Avtalepart.java line 237, or add documentation explaining why this wrapper exists.

Suggested change

public boolean erKlarForVisningAvMigrertMentorAvtale() {

return sjekkOmAlltErFylltUtUntattFamiljeTilknyting();

}

// Method removed: erKlarForVisningAvMigrertMentorAvtale()

Copilot · 2025-11-27T09:57:55Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtalepart.java

+        boolean utFylltUntattFamiljeTilknyting =  avtale.erKlarForVisningAvMigrertMentorAvtale();
+
+        if (!erInternRolle && !utFylltUntattFamiljeTilknyting) {
+            log.info("Skjult mentoravtale med opphav Arena for migrering. Rolle: {}, AvtaleNr: {}", rolle(), avtale.getAvtaleNr());
+        }
+
+        return erInternRolle || utFylltUntattFamiljeTilknyting;


Variable name violates camelCase convention: "utFyllt" should be "utfylt" (lowercase 'f'). Additionally, "FamiljeTilknyting" appears to be a misspelling that doesn't match the field name "Familietilknytning", though this inconsistency exists in related method names.

Suggested change

boolean utFylltUntattFamiljeTilknyting = avtale.erKlarForVisningAvMigrertMentorAvtale();

if (!erInternRolle && !utFylltUntattFamiljeTilknyting) {

log.info("Skjult mentoravtale med opphav Arena for migrering. Rolle: {}, AvtaleNr: {}", rolle(), avtale.getAvtaleNr());

}

return erInternRolle || utFylltUntattFamiljeTilknyting;

boolean utfyltUntattFamilietilknytning = avtale.erKlarForVisningAvMigrertMentorAvtale();

if (!erInternRolle && !utfyltUntattFamilietilknytning) {

log.info("Skjult mentoravtale med opphav Arena for migrering. Rolle: {}, AvtaleNr: {}", rolle(), avtale.getAvtaleNr());

}

return erInternRolle || utfyltUntattFamilietilknytning;

Copilot · 2025-11-27T09:57:56Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtalepart.java

+    private boolean mentorAvtaleUnderMigreringSkalVises(Avtale avtale) {
+        boolean erMentorArena = erAvtaleMigrertMentorArena(avtale);
+
+        if (!erMentorArena) {
+            return true;
+        }
+
+        boolean erInternRolle = rolle().erInternBruker();
+
+        boolean utFylltUntattFamiljeTilknyting =  avtale.erKlarForVisningAvMigrertMentorAvtale();
+
+        if (!erInternRolle && !utFylltUntattFamiljeTilknyting) {
+            log.info("Skjult mentoravtale med opphav Arena for migrering. Rolle: {}, AvtaleNr: {}", rolle(), avtale.getAvtaleNr());
+        }
+
+        return erInternRolle || utFylltUntattFamiljeTilknyting;
+    }


The new filtering logic for migrated mentor agreements from Arena lacks test coverage. Consider adding tests for:

Non-internal users being denied access to incomplete migrated mentor agreements

Internal users (VEILEDER/BESLUTTER) having access to all migrated mentor agreements

Non-internal users having access to completed migrated mentor agreements

Non-mentor or non-Arena agreements not being affected by the filter

Copilot · 2025-11-27T09:57:56Z

src/main/java/no/nav/tag/tiltaksgjennomforing/avtale/Avtale.java

+    public boolean sjekkOmAlltErFylltUtUntattFamiljeTilknyting() {
+
+        if (!felterSomIkkeErFyltUt().stream().filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty()) {
+            log.warn(
+                "Avtale= {}, med type= {} har ikke alle felter fylt ut for visning= {}",
+                this.avtaleNr,
+                this.tiltakstype,
+                felterSomIkkeErFyltUt()
+            );
+            return false;
+        }
+        log.info("Migrert mentoravtale {} er klar for visning.", this.avtaleNr);
+        return true;
+    }


The new method sjekkOmAlltErFylltUtUntattFamiljeTilknyting() lacks test coverage. Consider adding tests to verify:

Returns true when all fields are filled except "harFamilietilknytning"

Returns false when any other field besides "harFamilietilknytning" is not filled

Returns true when all fields including "harFamilietilknytning" are filled

Majjki added 2 commits November 24, 2025 14:59

feat. la til filter for å skjule mentor avtaler med opphav arena i ti…

89e6909

…lgangssjekk

fix. metodnavn

425d462

Majjki requested a review from Copilot November 25, 2025 11:41

Copilot started reviewing on behalf of Majjki November 25, 2025 11:42 View session

Copilot finished reviewing on behalf of Majjki November 25, 2025 11:43

Copilot AI reviewed Nov 25, 2025

View reviewed changes

Majjki and others added 5 commits November 25, 2025 12:56

fix. sjekkTilgang for mentoravtaler fra arena blir invertert for å la…

7a841f5

…ge exception

fix. bruk av metod for å sjekke internroller

c90bf04

feat. mentor tilskuddsperioder enabled for docker compose

aaf8a1f

feat. sletter avtalen ikke eksisterer dersom den har opphav arena og …

0b814c6

…ikke ingått for arbeidsgiver Co-authored-by: Odd Andreas Sørsæther <[email protected]>

feat. lagt til filter og sjekk for om en mentoravtale er fyllt ut unt…

37d14ce

…att familjetilknytting Co-authored-by: Odd Andreas Sørsæther <[email protected]>

Majjki requested a review from Copilot November 27, 2025 09:47

Copilot started reviewing on behalf of Majjki November 27, 2025 09:47 View session

Copilot finished reviewing on behalf of Majjki November 27, 2025 09:50

Copilot AI reviewed Nov 27, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat. filter for å skjule mentor avtaler med opphav arena #1434

feat. filter for å skjule mentor avtaler med opphav arena #1434

Uh oh!

Majjki commented Nov 24, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Nov 25, 2025

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Copilot AI Nov 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	if (skalSkjulesMentorArenaMigrering(avtale)) {
	if (!harTilgangTilMentorArenaMigrering(avtale)) {


		public boolean sjekkOmAlltErFylltUtUntattFamiljeTilknyting() {

		if (!felterSomIkkeErFyltUt().stream().filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty()) {

	if (!felterSomIkkeErFyltUt().stream().filter(x -> !x.equals("harFamilietilknytning")).toList().isEmpty()) {
	if (felterSomIkkeErFyltUt().stream().anyMatch(x -> !x.equals("harFamilietilknytning"))) {

feat. filter for å skjule mentor avtaler med opphav arena #1434

Are you sure you want to change the base?

feat. filter for å skjule mentor avtaler med opphav arena #1434

Uh oh!

Conversation

Majjki commented Nov 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants