Skip to content

feat: Allow + in enskild firma. #35

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

Merged
Johannestegner merged 1 commit into from
Feb 20, 2024
Merged

feat: Allow + in enskild firma. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/main/java/dev/organisationsnummer/Organisationsnummer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ public Organisationsnummer(String input) throws OrganisationsnummerException {
* @return Formatted string.
*/
public String format(boolean separator) {
if (separator && this.isPersonnummer) {
return this.innerPersonnummer.format(false);
}

String nr = this.getShortString();

return separator ?
Expand Down Expand Up @@ -156,6 +160,7 @@ private void innerParse(String input) throws OrganisationsnummerException {
throw new OrganisationsnummerException("Input value too " + (input.length() > 13 ? "long" : "short"));
}

String originalInput = input;
try {
Matcher matches = regexPattern.matcher(input);
if (!matches.find()) {
Expand All @@ -181,7 +186,7 @@ private void innerParse(String input) throws OrganisationsnummerException {

} catch (OrganisationsnummerException e) {
try {
this.innerPersonnummer = Personnummer.parse(input);
this.innerPersonnummer = Personnummer.parse(originalInput);
this.isPersonnummer = true;
} catch (PersonnummerException ex) {
throw new OrganisationsnummerException();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/OrganisationsnummerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void testFormatWithoutSeparator(OrgNrData input) throws Organisationsnumm
@ParameterizedTest
@MethodSource("DataProvider#getValid")
public void testFormatWithSeparator(OrgNrData input) throws OrganisationsnummerException {
assertEquals(input.longFormat, Organisationsnummer.parse(input.shortFormat).format(true));
assertEquals(input.longFormat.replace('+', '-'), Organisationsnummer.parse(input.shortFormat).format(true));
assertEquals(input.longFormat, Organisationsnummer.parse(input.longFormat).format(true));
}

Expand Down