From c3b7e4072e3c1b501309f8a065d4bdaa7c27b50e Mon Sep 17 00:00:00 2001
From: Fredrik Marjoni <marjonifredrik@gmail.com>
Date: Sat, 7 Mar 2026 12:46:09 +0100
Subject: [PATCH] feat: merge release/v1.0.0 into feat/User, fix up on
 differences in branches and test that everythings alright with maven commands

---
 src/main/java/edu/group5/app/App.java                    | 9 +--------
 .../app/model/organization/OrganizationRepository.java   | 2 +-
 src/main/java/edu/group5/app/model/user/UserService.java | 3 +--
 .../group5/app/model/donation/DonationServiceTest.java   | 3 +--
 .../group5/app/model/organization/OrganizationTest.java  | 2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/edu/group5/app/App.java b/src/main/java/edu/group5/app/App.java
index dc19a9f..887fe4d 100644
--- a/src/main/java/edu/group5/app/App.java
+++ b/src/main/java/edu/group5/app/App.java
@@ -1,17 +1,10 @@
 package edu.group5.app;
 
-import java.sql.Wrapper;
-import java.util.HashMap;
-
-import edu.group5.app.control.OrgAPIWrapper;
-import tools.jackson.core.type.TypeReference;
-import tools.jackson.databind.ObjectMapper;
-
 /**
  * Hello world!
  */
 public class App {
   public static void main(String[] args) throws InterruptedException {
-    Wrapper wrap = new Wrapper();
+    System.out.println("Hello World!");
   }
 }
diff --git a/src/main/java/edu/group5/app/model/organization/OrganizationRepository.java b/src/main/java/edu/group5/app/model/organization/OrganizationRepository.java
index 4499288..a47b3d5 100644
--- a/src/main/java/edu/group5/app/model/organization/OrganizationRepository.java
+++ b/src/main/java/edu/group5/app/model/organization/OrganizationRepository.java
@@ -63,7 +63,7 @@ public Object[] export() {
           orgMap.put("org_number", org.orgNumber());
           orgMap.put("name", org.name());
           orgMap.put("status", org.trusted() ? "approved" : "unapproved");
-          orgMap.put("url", org.websiteURL());
+          orgMap.put("url", org.websiteUrl());
           orgMap.put("is_pre_approved", org.isPreApproved());
           return orgMap;
         })
diff --git a/src/main/java/edu/group5/app/model/user/UserService.java b/src/main/java/edu/group5/app/model/user/UserService.java
index 7a9dc53..dfe66a1 100644
--- a/src/main/java/edu/group5/app/model/user/UserService.java
+++ b/src/main/java/edu/group5/app/model/user/UserService.java
@@ -45,8 +45,7 @@ public boolean registerUser(String role, String firstName, String lastName,
     User user;
     if (role.equalsIgnoreCase("Customer")) {
       user = new Customer(userRepository.getNextUserId(), firstName, lastName, email, passwordHash);
-    } else { /* TODO  when you switch to a real DB, 
-    replace getNextUserId with DB auto-increment/identity and ignore manual ID generation in service*/
+    } else { /* TODO  when you switch to a real DB, replace getNextUserId with DB auto-increment/identity and ignore manual ID generation in service*/
       return false;
     }
     userRepository.addUser(user);
diff --git a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
index 5117373..bd7f11a 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
@@ -1,6 +1,5 @@
 package edu.group5.app.model.donation;
 
-import edu.group5.app.model.organization.Organization;
 import edu.group5.app.model.organization.OrganizationRepository;
 import edu.group5.app.model.user.Customer;
 
@@ -12,7 +11,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
+
 
 import static org.junit.jupiter.api.Assertions.*;
 
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 7f1b898..f921b60 100644
--- a/src/test/java/edu/group5/app/model/organization/OrganizationTest.java
+++ b/src/test/java/edu/group5/app/model/organization/OrganizationTest.java
@@ -21,7 +21,7 @@ void constructor_CreatesAnOrganizationWhenInputIsValid() {
         () -> assertEquals(1, org.orgNumber()),
         () -> assertEquals("Org", org.name()),
         () -> assertTrue(org.trusted()),
-        () -> assertEquals("org.com", org.websiteURL()),
+        () -> assertEquals("org.com", org.websiteUrl()),
         () -> assertTrue(org.isPreApproved()),
         () -> assertEquals("Org description", org.description())
     );