diff --git a/docs/Domenemodell/Domene Diagram 2.pdf b/docs/Domenemodell/Domene Diagram 2.pdf new file mode 100644 index 00000000..4277ec0f Binary files /dev/null and b/docs/Domenemodell/Domene Diagram 2.pdf differ diff --git a/docs/Manuals/Installation Guide HmH.pdf b/docs/Manuals/Installation Guide HmH.pdf new file mode 100644 index 00000000..e92399b1 Binary files /dev/null and b/docs/Manuals/Installation Guide HmH.pdf differ diff --git a/docs/Manuals/media/image1.png b/docs/Manuals/media/image1.png new file mode 100644 index 00000000..ccb37b6a Binary files /dev/null and b/docs/Manuals/media/image1.png differ diff --git a/docs/Manuals/media/image2.png b/docs/Manuals/media/image2.png new file mode 100644 index 00000000..22fcb9ce Binary files /dev/null and b/docs/Manuals/media/image2.png differ diff --git a/docs/Manuals/media/image3.png b/docs/Manuals/media/image3.png new file mode 100644 index 00000000..d98f38b1 Binary files /dev/null and b/docs/Manuals/media/image3.png differ diff --git a/docs/Manuals/media/image4.png b/docs/Manuals/media/image4.png new file mode 100644 index 00000000..e0a8696b Binary files /dev/null and b/docs/Manuals/media/image4.png differ diff --git a/docs/Manuals/media/image5.png b/docs/Manuals/media/image5.png new file mode 100644 index 00000000..8dcf6b34 Binary files /dev/null and b/docs/Manuals/media/image5.png differ diff --git a/docs/Manuals/media/image6.png b/docs/Manuals/media/image6.png new file mode 100644 index 00000000..4bafc2f5 Binary files /dev/null and b/docs/Manuals/media/image6.png differ diff --git a/docs/design/Universal Design.pdf b/docs/design/Universal Design.pdf new file mode 100644 index 00000000..09aca337 Binary files /dev/null and b/docs/design/Universal Design.pdf differ diff --git a/docs/persistence/Persistence.pdf b/docs/persistence/Persistence.pdf new file mode 100644 index 00000000..ee02cf1e Binary files /dev/null and b/docs/persistence/Persistence.pdf differ 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 e809dd43..a4217afd 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseSetup.java +++ b/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; """; 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 cb39b223..c59db00c 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 @@ -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(); diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java index fe4a5afe..f9754889 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/DonationSelect.java +++ b/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 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 3edfce7d..06820dc7 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/APIToDatabaseService.java +++ b/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", ""));