Merge pull request #1239 from statisticsnorway/fix-fnr-logic

tone-dyrhaug · web-flow · commit 50be6cf1197b · 2026-01-19T10:41:34.000+01:00
Fix logic for incomplete fnr with suffix exceptions
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/program/extension/StringExtensions.kt b/kontroller/src/main/kotlin/no/ssb/kostra/program/extension/StringExtensions.kt
@@ -12,7 +12,10 @@ fun String.districtIdFromRegion() = this.substring(4, 6)
 
 fun String.ageInYears(reportingYear: Int): Int? =
     SsnValidationUtils
-        .extractBirthDateFromSocialSecurityId(socialSecurityId = this)
+        .extractBirthDateFromSocialSecurityId(
+            socialSecurityId = this,
+            reportingYear = reportingYear
+        )
         ?.let { dateOfBirth ->
             reportingYear - dateOfBirth.year
         }
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/program/util/SsnValidationUtils.kt b/kontroller/src/main/kotlin/no/ssb/kostra/program/util/SsnValidationUtils.kt
@@ -19,12 +19,13 @@ object SsnValidationUtils {
     private val CONTROL_SUM_DIGITS_1 = listOf(3, 7, 6, 1, 8, 9, 4, 5, 2, 1)
     private val CONTROL_SUM_DIGITS_2 = listOf(5, 4, 3, 2, 7, 6, 5, 4, 3, 2, 1)
 
-    fun extractBirthDateFromSocialSecurityId(socialSecurityId: String): LocalDate? = try {
+    fun extractBirthDateFromSocialSecurityId(socialSecurityId: String, reportingYear: Int): LocalDate? = try {
         when {
             !SSN_PATTERN.matcher(socialSecurityId).matches() -> null
+            SSN_SUFFIX_EXCEPTIONS.any { suffix -> socialSecurityId.endsWith(suffix) } -> parseDateWithSuffixExceptions(socialSecurityId, reportingYear)
             else -> parseDateWithAutoPivotYear(convertFregMonth(convertDNumber(socialSecurityId)))
         }
-    } catch (ex: DateTimeParseException) {
+    } catch (_: DateTimeParseException) {
         null
     }
 
@@ -42,15 +43,25 @@ object SsnValidationUtils {
         }
     }
 
+    internal fun parseDateWithSuffixExceptions(socialSecurityId: String, year: Int): LocalDate {
+        val date = LocalDate.parse(socialSecurityId.take(6), LOCAL_DATE_FORMATTER)
+        val referenceDate = LocalDate.of(year, 12, 31)
+
+        return if (referenceDate.plusYears(1L).isBefore(date)) {
+            date.minusYears(CENTURY) // 1900-1999
+        } else {
+            date
+        }
+    }
 
     fun isValidSocialSecurityId(personId: String) = SSN_PATTERN.matcher(personId).matches() && isModulo11Valid(personId)
 
-    fun isValidSocialSecurityIdOrDnr(personId: String) = SSN_PATTERN.matcher(personId).matches()
+    fun isValidSocialSecurityIdOrDnr(personId: String, reportingYear: Int) = SSN_PATTERN.matcher(personId).matches()
             &&
             (
                     isModulo11Valid(personId)
                             ||
-                            extractBirthDateFromSocialSecurityId(personId) != null
+                            extractBirthDateFromSocialSecurityId(personId, reportingYear) != null
                             && SSN_SUFFIX_EXCEPTIONS.contains(personId.takeLast(PERSON_ID_LENGTH))
                     )
 
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ03.kt b/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ03.kt
@@ -15,7 +15,7 @@ class Individ03 : AbstractRule<KostraIndividType>(
     override fun validate(context: KostraIndividType, arguments: KotlinArguments) = context.run {
         when {
             fodselsnummer != null -> when {
-                isValidSocialSecurityIdOrDnr(fodselsnummer!!) -> null
+                isValidSocialSecurityIdOrDnr(fodselsnummer!!, arguments.aargang.toInt()) -> null
                 else -> createSingleReportEntryList(
                     contextId = context.id,
                     messageText = "Feil i fødselsnummer. Kan ikke identifisere individet."
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ12.kt b/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ12.kt
@@ -13,7 +13,7 @@ class Individ12 : AbstractRule<KostraIndividType>(
 ) {
     override fun validate(context: KostraIndividType, arguments: KotlinArguments) =
         if (context.fodselsnummer == null
-            || !isValidSocialSecurityIdOrDnr(context.fodselsnummer!!)
+            || !isValidSocialSecurityIdOrDnr(context.fodselsnummer!!, arguments.aargang.toInt())
         ) {
             createSingleReportEntryList(
                 contextId = context.id,
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/extensions/KostraRecordSosialExtensions.kt b/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/extensions/KostraRecordSosialExtensions.kt
@@ -21,8 +21,8 @@ fun KostraRecord.hasNotVarighet() = (1..12)
 fun KostraRecord.ageInYears(arguments: KotlinArguments): Int =
     this[KvalifiseringColumnNames.PERSON_FODSELSNR_COL_NAME].ageInYears(arguments.aargang.toInt()) ?: -1
 
-fun KostraRecord.hasFnr(): Boolean =
-    SsnValidationUtils.isValidSocialSecurityIdOrDnr(this[KvalifiseringColumnNames.PERSON_FODSELSNR_COL_NAME])
+fun KostraRecord.hasFnr(reportingYear: Int): Boolean =
+    SsnValidationUtils.isValidSocialSecurityIdOrDnr(this[KvalifiseringColumnNames.PERSON_FODSELSNR_COL_NAME], reportingYear)
 
 fun Collection<KostraRecord>.varighetAsStatsEntries() = this
     .map { kostraRecord ->
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/kvalifisering/rule/Rule005aFoedselsnummerDubletter.kt b/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/kvalifisering/rule/Rule005aFoedselsnummerDubletter.kt
@@ -7,20 +7,21 @@ import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.PERSON_F
 import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.PERSON_JOURNALNR_COL_NAME
 import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.STATUS_COL_NAME
 import no.ssb.kostra.program.KostraRecord
+import no.ssb.kostra.program.KotlinArguments
 import no.ssb.kostra.program.util.SsnValidationUtils
 import no.ssb.kostra.validation.report.Severity
-import no.ssb.kostra.validation.rule.AbstractNoArgsRule
+import no.ssb.kostra.validation.rule.AbstractRule
 import no.ssb.kostra.validation.rule.sosial.SosialRuleId
 
-class Rule005aFoedselsnummerDubletter : AbstractNoArgsRule<List<KostraRecord>>(
+class Rule005aFoedselsnummerDubletter : AbstractRule<List<KostraRecord>>(
     SosialRuleId.FODSELSNUMMER_DUBLETTER_05A.title,
     Severity.ERROR
 ) {
-    override fun validate(context: List<KostraRecord>) = context
+    override fun validate(context: List<KostraRecord>, arguments: KotlinArguments) = context
         .asSequence()
         .filter { kostraRecord ->
             kostraRecord[KOMMUNE_NR_COL_NAME] != OSLO_MUNICIPALITY_ID
-                    && SsnValidationUtils.isValidSocialSecurityIdOrDnr(kostraRecord[PERSON_FODSELSNR_COL_NAME])
+                    && SsnValidationUtils.isValidSocialSecurityIdOrDnr(kostraRecord[PERSON_FODSELSNR_COL_NAME], arguments.aargang.toInt())
         }
         .groupBy { kostraRecord -> kostraRecord[PERSON_FODSELSNR_COL_NAME] + kostraRecord[STATUS_COL_NAME] }
         .filter { (_, group) -> group.size > 1 }
diff --git a/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/rule/Rule005Fodselsnummer.kt b/kontroller/src/main/kotlin/no/ssb/kostra/validation/rule/sosial/rule/Rule005Fodselsnummer.kt
@@ -4,18 +4,19 @@ import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.PERSON_F
 import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.PERSON_JOURNALNR_COL_NAME
 import no.ssb.kostra.area.sosial.kvalifisering.KvalifiseringColumnNames.SAKSBEHANDLER_COL_NAME
 import no.ssb.kostra.program.KostraRecord
+import no.ssb.kostra.program.KotlinArguments
 import no.ssb.kostra.program.extension.fieldAs
 import no.ssb.kostra.program.util.SsnValidationUtils.isValidSocialSecurityIdOrDnr
 import no.ssb.kostra.validation.report.Severity
-import no.ssb.kostra.validation.rule.AbstractNoArgsRule
+import no.ssb.kostra.validation.rule.AbstractRule
 import no.ssb.kostra.validation.rule.sosial.SosialRuleId
 
-class Rule005Fodselsnummer : AbstractNoArgsRule<List<KostraRecord>>(
+class Rule005Fodselsnummer : AbstractRule<List<KostraRecord>>(
     SosialRuleId.FODSELSNUMMER_05.title,
     Severity.ERROR
 ) {
-    override fun validate(context: List<KostraRecord>) = context
-        .filterNot { isValidSocialSecurityIdOrDnr(it.fieldAs(PERSON_FODSELSNR_COL_NAME)) }
+    override fun validate(context: List<KostraRecord>, arguments: KotlinArguments) = context
+        .filterNot { isValidSocialSecurityIdOrDnr(it.fieldAs(PERSON_FODSELSNR_COL_NAME), arguments.aargang.toInt()) }
         .map {
             createValidationReportEntry(
                 "Det er ikke oppgitt fødselsnummer/d-nummer på deltakeren eller fødselsnummeret/d-nummeret " +
diff --git a/kontroller/src/test/kotlin/no/ssb/kostra/program/util/SsnValidationUtilsTest.kt b/kontroller/src/test/kotlin/no/ssb/kostra/program/util/SsnValidationUtilsTest.kt
@@ -11,17 +11,24 @@ import no.ssb.kostra.program.util.SsnValidationUtils.validateDUF
 import java.time.LocalDate
 
 class SsnValidationUtilsTest : BehaviorSpec({
+    val reportingYear = 2025
 
     Given("extractBirthDateFromSocialSecurityId") {
         forAll(
             row("123", "N/A", null),
             row("05011399292", "fnr", LocalDate.of(2013, 1, 5)),
             row("41011088188", "dnr", LocalDate.of(2010, 1, 1)),
             row("01811088188", "tnr", LocalDate.of(2010, 1, 1)),
+            row("01010100100", "N/A", LocalDate.of(2001, 1, 1)),
+            row("01018000100", "N/A", LocalDate.of(1980, 1, 1)),
+            row("01018000200", "N/A", LocalDate.of(1980, 1, 1)),
+            row("01012599999", "N/A", LocalDate.of(2025, 1, 1)),
+            row("01012699999", "N/A", LocalDate.of(2026, 1, 1)),
+            row("01012799999", "N/A", LocalDate.of(1927, 1, 1)),
         ) { socialSecurityId, type, expectedDate ->
             When("$socialSecurityId $type") {
 
-                val dateOfBirth = SsnValidationUtils.extractBirthDateFromSocialSecurityId(socialSecurityId)
+                val dateOfBirth = SsnValidationUtils.extractBirthDateFromSocialSecurityId(socialSecurityId, reportingYear)
 
                 Then("dateOfBirth ($dateOfBirth) should be as expected ($expectedDate)") {
                     dateOfBirth shouldBe expectedDate
@@ -94,7 +101,7 @@ class SsnValidationUtilsTest : BehaviorSpec({
             row("valid unborn ssn", "05012999999", true),
         ) { description, socialSecurityId, expectedResult ->
             When(description) {
-                val isValidSocialSecurityIdOrDnr = isValidSocialSecurityIdOrDnr(socialSecurityId)
+                val isValidSocialSecurityIdOrDnr = isValidSocialSecurityIdOrDnr(socialSecurityId, reportingYear)
 
                 Then("isValidSocialSecurityIdOrDnr($socialSecurityId) should be $expectedResult") {
                     isValidSocialSecurityIdOrDnr shouldBe expectedResult
diff --git a/kontroller/src/test/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ07Test.kt b/kontroller/src/test/kotlin/no/ssb/kostra/validation/rule/barnevern/individrule/Individ07Test.kt
@@ -25,21 +25,36 @@ class Individ07Test : BehaviorSpec({
             ForAllRowItem(
                 "individ with fodselsnummer, age below 25",
                 individInTest.copy(
-                    fodselsnummer = RandomUtils.generateRandomSsn(24, Year.now().value - 1)
+                    fodselsnummer = RandomUtils.generateRandomSsn(
+                        24,
+                        Year.now().value - 1
+                    )
                 )
             ),
             ForAllRowItem(
                 "individ with fodselsnummer, age is 25",
                 individInTest.copy(
-                    fodselsnummer = RandomUtils.generateRandomSsn(25, Year.now().value - 1)
+                    fodselsnummer = RandomUtils.generateRandomSsn(
+                        25,
+                        Year.now().value - 1
+                    )
                 )
             ),
             ForAllRowItem(
                 "individ age above 25",
                 individInTest.copy(
-                    fodselsnummer = RandomUtils.generateRandomSsn(26, Year.now().value - 1)
+                    fodselsnummer = RandomUtils.generateRandomSsn(
+                        26,
+                        Year.now().value - 1
+                    )
                 ),
                 expectedErrorMessage = "Individet er 26 år og skal avsluttes som klient"
+            ),
+            ForAllRowItem(
+                "individ age 18 with incomplete fodselsnummer",
+                individInTest.copy(
+                    fodselsnummer = "0101${Year.now().value.minus(18).toString().takeLast(2)}00100"
+                ),
             )
         )
     )
diff --git a/kontroller/src/test/kotlin/no/ssb/kostra/validation/rule/sosial/extensions/KostraRecordSosialExtensionsTest.kt b/kontroller/src/test/kotlin/no/ssb/kostra/validation/rule/sosial/extensions/KostraRecordSosialExtensionsTest.kt
@@ -88,7 +88,7 @@ class KostraRecordSosialExtensionsTest : BehaviorSpec({
                 val sut = kostraRecordInTest(fnr = fnr)
 
                 Then("result should be as expected") {
-                    sut.first().hasFnr() shouldBe expectedResult
+                    sut.first().hasFnr(RuleTestData.argumentsInTest.aargang.toInt()) shouldBe expectedResult
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class KostraRecordSosialExtensionsTest : BehaviorSpec({`
`88`	`88`	`val sut = kostraRecordInTest(fnr = fnr)`
`89`	`89`
`90`	`90`	`Then("result should be as expected") {`
`91`		`- sut.first().hasFnr() shouldBe expectedResult`
	`91`	`+ sut.first().hasFnr(RuleTestData.argumentsInTest.aargang.toInt()) shouldBe expectedResult`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`