From 858d13cadc3bd567b141913a02508ddf7e9632a2 Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Tue, 7 Apr 2026 09:27:34 -0600 Subject: [PATCH] fix desktop adoption save --- .../petshopdesktop/api/dto/adoption/AdoptionRequest.java | 9 +++++++++ .../dialogcontrollers/AdoptionDialogController.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/desktop/src/main/java/org/example/petshopdesktop/api/dto/adoption/AdoptionRequest.java b/desktop/src/main/java/org/example/petshopdesktop/api/dto/adoption/AdoptionRequest.java index 830488f1..af596ade 100644 --- a/desktop/src/main/java/org/example/petshopdesktop/api/dto/adoption/AdoptionRequest.java +++ b/desktop/src/main/java/org/example/petshopdesktop/api/dto/adoption/AdoptionRequest.java @@ -6,6 +6,7 @@ public class AdoptionRequest { private Long petId; private Long customerId; private Long employeeId; + private Long sourceStoreId; private LocalDate adoptionDate; private String adoptionStatus; @@ -36,6 +37,14 @@ public class AdoptionRequest { this.employeeId = employeeId; } + public Long getSourceStoreId() { + return sourceStoreId; + } + + public void setSourceStoreId(Long sourceStoreId) { + this.sourceStoreId = sourceStoreId; + } + public LocalDate getAdoptionDate() { return adoptionDate; } diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AdoptionDialogController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AdoptionDialogController.java index 67e1073f..0240c128 100644 --- a/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AdoptionDialogController.java +++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AdoptionDialogController.java @@ -190,10 +190,16 @@ public class AdoptionDialogController { if (errorMsg.isEmpty()) { try { + Long storeId = UserSession.getInstance().getStoreId(); + if (storeId == null || storeId <= 0) { + throw new IllegalStateException("Store is not set for this account"); + } + AdoptionRequest request = new AdoptionRequest(); request.setPetId(cbPet.getSelectionModel().getSelectedItem().getId()); request.setCustomerId(cbCustomer.getSelectionModel().getSelectedItem().getId()); request.setEmployeeId(cbEmployee.getSelectionModel().getSelectedItem().getId()); + request.setSourceStoreId(storeId); request.setAdoptionDate(dpAdoptionDate.getValue()); request.setAdoptionStatus(cbAdoptionStatus.getValue());