From c1696e3b2b57b420bf5bd8c4fd8afa72a30a6057 Mon Sep 17 00:00:00 2001
From: Haoyu Sun <SunH26@cardiff.ac.uk>
Date: Mon, 28 Oct 2024 19:34:06 +0000
Subject: [PATCH] exchange/id fix the bugs
---
.../takeaway/index/ExchangeController.java | 33 +++++++++++++++++++
.../demo/takeaway/index/ExchangeService.java | 3 ++
2 files changed, 36 insertions(+)
create mode 100644 src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
diff --git a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
new file mode 100644
index 0000000..05f3995
--- /dev/null
+++ b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java
@@ -0,0 +1,33 @@
+package uk.ac.cf.spring.demo.takeaway.index;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+@Controller
+public class ExchangeController {
+// page /exchangeItemList
+ @GetMapping("/exchange")
+ public ModelAndView getExchange() {
+ ModelAndView modelAndView = new ModelAndView("/page/itemList");
+ ExchangeService exchangeService =ExchangeService.getInstance();
+ List<ExchangeItem> exchangeItems =exchangeService.getExchangeItems();
+ modelAndView.addObject("exchangeItems", exchangeItems);
+ return modelAndView;
+ }
+// page /exchangeItemDetail
+ @GetMapping("/exchange/{id}")
+ public ModelAndView getExchangeItem(@PathVariable Long id) {
+ ModelAndView modelAndView = new ModelAndView("/page/itemDetail");
+ ExchangeService exchangeService = ExchangeService.getInstance();
+ ExchangeItem exchangeItem = exchangeService.getExchangeItem(id);
+ modelAndView.addObject("exchangeItem", exchangeItem);
+ return modelAndView;
+
+
+
+ }
+}
diff --git a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeService.java b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeService.java
index 0c99d09..57d81f0 100644
--- a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeService.java
+++ b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeService.java
@@ -23,6 +23,9 @@ public class ExchangeService {
}
return singleton;
}
+ public List<ExchangeItem> getExchangeItems() {
+ return exchangeItems;
+ }
// through id to search exchangeItem
public ExchangeItem getExchangeItem(Long id) {
return exchangeItems.stream().filter(exchangeItem ->
--
GitLab