diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java index f1ce4aa..19c7714 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/UserDAO.java @@ -7,8 +7,8 @@ import ntnu.systemutvikling.team6.models.user.User; /** - * This class is responsible for sending concurrent information about the user to the User - * database, and user settings to the settings database. + * This class is responsible for sending concurrent information about the user to the User database, + * and user settings to the settings database. * * @author Robin Strand Prestmo */ diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index 3dc7f4c..91ac90c 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -16,8 +16,8 @@ import ntnu.systemutvikling.team6.database.Readers.CharitySelect; import ntnu.systemutvikling.team6.database.Readers.DonationSelect; import ntnu.systemutvikling.team6.models.Charity; -import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.models.Donation; +import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.models.registry.DonationRegistry; /** diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java index 4000b25..a0bdd2c 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java @@ -250,7 +250,7 @@ FOREIGN KEY (`User_UUID_User`) ENGINE = InnoDB; """; String charityVanityTable = - """ + """ CREATE TABLE IF NOT EXISTS `apbaluna`.`Charities` ( `UUID_charities` CHAR(36) NOT NULL, `org_number` VARCHAR(255) NOT NULL, diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java index 65c4f3e..6bf7e5b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java @@ -5,11 +5,10 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; - import ntnu.systemutvikling.team6.database.DatabaseConnection; import ntnu.systemutvikling.team6.models.Charity; -import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.models.Feedback; +import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.models.user.User; /** @@ -38,10 +37,11 @@ public CharitySelect(DatabaseConnection connection) { * who submitted each piece of feedback. * *

The query performs a LEFT JOIN between the {@code Charities}, {@code Feedback}, {@code - * User}, {@code CharityVanity}, and {@code category(s)} tables. Each unique charity is added once to the registry; any feedback rows found for - * that charity are appended to its feedback list. + * User}, {@code CharityVanity}, and {@code category(s)} tables. Each unique charity is added once + * to the registry; any feedback rows found for that charity are appended to its feedback list. * - *

Note: charities with no feedback and categories are still included in the result due to the LEFT JOIN. + *

Note: charities with no feedback and categories are still included in the result due to the + * LEFT JOIN. * * @return a {@link CharityRegistry} containing all charities found in the database, each * populated with its associated {@link Feedback} objects (if any) @@ -91,15 +91,14 @@ public CharityRegistry getCharitiesFromDB() { rs.getString("description"), rs.getString("logoURL"), rs.getString("keyValues"), - rs.getBytes("logoBLOB") - ); + rs.getBytes("logoBLOB")); registry.addCharity(currentCharity); lastCharity = currentId; seenFeedbackIds.clear(); } String categoryName = rs.getString("category"); - if (categoryName != null & !currentCharity.getCategory().contains(categoryName)){ + if (categoryName != null & !currentCharity.getCategory().contains(categoryName)) { currentCharity.getCategory().add(categoryName); } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java index 66b2f30..66ea367 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java @@ -68,15 +68,16 @@ public Charity( } /** - * Contructor for creating a new charity. Taylored to match data given from DATABASE. - * Expects paramaters that will fill all attributes. EXECPT for feedbacks and categories. + * Contructor for creating a new charity. Taylored to match data given from DATABASE. Expects + * paramaters that will fill all attributes. EXECPT for feedbacks and categories. * * @param org_number matches from innsamlingkontrollen * @param name matches from innsamlingkontrollen * @param is_pre_approved name matches from innsamlingkontrollen * @param status name matches from innsamlingkontrollen */ - public Charity(String uuid, + public Charity( + String uuid, String org_number, String name, String url, @@ -146,7 +147,7 @@ public String getKeyValues() { } public byte[] getLogoBlob() { - return this.logoBlob; + return this.logoBlob; } /** Setter for verification status. This one sets the charity as verified. */ @@ -179,15 +180,13 @@ public void setKeyValues(String values) { this.keyValues = values; } - /** Setter for the charity's logo Blob. */ + /** Setter for the charity's logo Blob. */ public void setLogoBlob(byte[] logoBlob) { - this.logoBlob = logoBlob; + this.logoBlob = logoBlob; } - /** - * Setter for - */ - public void setFeedbacks(ArrayList feedbacks){ + /** Setter for setting feedbacks */ + public void setFeedbacks(ArrayList feedbacks) { this.feedbacks = feedbacks; } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/CharityRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/CharityRegistry.java index 8f6660a..c6aabbd 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/CharityRegistry.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/CharityRegistry.java @@ -1,8 +1,7 @@ package ntnu.systemutvikling.team6.models.registry; -import ntnu.systemutvikling.team6.models.Charity; - import java.util.*; +import ntnu.systemutvikling.team6.models.Charity; public class CharityRegistry { private final List charities; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java index f5b237d..d66ee97 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/registry/DonationRegistry.java @@ -1,8 +1,7 @@ package ntnu.systemutvikling.team6.models.registry; -import ntnu.systemutvikling.team6.models.Donation; - import java.util.*; +import ntnu.systemutvikling.team6.models.Donation; public class DonationRegistry { private final List donations; diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/FullCharityScrape.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/FullCharityScrape.java index c88fb11..67fbda6 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/FullCharityScrape.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/FullCharityScrape.java @@ -1,46 +1,49 @@ package ntnu.systemutvikling.team6.scraper; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.http.HttpClient; import ntnu.systemutvikling.team6.models.Charity; import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.scraper.scraperComponents.APICharityScraper; import ntnu.systemutvikling.team6.scraper.scraperComponents.URLCharityScraper; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.http.HttpClient; - public class FullCharityScrape { - private APICharityScraper apiScraper; + private APICharityScraper apiScraper; - public FullCharityScrape() throws URISyntaxException { - HttpClient https = HttpClient.newHttpClient(); - this.apiScraper = new APICharityScraper(https); - } + public FullCharityScrape() throws URISyntaxException { + HttpClient https = HttpClient.newHttpClient(); + this.apiScraper = new APICharityScraper(https); + } - public CharityRegistry getAPIAndURLCharityData() throws IOException, InterruptedException { - CharityRegistry charityRegistry = null; - if (apiScraper.checkConnection()) { - charityRegistry = apiScraper.parseJSON(apiScraper.getJSONData()); - for (Charity charity : charityRegistry.getAllCharities()) { - System.out.println(charity.getName()); - } - // Scrapes description, logo, categories, and key values from IK - int charityCounter = 0; - for (Charity charity : charityRegistry.getAllCharities()) { - charityCounter++; + public CharityRegistry getAPIAndURLCharityData() throws IOException, InterruptedException { + CharityRegistry charityRegistry = null; + if (apiScraper.checkConnection()) { + charityRegistry = apiScraper.parseJSON(apiScraper.getJSONData()); + for (Charity charity : charityRegistry.getAllCharities()) { + System.out.println(charity.getName()); + } + // Scrapes description, logo, categories, and key values from IK + int charityCounter = 0; + for (Charity charity : charityRegistry.getAllCharities()) { + charityCounter++; - System.out.println("Scraping charity vanity details: " + charityCounter + " of " + charityRegistry.getAllCharities().size()); - URLCharityScraper urlScraper = new URLCharityScraper(charity.getURL()); - urlScraper.scrapeCharityPage(); + System.out.println( + "Scraping charity vanity details: " + + charityCounter + + " of " + + charityRegistry.getAllCharities().size()); + URLCharityScraper urlScraper = new URLCharityScraper(charity.getURL()); + urlScraper.scrapeCharityPage(); - charity.setDescription(urlScraper.getDescription()); - charity.setCategory(urlScraper.getCategories()); - charity.setLogoURL(urlScraper.getLogoURL()); - charity.setKeyValues(urlScraper.getKeyValues()); - byte[] logoBlob = LogoDownloader.downloadImageAsBlob(charity.getLogoURL()); - charity.setLogoBlob(logoBlob); - } - } - return charityRegistry; + charity.setDescription(urlScraper.getDescription()); + charity.setCategory(urlScraper.getCategories()); + charity.setLogoURL(urlScraper.getLogoURL()); + charity.setKeyValues(urlScraper.getKeyValues()); + byte[] logoBlob = LogoDownloader.downloadImageAsBlob(charity.getLogoURL()); + charity.setLogoBlob(logoBlob); + } } + return charityRegistry; + } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/LogoDownloader.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/LogoDownloader.java index e190699..2a871ff 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/LogoDownloader.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/LogoDownloader.java @@ -36,9 +36,9 @@ public static byte[] downloadImageAsBlob(String imageUrl) { * @param fileName the filename of the .png image file */ public static void convertBlobToPNG(byte[] imageBytes, String fileName) { - if (imageBytes == null) { - return; - } + if (imageBytes == null) { + return; + } try { Path folder = Paths.get("target", "logo"); Files.createDirectories(folder); diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraper.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraper.java index d7b087e..f6216cf 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraper.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraper.java @@ -256,7 +256,8 @@ public String getLogoURL() { * * @return a String of strings containing the categories for the charity */ - public String getCategories() { + public List getCategories() { + /* StringBuilder categoriesString = new StringBuilder(); for (int i = 0; i < this.categories.size(); i++) { @@ -265,7 +266,8 @@ public String getCategories() { categoriesString.append(","); } } - return categoriesString.toString(); + */ + return categories; } /** diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java index 85ab942..cfaa6f5 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java @@ -12,8 +12,8 @@ public class APIToDatabaseService { private final DatabaseConnection connection; /** - * Contractor for APIToDatabaseService. It uses a DatabaseConnection object that contains a connection - * credentials. + * Contractor for APIToDatabaseService. It uses a DatabaseConnection object that contains a + * connection credentials. * * @param connection */ @@ -23,14 +23,14 @@ public APIToDatabaseService(DatabaseConnection connection) { /** * This method is used to verify the integrity of the data in the {@code charities} table and to - * update it based on the data retrieved from the IK API and the charity's URL. - * The param charities are retrieved from - * the IK API through the APICharityData class. Called in initialize method in - * HmHApplication.java, which is the main class of the application, to ensure that the data is up - * to date when the application starts. Uses a temp table to ensure that the data in the database - * is consistent with the data from the API. + * update it based on the data retrieved from the IK API and the charity's URL. The param + * charities are retrieved from the IK API through the APICharityData class. Called in initialize + * method in HmHApplication.java, which is the main class of the application, to ensure that the + * data is up to date when the application starts. Uses a temp table to ensure that the data in + * the database is consistent with the data from the API. + * *

Uses a URLScraper object to get data not contained in the API, and static methods from - * LogoDownloader to get the charity's logo as a blob.

+ * LogoDownloader to get the charity's logo as a blob. * * @param charities a list of {@code Charity} objects to add to the database */ @@ -41,13 +41,13 @@ public void addAPIDataToTable(List charities) { conn = connection.getMySqlConnection(); conn.setAutoCommit(false); String sql_query = - """ + """ INSERT INTO Charities (UUID_charities, org_number, pre_approved, status) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE pre_approved = VALUES(pre_approved), status = VALUES(status); - + INSERT INTO CharityVanity (UUID_charity, charity_name, charity_link, description, logoURL, key_values, logoBlob) VALUES (?, ?, ?, ?, ?, ?, ?,) ON DUPLICATE KEY UPDATE @@ -68,7 +68,6 @@ INSERT INTO CharityVanity (UUID_charity, charity_name, charity_link, description } else { ps.setString(1, charity.getUUID().toString()); ps.setString(5, charity.getUUID().toString()); - } // Charity ps.setString(2, charity.getOrg_number().replaceAll("\\s", "")); diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DatabaseManagerTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DatabaseManagerTest.java deleted file mode 100644 index c64399f..0000000 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/DatabaseManagerTest.java +++ /dev/null @@ -1,158 +0,0 @@ -package ntnu.systemutvikling.team6.database; - -import static org.junit.jupiter.api.Assertions.*; - -import java.sql.*; -import java.util.ArrayList; -import java.util.List; -import ntnu.systemutvikling.team6.models.Charity; -import ntnu.systemutvikling.team6.models.registry.CharityRegistry; -import ntnu.systemutvikling.team6.scraper.LogoDownloader; -import org.junit.jupiter.api.*; - -class DatabaseManagerTest { - - private DatabaseManager dbManager; - - @BeforeEach - public void setUp() throws SQLException { - this.dbManager = new DatabaseManager(); - } - - @Test - public void blobImageTest() { - dbManager.createTables(); - - String org_number = "12345"; - String name = "Test Charity"; - String status = "approved"; - String url = - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/"; - boolean is_pre_approved = false; - - Charity charity = new Charity(org_number, url, name, is_pre_approved, status); - dbManager.addAPIDataToTable(List.of(charity)); - LogoDownloader.convertBlobToPNG(charity.getLogoBlob(), charity.getUUID().toString()); - } - - - // Make sure you're connected to the NTNU network for this to work - @Test - public void testConnectionShouldReturnTrue() { - assertTrue(dbManager.testConnection()); - } - - @Test - void createCharitiesTableShouldCreateTableSuccessfully() throws SQLException { - dbManager.createTables(); - - try (Connection conn = new DatabaseConnection().getMySqlConnection()) { - ResultSet rs = conn.getMetaData().getTables(null, null, "Charities", null); - - assertTrue(rs.next()); - } - } - - @Test - void updateCharitiesShouldInsertCorrectData() throws SQLException { - dbManager.createTables(); - - String org_number = "12345"; - String name = "Test Charity"; - String status = "approved"; - String url = - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/"; - boolean is_pre_approved = false; - - Charity charity = new Charity(org_number, url, name, is_pre_approved, status); - dbManager.addAPIDataToTable(List.of(charity)); - - Charity charity2 = new Charity(org_number, url, name + " Updated", is_pre_approved, status); - dbManager.addAPIDataToTable(List.of(charity2)); - - dbManager.createTables(); - - CharityRegistry registry = dbManager.getCharitiesFromDB(); - Charity insertedCharity = registry.findCharityByOrgnumber("12345").get(); - assertEquals("Test Charity Updated", insertedCharity.getName()); - } - - @Test - void updateCharitiesShouldRemoveDataNotInList() throws SQLException { - String org_number = "12345"; - String name = "Svindelorg"; - String status = "approved"; - String url = - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/"; - boolean is_pre_approved = false; - - var charity1 = new Charity(org_number, url, name, is_pre_approved, status); - - org_number = "23456"; - name = "SvindelKoin"; - status = "approved"; - url = - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/"; - is_pre_approved = true; - - var charity2 = new Charity(org_number, url, name, is_pre_approved, status); - - org_number = "345672"; - name = "Arme Svindlere"; - status = "approved"; - url = - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/"; - is_pre_approved = false; - - var charity3 = new Charity(org_number, url, name, is_pre_approved, status); - - List charityListBefore = new ArrayList<>(); - charityListBefore.add(charity1); - charityListBefore.add(charity2); - charityListBefore.add(charity3); - - dbManager.addAPIDataToTable(charityListBefore); - - List charityListNew = new ArrayList<>(); - charityListNew.add(charity1); - charityListNew.add(charity3); - - dbManager.addAPIDataToTable(charityListNew); - - try (Connection conn = new DatabaseConnection().getMySqlConnection()) { - PreparedStatement stmt = - conn.prepareStatement("SELECT COUNT(org_number) AS number_a FROM Charities"); - - ResultSet rs = stmt.executeQuery(); - - assertTrue(rs.next(), "Charities count row should exist."); - assertEquals( - 2, - rs.getInt("number_a"), - "The amount of org_numbers in the table" + "should be 2 due to removal of 1 table."); - } - } - - @Test - void tempTableShouldNotExistAfterUpdating() throws SQLException { - Charity charity = - new Charity( - "99999", - "https://www.innsamlingskontrollen.no/organisasjoner/adra-norge-adventist-development-and-relief-agency-norway/", - "Temp Charity", - false, - "approved"); - - dbManager.addAPIDataToTable(List.of(charity)); - - try (Connection conn = new DatabaseConnection().getMySqlConnection()) { - PreparedStatement stmt = conn.prepareStatement("SELECT * FROM temp_api_charities"); - - assertThrows( - java.sql.SQLSyntaxErrorException.class, - () -> { - ResultSet rs = stmt.executeQuery(); - }); - } - } -} diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java index dd31136..ba071c3 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/database/Readers/CharitySelectTest.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import ntnu.systemutvikling.team6.database.DatabaseConnection; import ntnu.systemutvikling.team6.models.Charity; -import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import ntnu.systemutvikling.team6.models.Feedback; +import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java index 3c81e06..c0e32aa 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; - import ntnu.systemutvikling.team6.models.registry.CharityRegistry; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java index d358d3b..5ac9e10 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationRegistryTest.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; - import ntnu.systemutvikling.team6.models.registry.DonationRegistry; import ntnu.systemutvikling.team6.models.user.Settings; import ntnu.systemutvikling.team6.models.user.User; diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraperTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraperTest.java index bd5ffb7..d5e2af9 100644 --- a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraperTest.java +++ b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/scraper/scraperComponents/URLCharityScraperTest.java @@ -4,7 +4,6 @@ import static org.mockito.Mockito.*; import java.util.List; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openqa.selenium.By;