Skip to content
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.

Sign up for GitHub

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

Utvidelse av nummerserie for D-nummer (validering) #55

Merged
merged 3 commits into from
Feb 16, 2022
Merged

Utvidelse av nummerserie for D-nummer (validering) #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6d658e
Utvidelse av nummerserie for D-nummer (validering)
eivinhb Jan 14, 2022
c2de3af
Legg inn .editorconfig for å tvinge tabs i filer.
eivinhb Jan 17, 2022
3262f17
Retter til gyldig et dnummer.
eivinhb Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = tab
eivinhb marked this conversation as resolved.
Show resolved Hide resolved
indent_size = 4
charset = utf-8
70 changes: 42 additions & 28 deletions src/main/java/no/bekk/bekkopen/person/Fodselsnummer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,29 @@ String getCentury() {
String result = null;
int individnummerInt = Integer.parseInt(getIndividnummer());
int birthYear = Integer.parseInt(get2DigitBirthYear());
if (individnummerInt <= 499) {
result = "19";
} else if (individnummerInt >= 500 && birthYear < 40) {
result = "20";
} else if (individnummerInt >= 500 && individnummerInt <= 749 && birthYear >= 54) {
result = "18";
} else if (individnummerInt >= 900 && birthYear > 39) {
result = "19";

if (isDNumber(this.getValue())) {
if (individnummerInt >= 500 && individnummerInt <= 599) {
result = "18";
} else if (individnummerInt <= 199 && birthYear < 40) {
result = "19";
} else if ((individnummerInt <= 499 || (individnummerInt >= 600 && individnummerInt <= 999)) && birthYear >= 40) {
result = "19";
} else if (individnummerInt >= 200 && individnummerInt <= 999 && birthYear < 40) {
result = "20";
}
} else {
if (individnummerInt <= 499) {
result = "19";
} else if (individnummerInt >= 500 && birthYear < 40) {
result = "20";
} else if (individnummerInt >= 500 && individnummerInt <= 749 && birthYear >= 54) {
result = "18";
} else if (individnummerInt >= 900 && birthYear > 39) {
result = "19";
}
}

return result;
}

Expand Down Expand Up @@ -155,15 +169,15 @@ public boolean isFemale() {
return !isMale();
}

static String parseSynthenticNumber(String fodselsnummer) {
if (!isSynthetic(fodselsnummer)) {
return fodselsnummer;
} else {
return fodselsnummer.substring(0, 2) + (getThirdDigit(fodselsnummer) - 8) + fodselsnummer.substring(3);
}
}
static String parseSynthenticNumber(String fodselsnummer) {
if (!isSynthetic(fodselsnummer)) {
return fodselsnummer;
} else {
return fodselsnummer.substring(0, 2) + (getThirdDigit(fodselsnummer) - 8) + fodselsnummer.substring(3);
}
}

static boolean isSynthetic(String fodselsnummer) {
static boolean isSynthetic(String fodselsnummer) {
try {
int thirdDigit = getThirdDigit(fodselsnummer);
if (thirdDigit == 8 || thirdDigit == 9) {
Expand All @@ -175,17 +189,17 @@ static boolean isSynthetic(String fodselsnummer) {
return false;
}

static boolean isDNumber(String fodselsnummer) {
try {
int firstDigit = getFirstDigit(fodselsnummer);
if (firstDigit > 3 && firstDigit < 8) {
return true;
}
} catch (IllegalArgumentException e) {
// ignore
}
return false;
}
static boolean isDNumber(String fodselsnummer) {
try {
int firstDigit = getFirstDigit(fodselsnummer);
if (firstDigit > 3 && firstDigit < 8) {
return true;
}
} catch (IllegalArgumentException e) {
// ignore
}
return false;
}

static String parseDNumber(String fodselsnummer) {
if (!isDNumber(fodselsnummer)) {
Expand All @@ -212,7 +226,7 @@ public KJONN getKjonn() {
}

@Override
public String toString(){
public String toString() {
return super.getValue();
}
}
22 changes: 14 additions & 8 deletions src/test/java/no/bekk/bekkopen/person/FodselsnummerCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class FodselsnummerCalculatorTest {

@BeforeEach
public void setUpDate() throws Exception {
df = new SimpleDateFormat("ddMMyyyy");
df = new SimpleDateFormat("ddMMyyyy");
date = df.parse("09062006");
}

Expand All @@ -38,15 +38,15 @@ public void getValidFodselsnummerForDate() {

@Test
public void testThatAllGeneratedNumbersAreValid() {
for(Fodselsnummer fnr : FodselsnummerCalculator.getManyFodselsnummerForDate(date)) {
for (Fodselsnummer fnr : FodselsnummerCalculator.getManyFodselsnummerForDate(date)) {
assertTrue(FodselsnummerValidator.isValid(fnr.toString()), "Ugyldig fødselsnummer: " + fnr);
}
}

@Test
public void testThatAllGeneratedNumbersAreNotDNumbers() {
for(Fodselsnummer fnr : FodselsnummerCalculator.getManyFodselsnummerForDate(date)) {
assertFalse(Fodselsnummer.isDNumber(fnr.toString()), "Ugyldig fødselsnummer: " + fnr);
for (Fodselsnummer fnr : FodselsnummerCalculator.getManyFodselsnummerForDate(date)) {
assertFalse(Fodselsnummer.isDNumber(fnr.toString()), "Ugyldig fødselsnummer: " + fnr);
}
}

Expand All @@ -60,17 +60,23 @@ public void testThatAtLeastOneDNumberIsGenerated() {
assertTrue(FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(date).size() >= 1);
}

@Test
public void testThatAtLeastOneDNumberIsGeneratedsas() throws ParseException {
assertEquals(82, FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(df.parse("06061878")).size());
assertEquals(164, FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(df.parse("12101921")).size());
}

@Test
public void testThatAllGeneratedDNumbersAreValid() {
for(Fodselsnummer dnr : FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(date)) {
for (Fodselsnummer dnr : FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(date)) {
assertTrue(FodselsnummerValidator.isValid(dnr.toString()), "Ugyldig D-nummer: " + dnr);
}
}

@Test
public void testThatAllGeneratedDNumbersAreDNumbers() {
for(Fodselsnummer dnr : FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(date)) {
assertTrue(Fodselsnummer.isDNumber(dnr.toString()), "Ugyldig D-nummer: " + dnr);
for (Fodselsnummer dnr : FodselsnummerCalculator.getManyDNumberFodselsnummerForDate(date)) {
assertTrue(Fodselsnummer.isDNumber(dnr.toString()), "Ugyldig D-nummer: " + dnr);
}
}

Expand All @@ -89,7 +95,7 @@ public void testInvalidDateTooLate() throws ParseException {
}

@Test
public void testOneFodselsnummer() throws ParseException{
public void testOneFodselsnummer() throws ParseException {
date = df.parse("01121980");
Fodselsnummer fodselsnummer = FodselsnummerCalculator.getFodselsnummerForDate(date);
assertTrue(FodselsnummerValidator.isValid(fodselsnummer.toString()));
Expand Down
Loading