RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close chat #169

Closed
RecentRunner wants to merge 291 commits from close-chat into main
pull from: close-chat
merge into: RecentRunner:main
Conversation 0 Commits 291 Files Changed 536 +9 -1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc55580831 - Show all commits

8
android/app/src/main/java/com/example/petstoremobile/dtos/ConversationDTO.java
View File

@@ -12,6 +12,14 @@ public class ConversationDTO {
public ConversationDTO() {}
public ConversationDTO(Long id, Long customerId, Long staffId, String lastMessage, String status) {
this.id = id;
this.customerId = customerId;
this.staffId = staffId;
this.lastMessage = lastMessage;
this.status = status;
}
public Long getId() {
return id;
}

2
android/app/src/main/java/com/example/petstoremobile/viewmodels/AdoptionListViewModel.java
View File

@@ -53,7 +53,7 @@ public class AdoptionListViewModel extends ViewModel {
if ("All Statuses".equals(status)) status = null;
isLoading.setValue(true);
adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, "adoptionDate,desc").observeForever(resource -> {
adoptionRepository.getAllAdoptions(currentPage, PAGE_SIZE, query, status, storeId, "adoptionDate,desc", null).observeForever(resource -> {
if (resource != null) {
if (resource.status == Resource.Status.SUCCESS && resource.data != null) {
List<AdoptionDTO> currentList = reset ? new ArrayList<>() : new ArrayList<>(adoptions.getValue());