Skip to content

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

Merged
merged 1 commit into from
Apr 7, 2026
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/edu/group5/app/App.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.group5.app.control.wrapper;
package edu.group5.app.model.wrapper;

import java.math.BigDecimal;
import java.sql.Connection;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.group5.app.control.wrapper;
package edu.group5.app.model.wrapper;

import java.io.IOException;
import java.net.URI;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package edu.group5.app.control.wrapper;
package edu.group5.app.model.wrapper;

/**
* An abstract class for all Wrappers of datasets.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

/**
Expand Down