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

fix empty desktop lists

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-04-08 08:18:01 -06:00
parent 4845aeb479
commit a7ba0fb4b4
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/petshop/backend/controller/AppointmentController.java
View File

@@ -50,7 +50,7 @@ public class AppointmentController {
.orElse(null); .orElse(null);
Long effectiveCustomerId = customerId; Long effectiveCustomerId = customerId;
if (role != null && (role.equals("CUSTOMER") || role.equals("ADMIN"))) { if ("CUSTOMER".equals(role)) {
User user = AuthenticationHelper.getAuthenticatedUser(userRepository); User user = AuthenticationHelper.getAuthenticatedUser(userRepository);
effectiveCustomerId = user.getId(); effectiveCustomerId = user.getId();
} }
@@ -88,7 +88,7 @@ public class AppointmentController {
.map(authority -> authority.getAuthority().replace("ROLE_", "")) .map(authority -> authority.getAuthority().replace("ROLE_", ""))
.orElse(null); .orElse(null);
if (role != null && (role.equals("CUSTOMER") || role.equals("ADMIN"))) { if ("CUSTOMER".equals(role)) {
User user = AuthenticationHelper.getAuthenticatedUser(userRepository); User user = AuthenticationHelper.getAuthenticatedUser(userRepository);
if (!request.getCustomerId().equals(user.getId())) { if (!request.getCustomerId().equals(user.getId())) {
throw new org.springframework.security.access.AccessDeniedException("You can only create appointments for yourself"); throw new org.springframework.security.access.AccessDeniedException("You can only create appointments for yourself");

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

@@ -247,7 +247,13 @@ public class PetService {
if (principal instanceof AppPrincipal appPrincipal) { if (principal instanceof AppPrincipal appPrincipal) {
return new CurrentViewer(appPrincipal.getUserId(), appPrincipal.getRole()); return new CurrentViewer(appPrincipal.getUserId(), appPrincipal.getRole());
} }
return null; String username = authentication.getName();
if (username == null || username.isBlank() || "anonymousUser".equalsIgnoreCase(username)) {
return null;
}
return userRepository.findByUsername(username)
.map(user -> new CurrentViewer(user.getId(), user.getRole()))
.orElse(null);
} }
private Pet findPet(Long id) { private Pet findPet(Long id) {