Merge branch 'カート機能' into 'master'

カート機能追加

See merge request !40

src/main/java/com/example/api/EcsiteRestController.java

@@ -2,14 +2,12 @@ package com.example.api;
 
 import java.sql.Date;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,15 +44,18 @@ public class EcsiteRestController {
 	}
 	
 	@PostMapping("inputCart")
-	public void inputCart(@RequestBody ItemData data, HashMap<String, Items> cart) {
+	public void inputCart(@RequestBody ItemData data) {
 		if(session.getAttribute("cart") == null){
-			cart.put((data.getShoesId()).toString(), itemsService.findOne(data.getShoesId(),data.getQuantity()));
+			LinkedHashMap<String, Items> cart = new LinkedHashMap<String, Items>();
+			String id = data.getShoesId().toString(); 
+			cart.put(id , itemsService.findOne(data.getShoesId(),data.getQuantity()));
 			session.setAttribute("cart", cart);
 		}else{
-			cart = (HashMap<String, Items>) session.getAttribute("cart");
-			cart.put((data.getShoesId()).toString(), itemsService.findOne(data.getShoesId(),data.getQuantity()));
+			LinkedHashMap<String, Items> cart = new LinkedHashMap<String, Items>();
+			String id = data.getShoesId().toString();
+			cart = (LinkedHashMap<String, Items>) session.getAttribute("cart");
+			cart.put(id, itemsService.findOne(data.getShoesId(),data.getQuantity()));
 			session.setAttribute("cart", cart);
 		}
 	}
-	
 }
\ No newline at end of file

src/main/java/com/example/domain/ItemData.java

 package com.example.domain;
 
-import org.springframework.stereotype.Component;
-
 import lombok.Getter;
 import lombok.Setter;
 
-@Component
 @Setter
 @Getter
 public class ItemData{

src/main/java/com/example/web/EcsiteController.java

@@ -4,7 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.sql.Date;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 import javax.servlet.http.HttpSession;
@@ -123,15 +123,14 @@ HttpSession session;
 	}
 	
 	@GetMapping("cart")
-	public String Cart(Model model, @AuthenticationPrincipal LoginUser userDetails, HashMap<String, Items> items, ArrayList <Items> cart){
+	public String Cart(Model model, @AuthenticationPrincipal LoginUser userDetails, LinkedHashMap<String, Items> items, ArrayList <Items> cart){
 		User user = userDetails.getUser();
 		model.addAttribute("user", user);
-		items = (HashMap<String, Items>) session.getAttribute("cart");
-		for(int i = 0; i < items.size(); i++){
-			String key = String.valueOf(i);
-			cart.add(items.get(key));
-		}
-		System.out.println((cart.get(1)).getShoesName());
+		items = (LinkedHashMap<String, Items>) session.getAttribute("cart");
+		items.forEach((key, value) -> {
+			cart.add(value);
+		});
+		model.addAttribute("cart", cart);
 		return "Cart";
 	}
 }

src/main/resources/templates/cart.html

@@ -90,30 +90,18 @@
                         <tr class="row" id="theadTr">
                             <th class="th col-xl-4" id="imageTh">Image</th>
                             <th class="th col-xl-4" id="productNameTh">Product Name</th>
+                            <th class="th col-xl-4" id="quantityTh">Quantity</th>
                             <th class="th col-xl-4" id="priceTh">Price</th>
                         </tr>
                     </thead>
                     <tbody>
+                    	<div th:each="cart : ${cart}">
 	                        <tr class="row tr">
-                            <td class="td col-xl-4"><img src="images/スニーカー2.jpg"/></td>
-                            <td class="td col-xl-4"><p class="textP">Convers All Star</p></td>
-                            <td class="td col-xl-4"><p class="textP">&yen;10000</p></td>
-                        </tr>
-                        <tr class="row tr">
-                            <td class="td col-xl-4"><img src="images/スニーカー2.jpg"/></td>
-                            <td class="td col-xl-4"><p class="textP">Convers All Star</p></td>
-                            <td class="td col-xl-4"><p class="textP">&yen;10000</p></td>
-                        </tr>
-                        <tr class="row tr">
-                            <td class="td col-xl-4"><img src="images/スニーカー2.jpg"/></td>
-                            <td class="td col-xl-4"><p class="textP">Convers All Star</p></td>
-                            <td class="td col-xl-4"><p class="textP">&yen;10000</p></td>
-                        </tr>
-                        <tr class="row tr">
-                            <td class="td col-xl-4"><img src="images/スニーカー2.jpg"/></td>
-                            <td class="td col-xl-4"><p class="textP">Convers All Star</p></td>
-                            <td class="td col-xl-4"><p class="textP">&yen;10000</p></td>
+	                            <td class="td col-xl-4"><img th:text= "${cart.photo}" src="images/スニーカー2.jpg"/></td>
+	                            <td class="td col-xl-4"><p th:text= "${cart.shoesName}" class="textP">Convers All Star</p></td>
+	                            <td class="td col-xl-4"><p th:text= "${cart.price}" class="textP">&yen;10000</p></td>
 	                        </tr>
+	                   </div>
                     </tbody>
                 </table>
                 <div id="buy">