From 22f5f24d83c8236a1fd76df8b4d75aa72e670783 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 5 Mar 2026 14:09:34 +0100 Subject: [PATCH] Feat: Dedicated Directory --- .../team6/models/{ => API}/APICharityData.java | 2 +- .../team6/models/{ => API}/APICharityScraper.java | 2 +- .../team6/models/{ => API}/DatabaseManager.java | 6 +++--- .../team6/models/{ => API}/IKOrganizationScraper.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) rename helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/{ => API}/APICharityData.java (98%) rename helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/{ => API}/APICharityScraper.java (98%) rename helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/{ => API}/DatabaseManager.java (99%) rename helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/{ => API}/IKOrganizationScraper.java (97%) diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityData.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityData.java similarity index 98% rename from helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityData.java rename to helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityData.java index 10f3acf..b58f60b 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityData.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityData.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.sytemutvikling.team6.models.API; /** * Represents data parsed from the IK API JSON response. diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityScraper.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityScraper.java similarity index 98% rename from helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityScraper.java rename to helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityScraper.java index e92baca..e674505 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/APICharityScraper.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/APICharityScraper.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.sytemutvikling.team6.models.API; import com.google.gson.Gson; import java.io.IOException; diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/DatabaseManager.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/DatabaseManager.java similarity index 99% rename from helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/DatabaseManager.java rename to helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/DatabaseManager.java index eb1530b..01b3223 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/DatabaseManager.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/DatabaseManager.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.sytemutvikling.team6.models.API; import java.sql.*; import java.util.List; @@ -151,9 +151,9 @@ INSERT INTO charities (org_number, name, status, url, is_pre_approved) s.setBoolean(5, charity.getIs_pre_approved()); s.addBatch(); - } + } s.executeBatch(); - } + } // Temporary table for parity check diff --git a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/IKOrganizationScraper.java b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/IKOrganizationScraper.java similarity index 97% rename from helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/IKOrganizationScraper.java rename to helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/IKOrganizationScraper.java index e43eef0..16dcc06 100644 --- a/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/IKOrganizationScraper.java +++ b/helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/API/IKOrganizationScraper.java @@ -1,4 +1,4 @@ -package ntnu.sytemutvikling.team6.models; +package ntnu.sytemutvikling.team6.models.API; import java.io.File; import java.io.FileWriter; @@ -8,6 +8,7 @@ import java.util.Collections; import java.util.List; import com.opencsv.CSVWriter; +import ntnu.sytemutvikling.team6.models.Organization; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement;