From cee59c583e650f8c8a625a625d49ff831db1415b Mon Sep 17 00:00:00 2001
From: Roar <roaraf@stud.ntnu.no>
Date: Sat, 18 Apr 2026 17:42:03 +0200
Subject: [PATCH] Updated HmHApplication

Commented out APIScraper and swapped it with FullCharityScrape.
---
 .../systemutvikling/team6/HmHApplication.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
index 5e25df0..1086853 100644
--- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
+++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java
@@ -11,9 +11,8 @@
 import javafx.stage.Stage;
 import ntnu.systemutvikling.team6.database.DatabaseConnection;
 import ntnu.systemutvikling.team6.database.DatabaseSetup;
-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.FullCharityScrape;
 import ntnu.systemutvikling.team6.service.APIToDatabaseService;
 
 public class HmHApplication extends Application {
@@ -49,16 +48,24 @@ public void init() {
     /* Test and get data from Innsamlingkontrollen API */
     try {
       HttpClient https = HttpClient.newHttpClient();
-      APICharityScraper scraper = new APICharityScraper(https);
+      // APICharityScraper scraper = new APICharityScraper(https);
+      FullCharityScrape scraper = new FullCharityScrape();
 
       DatabaseConnection conn = new DatabaseConnection();
       APIToDatabaseService db = new APIToDatabaseService(conn);
 
-      if (scraper.checkConnection()) {
+      if (scraper.getAPIScraper().checkConnection()) {
+          /*
+          if (scraper.checkConnection()) {
         CharityRegistry charityRegistry = scraper.parseJSON(scraper.getJSONData());
         for (Charity charity : charityRegistry.getAllCharities()) {
           System.out.println(charity.getName());
         }
+           */
+
+        // Comment out the two below to use already generated database.
+        CharityRegistry charityRegistry = scraper.getAPIAndURLCharityData();
+
         db.addAPIDataToTable(charityRegistry.getAllCharities());
       }
     } catch (Exception e) {