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

fix scroll sorting

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-04-15 13:05:50 -06:00
parent 762f01ae71
commit 1146d3c768
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/com/petshop/backend/repository/ConversationRepository.java
View File

@@ -8,7 +8,8 @@ import java.util.List;
@Repository
public interface ConversationRepository extends JpaRepository<Conversation, Long> {
List<Conversation> findByCustomerId(Long customerId);
List<Conversation> findByStaffId(Long staffId);
List<Conversation> findByStaffIdIsNull();
List<Conversation> findByCustomerIdOrderByUpdatedAtDesc(Long customerId);
List<Conversation> findByStaffIdOrderByUpdatedAtDesc(Long staffId);
List<Conversation> findByStaffIdIsNullOrderByUpdatedAtDesc();
List<Conversation> findAllByOrderByUpdatedAtDesc();
}

3
backend/src/main/java/com/petshop/backend/repository/RefundRepository.java
View File

@@ -8,6 +8,7 @@ import java.util.List;
@Repository
public interface RefundRepository extends JpaRepository<Refund, Long> {
List<Refund> findByCustomerId(Long customerId);
List<Refund> findByCustomerIdOrderByCreatedAtDesc(Long customerId);
List<Refund> findAllByOrderByCreatedAtDesc();
List<Refund> findBySaleId(Long saleId);
}

8
backend/src/main/java/com/petshop/backend/service/ChatService.java
View File

@@ -73,14 +73,14 @@ public class ChatService {
List<Conversation> conversations;
if (mine || role == User.Role.CUSTOMER) {
conversations = conversationRepository.findByCustomerId(userId);
conversations = conversationRepository.findByCustomerIdOrderByUpdatedAtDesc(userId);
} else if (role == User.Role.STAFF) {
List<Conversation> assignedToMe = conversationRepository.findByStaffId(userId);
List<Conversation> unassigned = conversationRepository.findByStaffIdIsNull();
List<Conversation> assignedToMe = conversationRepository.findByStaffIdOrderByUpdatedAtDesc(userId);
List<Conversation> unassigned = conversationRepository.findByStaffIdIsNullOrderByUpdatedAtDesc();
conversations = new java.util.ArrayList<>(assignedToMe);
conversations.addAll(unassigned);
} else {
conversations = conversationRepository.findAll();
conversations = conversationRepository.findAllByOrderByUpdatedAtDesc();
}
return conversations.stream()

4
backend/src/main/java/com/petshop/backend/service/RefundService.java
View File

@@ -100,9 +100,9 @@ public class RefundService {
List<Refund> refunds;
if (customerId != null) {
refunds = refundRepository.findByCustomerId(customerId);
refunds = refundRepository.findByCustomerIdOrderByCreatedAtDesc(customerId);
} else {
refunds = refundRepository.findAll();
refunds = refundRepository.findAllByOrderByCreatedAtDesc();
}
return refunds.stream()

4
web/app/chat/page.js
View File

@@ -45,9 +45,9 @@ function ChatPage() {
lastScrolledIdRef.current = lastMsg.id;
const area = messagesAreaRef.current;
if (!area) return;
const nearBottom = area.scrollHeight - area.scrollTop - area.clientHeight < 150;
const nearBottom = area.scrollHeight - area.scrollTop - area.clientHeight < 80;
if (nearBottom) {
messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
area.scrollTop = area.scrollHeight;
}
}, [messages]);