Merge pull request #61 from Group-5/refactor/wrapper

refactor[wrapper]: move wrapper module from control to model

src/main/java/edu/group5/app/App.java

@@ -1,15 +1,15 @@
 package edu.group5.app;
 
 import edu.group5.app.control.NavigationController;
-import edu.group5.app.control.wrapper.DbWrapper;
-import edu.group5.app.control.wrapper.OrgApiWrapper;
 import edu.group5.app.model.AppState;
 import edu.group5.app.model.donation.DonationRepository;
 import edu.group5.app.model.donation.DonationService;
 import edu.group5.app.model.organization.OrganizationRepository;
 import edu.group5.app.model.organization.OrganizationService;
 import edu.group5.app.model.user.UserRepository;
 import edu.group5.app.model.user.UserService;
+import edu.group5.app.model.wrapper.DbWrapper;
+import edu.group5.app.model.wrapper.OrgApiWrapper;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;

src/main/java/edu/group5/app/control/wrapper/DbWrapper.java → src/main/java/edu/group5/app/model/wrapper/DbWrapper.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import java.math.BigDecimal;
 import java.sql.Connection;

src/main/java/edu/group5/app/control/wrapper/OrgApiWrapper.java → src/main/java/edu/group5/app/model/wrapper/OrgApiWrapper.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import java.io.IOException;
 import java.net.URI;

src/main/java/edu/group5/app/control/wrapper/Wrapper.java → src/main/java/edu/group5/app/model/wrapper/Wrapper.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 /**
  * An abstract class for all Wrappers of datasets.

src/test/java/edu/group5/app/control/wrapper/DbWrapperDonationsTest.java → src/test/java/edu/group5/app/model/wrapper/DbWrapperDonationsTest.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -16,6 +16,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import edu.group5.app.model.wrapper.DbWrapper;
+
 public class DbWrapperDonationsTest {
   private Object[] johnDonation;
   private List<Object[]> users;

src/test/java/edu/group5/app/control/wrapper/DbWrapperUserTest.java → src/test/java/edu/group5/app/model/wrapper/DbWrapperUserTest.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import edu.group5.app.model.wrapper.DbWrapper;
 import javafx.util.converter.BigDecimalStringConverter;
 
 public class DbWrapperUserTest {

src/test/java/edu/group5/app/control/wrapper/OrgApiWrapperTest.java → src/test/java/edu/group5/app/model/wrapper/OrgApiWrapperTest.java

@@ -1,4 +1,4 @@
-package edu.group5.app.control.wrapper;
+package edu.group5.app.model.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -9,6 +9,8 @@
 import java.lang.IllegalArgumentException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
+import edu.group5.app.model.wrapper.OrgApiWrapper;
 import tools.jackson.core.exc.StreamReadException;
 
 /**