From 530223bb16b0bb2ad1a241b7a09c53e76ec6fe74 Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 10:08:14 +0100 Subject: [PATCH 1/7] feat: created Organisation class --- .../app/model/organization/Organization.java | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/group5/app/model/organization/Organization.java b/src/main/java/edu/group5/app/model/organization/Organization.java index 825945f..abb2f71 100644 --- a/src/main/java/edu/group5/app/model/organization/Organization.java +++ b/src/main/java/edu/group5/app/model/organization/Organization.java @@ -1,5 +1,45 @@ package edu.group5.app.model.organization; +import java.util.Objects; + public class Organization { - + private final int orgNumber; + private final String name; + private final boolean trusted; + private final String websiteURL; + private final boolean isPreApproved; + private final String description; + + public Organization(int orgNumber, String name, boolean trusted, String websiteURL, boolean isPreApproved, String description) { + this.orgNumber = orgNumber; + this.name = Objects.requireNonNull(name, "name cannot be null"); + this.trusted = trusted; + this.websiteURL = Objects.requireNonNull(websiteURL, "websiteURL cannot be null"); + this.isPreApproved = isPreApproved; + this.description = Objects.requireNonNull(description, "description cannot be null"); + } + + public int getOrgNumber() { + return orgNumber; + } + + public String getName() { + return name; + } + + public boolean isTrusted() { + return trusted; + } + + public String getWebsiteURL() { + return websiteURL; + } + + public boolean isPreApproved() { + return isPreApproved; + } + + public String getDescription() { + return description; + } } From 51a85e685c7dce635c38e1e8f835f93cf5c676b8 Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 10:47:33 +0100 Subject: [PATCH 2/7] feat: made Organization into a record class + error handling + javadoc --- .../app/model/organization/Organization.java | 67 ++++++++++--------- .../model/organization/OrganizationTest.java | 4 ++ 2 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 src/test/java/edu/group5/app/model/organization/OrganizationTest.java diff --git a/src/main/java/edu/group5/app/model/organization/Organization.java b/src/main/java/edu/group5/app/model/organization/Organization.java index abb2f71..885f0ed 100644 --- a/src/main/java/edu/group5/app/model/organization/Organization.java +++ b/src/main/java/edu/group5/app/model/organization/Organization.java @@ -2,44 +2,49 @@ import java.util.Objects; -public class Organization { - private final int orgNumber; - private final String name; - private final boolean trusted; - private final String websiteURL; - private final boolean isPreApproved; - private final String description; - +/** + * Represents an organization. + * + *

An organization is identified by an organization number, a name, + * trust status, website URL, pre-approval status, and a textual description. + * + *

Instances are validated on creation: + *

+ */ +public record Organization(int orgNumber, String name, boolean trusted, String websiteURL, boolean isPreApproved, + String description) { + /** + * Creates a new organization. + * + * @param orgNumber the organization number; must be non-negative + * @param name the organization name; must not be null or blank + * @param trusted whether the organization is trusted + * @param websiteURL the organization's website URL; must not be null or blank + * @param isPreApproved whether the organization is pre-approved + * @param description a textual description of the organization; must not be null + * @throws NullPointerException if name, websiteURL or description is null + * @throws IllegalArgumentException if orgNumber is negative, or if name or websiteURL is blank + */ public Organization(int orgNumber, String name, boolean trusted, String websiteURL, boolean isPreApproved, String description) { + if (orgNumber < 0) { + throw new IllegalArgumentException("orgNumber cannot be negative"); + } this.orgNumber = orgNumber; this.name = Objects.requireNonNull(name, "name cannot be null"); this.trusted = trusted; this.websiteURL = Objects.requireNonNull(websiteURL, "websiteURL cannot be null"); this.isPreApproved = isPreApproved; this.description = Objects.requireNonNull(description, "description cannot be null"); - } - - public int getOrgNumber() { - return orgNumber; - } - - public String getName() { - return name; - } - - public boolean isTrusted() { - return trusted; - } - - public String getWebsiteURL() { - return websiteURL; - } - - public boolean isPreApproved() { - return isPreApproved; - } - public String getDescription() { - return description; + if (name.isBlank()) { + throw new IllegalArgumentException("name cannot be blank"); + } + if (websiteURL.isBlank()) { + throw new IllegalArgumentException("websiteURL cannot be blank"); + } } } diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationTest.java new file mode 100644 index 0000000..557c0c0 --- /dev/null +++ b/src/test/java/edu/group5/app/model/organization/OrganizationTest.java @@ -0,0 +1,4 @@ +import static org.junit.jupiter.api.Assertions.*; +class OrganizationTest { + +} \ No newline at end of file From fbbdab4b439806938429819006c2d7ce8305b45e Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 10:48:02 +0100 Subject: [PATCH 3/7] test: made unit tests for Organization --- .../model/organization/OrganizationTest.java | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationTest.java index 557c0c0..3b086c3 100644 --- a/src/test/java/edu/group5/app/model/organization/OrganizationTest.java +++ b/src/test/java/edu/group5/app/model/organization/OrganizationTest.java @@ -1,4 +1,86 @@ +package edu.group5.app.model.organization; + +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.*; + class OrganizationTest { + @Test + void constructor_ThrowsWhenOrgNumberIsNegative() { + assertThrows(IllegalArgumentException.class, () -> {new Organization( + -1, + "Org", + true, + null, + true, + "Org description" + ); + }); + } + + @Test + void constructor_ThrowsWhenNameIsNull() { + assertThrows(NullPointerException.class, () -> {new Organization( + 1, + null, + true, + "org.com", + true, + "Org description" + ); + }); + } + + @Test + void constructor_ThrowsWhenNameIsBlank() { + assertThrows(IllegalArgumentException.class, () -> {new Organization( + 1, + "", + true, + "org.com", + true, + "Org description" + ); + }); + } + + @Test + void constructor_ThrowsWhenWebsiteURLIsNull() { + assertThrows(NullPointerException.class, () -> {new Organization( + 1, + "Org", + true, + null, + true, + "Org description" + ); + }); + } + + @Test + void constructor_ThrowsWhenWebsiteURLIsBlank() { + assertThrows(IllegalArgumentException.class, () -> {new Organization( + 1, + "Org", + true, + "", + true, + "Org description" + ); + }); + } + + @Test + void constructor_ThrowsWhenDescriptionIsNull() { + assertThrows(NullPointerException.class, () -> {new Organization( + 1, + "Org", + true, + "org.com", + true, + null + ); + }); + } } \ No newline at end of file From 76e620f7cd2582413d39aea6d37310f65f5298c9 Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 11:15:16 +0100 Subject: [PATCH 4/7] feat: created OrganizationRepo class --- .../model/organization/OrganizationRepo.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/edu/group5/app/model/organization/OrganizationRepo.java diff --git a/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java b/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java new file mode 100644 index 0000000..850333f --- /dev/null +++ b/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java @@ -0,0 +1,39 @@ +package edu.group5.app.model.organization; + +import edu.group5.app.model.Repository; + +import java.util.HashMap; +import java.util.Objects; + +/** + * Handles business logic associated with organizations + */ +public class OrganizationRepo implements Repository { + private HashMap content; + + /** + * Creates a new Organization Repository + * + * @param content holds all current organizations + * @throws NullPointerException if content is null + */ + public OrganizationRepo(HashMap content) { + this.content = Objects.requireNonNull(content, "content cannot be null"); + } + + public HashMap getContent() { + return content; + } + + public HashMap getTrustedOrganizations() { + HashMap trustedOrgs = new HashMap<>(); + + content.forEach((orgNr, org) -> { + if (org.trusted()) { + trustedOrgs.put(orgNr, org); + } + }); + + return trustedOrgs; + } +} From 98b995bf787af59c7f73c54b8716b1272014ca45 Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 11:53:56 +0100 Subject: [PATCH 5/7] test: created OrganizationRepoTest class --- .../group5/app/model/organization/OrganizationRepoTest.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/test/java/edu/group5/app/model/organization/OrganizationRepoTest.java diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationRepoTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationRepoTest.java new file mode 100644 index 0000000..780bf8e --- /dev/null +++ b/src/test/java/edu/group5/app/model/organization/OrganizationRepoTest.java @@ -0,0 +1,4 @@ +import static org.junit.jupiter.api.Assertions.*; +class OrganizationRepoTest { + +} \ No newline at end of file From aefd5ffb8f758c8ee43d8ea4b3a5d210f0b80fb8 Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 11:55:04 +0100 Subject: [PATCH 6/7] feat: created abstract class Repository --- .../java/edu/group5/app/model/Repository.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/edu/group5/app/model/Repository.java diff --git a/src/main/java/edu/group5/app/model/Repository.java b/src/main/java/edu/group5/app/model/Repository.java new file mode 100644 index 0000000..d0d2792 --- /dev/null +++ b/src/main/java/edu/group5/app/model/Repository.java @@ -0,0 +1,20 @@ +package edu.group5.app.model; + +/** + * Represents a repository + */ +public abstract class Repository { + protected final Object content; + + public Repository(Object content) { + this.content = content; + } + + /** + * Gets the content of the repo + * @return content of the repo + */ + public Object getContent() { + return content; + } +} From dc7bc8f024a98a06108320789cee82ee0f772aed Mon Sep 17 00:00:00 2001 From: emilfa Date: Thu, 26 Feb 2026 11:56:16 +0100 Subject: [PATCH 7/7] feat: minor changes to OrganizationRepo --- .../app/model/organization/OrganizationRepo.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java b/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java index 850333f..27b128f 100644 --- a/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java +++ b/src/main/java/edu/group5/app/model/organization/OrganizationRepo.java @@ -8,23 +8,24 @@ /** * Handles business logic associated with organizations */ -public class OrganizationRepo implements Repository { - private HashMap content; +public class OrganizationRepo extends Repository { + private final HashMap content; /** * Creates a new Organization Repository * - * @param content holds all current organizations + * @param content holds all current organizations in the repository * @throws NullPointerException if content is null */ public OrganizationRepo(HashMap content) { this.content = Objects.requireNonNull(content, "content cannot be null"); + super(content); } - public HashMap getContent() { - return content; - } - + /** + * Gets all trusted organizations in the repository + * @return all organizations with trusted = true + */ public HashMap getTrustedOrganizations() { HashMap trustedOrgs = new HashMap<>();