#42 MainController와 PetRestController에 있는 session에 담는 코드 util화 시키기 완료

Anna-Jin · Apr 8, 2022 · 94d255f · 94d255f
1 parent ec5eb38
commit 94d255f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 35 deletions.
diff --git a/src/main/java/com/petpular/common/SessionUtils.java b/src/main/java/com/petpular/common/SessionUtils.java
@@ -1,11 +1,26 @@
 package com.petpular.common;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.petpular.pet.model.Pet;
 
 public class SessionUtils {
- public static String petArr(int userId, List<Pet> petList) {
- return "";
+ public static List<String> petArr(Integer userId, List<Pet> petList) {
+ List<String> arr = new ArrayList<>();
+
+ String petNameArr = petList.get(0).getName();
+ String petIdArr = Integer.toString(petList.get(0).getId());
+
+ if (petList.size() > 0) {
+ for (int i = 1; i < petList.size(); i++) {
+
+ petIdArr = petIdArr + "," + petList.get(i).getId();
+ arr.add(petIdArr);
+ petNameArr = petNameArr + "," + petList.get(i).getName();
+ arr.add(petNameArr);
+ }
+ }
+ return arr;
  }
 }
diff --git a/src/main/java/com/petpular/interceptor/PermissionInterceptor.java b/src/main/java/com/petpular/interceptor/PermissionInterceptor.java
@@ -30,10 +30,10 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
  response.sendRedirect("/user/login");
  return false;
  }
- if (uri.equals("/main")) {
- response.sendRedirect("/user/login");
- return false;
- }
+// if (uri.equals("/main")) {
+// response.sendRedirect("/user/login");
+// return false;
+// }
  if (uri.equals("/community")) {
  response.sendRedirect("/user/login");
  return false;

diff --git a/src/main/java/com/petpular/main/MainController.java b/src/main/java/com/petpular/main/MainController.java
@@ -9,6 +9,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.petpular.common.SessionUtils;
 import com.petpular.pet.bo.PetBO;
 import com.petpular.pet.model.Pet;
 
@@ -23,24 +24,21 @@ public class MainController {
  public String main(Model model, HttpSession session) {
 
  Integer userId = (Integer)session.getAttribute("userId");
- List<Pet> petList = petBO.getPetByUserId(userId);
 
- if(userId != null && petList.size() != 0) {
- String petNameArr = petList.get(0).getName();
- String petIdArr = Integer.toString(petList.get(0).getId());
-
- if (petList.size() > 0) {
- for (int i = 1; i < petList.size(); i++) {
-
- petIdArr = petIdArr + "," + petList.get(i).getId();
- petNameArr = petNameArr + "," + petList.get(i).getName();
- }
- }
- session.setAttribute("petIdArr", petIdArr);
- session.setAttribute("petNameArr", petNameArr);
- }
+ if(userId != null) {
+ List<Pet> petList = petBO.getPetByUserId(userId);
+
+ if (petList.size() != 0) {
+
+ List<String> arr = SessionUtils.petArr(userId, petList);
+
+ session.setAttribute("petIdArr", arr.get(0));
+ session.setAttribute("petNameArr", arr.get(1));
+
+ model.addAttribute("petList", petList);
+ }
+ } 
 
- model.addAttribute("petList", petList);
  model.addAttribute("viewPath", "/main/main");
  return "template/layout";
  }

diff --git a/src/main/java/com/petpular/pet/PetRestController.java b/src/main/java/com/petpular/pet/PetRestController.java
@@ -21,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.petpular.common.SessionUtils;
 import com.petpular.pet.bo.PetBO;
 import com.petpular.pet.model.Feed;
 import com.petpular.pet.model.Pet;
@@ -159,18 +160,10 @@ public Map<String, Object> editPet(
  List<Pet> petList = petBO.getPetByUserId(userId);
 
  if(userId != null && petList.size() != 0) {
- String petNameArr = petList.get(0).getName();
- String petIdArr = Integer.toString(petList.get(0).getId());
-
- if (petList.size() > 0) {
- for (int i = 1; i < petList.size(); i++) {
-
- petIdArr = petIdArr + "," + petList.get(i).getId();
- petNameArr = petNameArr + "," + petList.get(i).getName();
- }
- }
- session.setAttribute("petIdArr", petIdArr);
- session.setAttribute("petNameArr", petNameArr);
+ List<String> arr = SessionUtils.petArr(userId, petList);
+
+ session.setAttribute("petIdArr", arr.get(0));
+ session.setAttribute("petNameArr", arr.get(1));
  }
 
  result.put("result", "success");

diff --git a/src/main/webapp/WEB-INF/jsp/main/main.jsp b/src/main/webapp/WEB-INF/jsp/main/main.jsp
@@ -17,7 +17,7 @@
  <br>
  <br>
  <div>
- <a type="button" class="btn main-signup-btn" href="/user/signup">회원가입</a>
+ <a type="button" class="btn main-signup-btn" href="/user/login">로그인</a>
  </div>
  </div>
  </div>