56 2 startup/database fix

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java

@@ -73,6 +73,7 @@ PRIMARY KEY (`UUID_charities`),
         CREATE TABLE IF NOT EXISTS `apbaluna`.`Donations` (
           `UUID_Donations` CHAR(36) NOT NULL,
           `amount` DECIMAL NOT NULL,
+          `isAnonymous` TINYINT NOT NULL,
           `date` DATE NOT NULL,
           `charity_id` CHAR(36) NOT NULL,
           `user_id` CHAR(36) NOT NULL,
@@ -259,12 +260,11 @@ FOREIGN KEY (`User_UUID_User`)
         `key_values` TEXT NULL,
         `logoBLOB` MEDIUMBLOB NULL,
         INDEX `fk_CharityVanity_Charities1_idx` (`UUID_charity` ASC) VISIBLE,
-        PRIMARY KEY (`UUID_charity`),
         CONSTRAINT `fk_CharityVanity_Charities1`
           FOREIGN KEY (`UUID_charity`)
           REFERENCES `apbaluna`.`Charities` (`UUID_charities`)
           ON DELETE NO ACTION
-          ON UPDATE NO ACTION)
+          ON UPDATE CASCADE)
       ENGINE = InnoDB;
     """;
 

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/CharitySelect.java

@@ -66,7 +66,7 @@ public CharityRegistry getCharitiesFromDB() {
           LEFT JOIN Feedback f ON f.charity_id = c.UUID_charities
           LEFT JOIN User u ON f.user_id = u.UUID_user
           LEFT JOIN Charity_Categories cc ON cc.Charities_UUID_charities = c.UUID_charities
-          LEFT JOIN Cat|egories cat ON cat.category_id = cc.Categories_category_id
+          LEFT JOIN Categories cat ON cat.category_id = cc.Categories_category_id
           INNER JOIN CharityVanity cv ON cv.UUID_charity = c.UUID_charities;
           """;
       Statement stmt = conn.createStatement();

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java

@@ -58,8 +58,8 @@ public DonationRegistry getDonationFromDB() {
           """
                 SELECT
                     d.UUID_Donations, d.amount, d.isAnonymous, d.date, d.charity_id, d.user_id,
-                    c.UUID_charities, c.org_number, c,pre_approved, c.status,
-                    u.UUID_User, u.user_displayname u.user_name, u.user_email, u.user_password, u.role
+                    c.UUID_charities, c.org_number, c.pre_approved, c.status,
+                    u.UUID_User, u.user_displayname, u.user_name, u.user_email, u.user_password, u.role
                 FROM Donations d
                 INNER JOIN Charities c ON d.charity_id = c.UUID_charities
                 INNER JOIN User u ON d.user_id = u.UUID_user

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java

@@ -64,9 +64,13 @@ INSERT INTO CharityVanity (UUID_charity, charity_name, charity_link, description
            PreparedStatement ps2 = conn.prepareStatement(sql2)) {
 
         for (Charity charity : charities) {
-          String uuid = charity.getUUID() == null
-                  ? UUID.randomUUID().toString()
-                  : charity.getUUID().toString();
+          String uuid;
+          if (charity.getUUID() == null) {
+            uuid = UUID.randomUUID().toString();
+            System.out.println("API object doesnt have UUID, assigning");
+          } else {
+            uuid = charity.getUUID().toString();
+          }
 
           ps1.setString(1, uuid);
           ps1.setString(2, charity.getOrg_number().replaceAll("\\s", ""));