diff --git a/android/app/src/main/java/com/example/petstoremobile/api/AdoptionApi.java b/android/app/src/main/java/com/example/petstoremobile/api/AdoptionApi.java index ec397909..6e1de73d 100644 --- a/android/app/src/main/java/com/example/petstoremobile/api/AdoptionApi.java +++ b/android/app/src/main/java/com/example/petstoremobile/api/AdoptionApi.java @@ -24,7 +24,8 @@ public interface AdoptionApi { @Query("status") String status, @Query("storeId") Long storeId, @Query("date") String date, - @Query("employeeId") Long employeeId); + @Query("employeeId") Long employeeId, + @Query("sort") String sort); @GET("api/v1/adoptions/{id}") Call getAdoptionById(@Path("id") Long id); diff --git a/android/app/src/main/java/com/example/petstoremobile/api/AppointmentApi.java b/android/app/src/main/java/com/example/petstoremobile/api/AppointmentApi.java index 5b8a37a7..5bc88643 100644 --- a/android/app/src/main/java/com/example/petstoremobile/api/AppointmentApi.java +++ b/android/app/src/main/java/com/example/petstoremobile/api/AppointmentApi.java @@ -24,7 +24,8 @@ public interface AppointmentApi { @Query("status") String status, @Query("storeId") Long storeId, @Query("date") String date, - @Query("employeeId") Long employeeId); + @Query("employeeId") Long employeeId, + @Query("sort") String sort); @GET("api/v1/appointments/{id}") Call getAppointmentById(@Path("id") Long id); diff --git a/android/app/src/main/java/com/example/petstoremobile/repositories/AdoptionRepository.java b/android/app/src/main/java/com/example/petstoremobile/repositories/AdoptionRepository.java index f09f85b4..8758357a 100644 --- a/android/app/src/main/java/com/example/petstoremobile/repositories/AdoptionRepository.java +++ b/android/app/src/main/java/com/example/petstoremobile/repositories/AdoptionRepository.java @@ -24,8 +24,8 @@ public class AdoptionRepository extends BaseRepository { /** * Retrieves a paginated list of all adoptions from the API. */ - public LiveData>> getAllAdoptions(int page, int size, String query, String status, Long storeId, String date, Long employeeId) { - return executeCall(adoptionApi.getAllAdoptions(page, size, query, status, storeId, date, employeeId)); + public LiveData>> getAllAdoptions(int page, int size, String query, String status, Long storeId, String date, Long employeeId, String sort) { + return executeCall(adoptionApi.getAllAdoptions(page, size, query, status, storeId, date, employeeId, sort)); } /** diff --git a/android/app/src/main/java/com/example/petstoremobile/repositories/AppointmentRepository.java b/android/app/src/main/java/com/example/petstoremobile/repositories/AppointmentRepository.java index 85083a25..6c2c4cf8 100644 --- a/android/app/src/main/java/com/example/petstoremobile/repositories/AppointmentRepository.java +++ b/android/app/src/main/java/com/example/petstoremobile/repositories/AppointmentRepository.java @@ -24,8 +24,8 @@ public class AppointmentRepository extends BaseRepository { /** * Retrieves a paginated list of all appointments from the API with filtering. */ - public LiveData>> getAllAppointments(int page, int size, String query, String status, Long storeId, String date, Long employeeId) { - return executeCall(appointmentApi.getAllAppointments(page, size, query, status, storeId, date, employeeId)); + public LiveData>> getAllAppointments(int page, int size, String query, String status, Long storeId, String date, Long employeeId, String sort) { + return executeCall(appointmentApi.getAllAppointments(page, size, query, status, storeId, date, employeeId, sort)); } /** diff --git a/android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java b/android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java index d008e5a4..ec3ecfab 100644 --- a/android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java +++ b/android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java @@ -55,7 +55,7 @@ public class AdoptionListViewModel extends ViewModel { if ("All Statuses".equals(status)) status = null; isLoading.setValue(true); - observeOnce(adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, date, employeeId), resource -> { + observeOnce(adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, date, employeeId, "adoptionId,desc"), resource -> { if (resource != null) { if (resource.status == Resource.Status.SUCCESS && resource.data != null) { List currentList = reset ? new ArrayList<>() : new ArrayList<>(adoptions.getValue()); diff --git a/android/app/src/main/java/com/example/petstoremobile/viewmodels/AppointmentListViewModel.java b/android/app/src/main/java/com/example/petstoremobile/viewmodels/AppointmentListViewModel.java index 31020d12..88997684 100644 --- a/android/app/src/main/java/com/example/petstoremobile/viewmodels/AppointmentListViewModel.java +++ b/android/app/src/main/java/com/example/petstoremobile/viewmodels/AppointmentListViewModel.java @@ -41,7 +41,7 @@ public class AppointmentListViewModel extends ViewModel { public void loadAppointments(String query, String status, Long storeId, String date, Long employeeId) { isLoading.setValue(true); - observeOnce(appointmentRepository.getAllAppointments(0, 500, query, status, storeId, date, employeeId), resource -> { + observeOnce(appointmentRepository.getAllAppointments(0, 500, query, status, storeId, date, employeeId, "appointmentId,desc"), resource -> { if (resource != null) { if (resource.status == Resource.Status.SUCCESS && resource.data != null) { appointments.setValue(resource.data.getContent());