From 1b407531c1208ef0f09867426b7cc75eafd20486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B2=9C=20=EC=A7=84=EA=B0=95?= <jjjjjk12@ajou.ac.kr>
Date: Wed, 26 Mar 2025 23:39:18 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=A7=80=20=EB=B0=8F=20=EC=A0=91=EA=B7=BC=20=EA=B0=80=EB=8A=A5?=
=?UTF-8?q?=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aolda/itda/config/AuthInterceptor.java | 3 +-
.../itda/controller/main/MainController.java | 33 ++++++++++
.../com/aolda/itda/dto/main/MainInfoDTO.java | 20 ++++++
.../com/aolda/itda/service/AuthService.java | 8 ++-
.../aolda/itda/service/main/MainService.java | 61 +++++++++++++++++++
5 files changed, 121 insertions(+), 4 deletions(-)
create mode 100644 src/main/java/com/aolda/itda/controller/main/MainController.java
create mode 100644 src/main/java/com/aolda/itda/dto/main/MainInfoDTO.java
create mode 100644 src/main/java/com/aolda/itda/service/main/MainService.java
diff --git a/src/main/java/com/aolda/itda/config/AuthInterceptor.java b/src/main/java/com/aolda/itda/config/AuthInterceptor.java
index b0767e3..7c9f87f 100644
--- a/src/main/java/com/aolda/itda/config/AuthInterceptor.java
+++ b/src/main/java/com/aolda/itda/config/AuthInterceptor.java
@@ -59,7 +59,8 @@ public class AuthInterceptor implements HandlerInterceptor {
/* 프로젝트 리스트 조회 */
List<String> projects;
if (authService.isAdmin(Map.of("id", userId, "token", token))) {
- projects = authService.getAllProjects(token);
+ projects = authService.getAllProjects(token).stream().map(IdAndNameDTO::getId)
+ .toList();
}
else {
diff --git a/src/main/java/com/aolda/itda/controller/main/MainController.java b/src/main/java/com/aolda/itda/controller/main/MainController.java
new file mode 100644
index 0000000..7b22923
--- /dev/null
+++ b/src/main/java/com/aolda/itda/controller/main/MainController.java
@@ -0,0 +1,33 @@
+package com.aolda.itda.controller.main;
+
+import com.aolda.itda.service.main.MainService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class MainController {
+
+ private final MainService mainService;
+
+ @GetMapping("/projects")
+ public ResponseEntity<Object> projects(HttpServletRequest request) throws JsonProcessingException {
+ return ResponseEntity.ok(mainService.getAllProjects((Map<String, String>) request.getSession().getAttribute("user")));
+ }
+
+ @GetMapping("/main")
+ public ResponseEntity<Object> mainInfo(@RequestParam String projectId, HttpServletRequest request) {
+ return ResponseEntity.ok(mainService.getMainInfo(projectId, (List<String>) request.getAttribute("projects")));
+ }
+
+}
diff --git a/src/main/java/com/aolda/itda/dto/main/MainInfoDTO.java b/src/main/java/com/aolda/itda/dto/main/MainInfoDTO.java
new file mode 100644
index 0000000..6de5fdf
--- /dev/null
+++ b/src/main/java/com/aolda/itda/dto/main/MainInfoDTO.java
@@ -0,0 +1,20 @@
+package com.aolda.itda.dto.main;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MainInfoDTO {
+
+ private Long routing;
+ private Long forwarding;
+ private Long certificate;
+
+}
diff --git a/src/main/java/com/aolda/itda/service/AuthService.java b/src/main/java/com/aolda/itda/service/AuthService.java
index 8bc6836..a222e28 100644
--- a/src/main/java/com/aolda/itda/service/AuthService.java
+++ b/src/main/java/com/aolda/itda/service/AuthService.java
@@ -297,7 +297,7 @@ public class AuthService {
}
- public List<String> getAllProjects(String token) throws JsonProcessingException {
+ public List<IdAndNameDTO> getAllProjects(String token) throws JsonProcessingException {
String url = keystone + "/projects";
HttpHeaders headers = new HttpHeaders();
headers.set("X-Auth-Token", token);
@@ -312,10 +312,12 @@ public class AuthService {
JsonNode node = objectMapper.readTree(res.getBody());
ArrayNode arrayNode = (ArrayNode) node.get("projects");
- List<String> lists = new ArrayList<>();
+ List<IdAndNameDTO> lists = new ArrayList<>();
for (JsonNode assignment : arrayNode) {
- lists.add(assignment.path("id").asText());
+ String projectId = assignment.path("id").asText();
+ String projectName = assignment.path("name").asText();
+ lists.add(new IdAndNameDTO(projectId, projectName));
}
return lists;
diff --git a/src/main/java/com/aolda/itda/service/main/MainService.java b/src/main/java/com/aolda/itda/service/main/MainService.java
new file mode 100644
index 0000000..2c36ac8
--- /dev/null
+++ b/src/main/java/com/aolda/itda/service/main/MainService.java
@@ -0,0 +1,61 @@
+package com.aolda.itda.service.main;
+
+import com.aolda.itda.dto.PageResp;
+import com.aolda.itda.dto.auth.IdAndNameDTO;
+import com.aolda.itda.dto.main.MainInfoDTO;
+import com.aolda.itda.repository.certificate.CertificateRepository;
+import com.aolda.itda.repository.forwarding.ForwardingRepository;
+import com.aolda.itda.repository.routing.RoutingRepository;
+import com.aolda.itda.service.AuthService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class MainService {
+
+ private final AuthService authService;
+ private final RoutingRepository routingRepository;
+ private final ForwardingRepository forwardingRepository;
+ private final CertificateRepository certificateRepository;
+
+ /* 메인 페이지에 필요한 정보 반환 */
+ public MainInfoDTO getMainInfo(String projectId, List<String> projects) {
+
+ /* 프로젝트 권한 검증 */
+ authService.validateProjectAuth(projects, projectId);
+
+ /* 카운팅 */
+ Long routing = (long) routingRepository.findByProjectIdAndIsDeleted(projectId, false).size();
+ Long forwarding = (long) forwardingRepository.findByProjectIdAndIsDeleted(projectId, false).size();
+ Long certificate = 0L;
+
+ return MainInfoDTO.builder()
+ .routing(routing)
+ .forwarding(forwarding)
+ .certificate(certificate)
+ .build();
+ }
+
+ /* 접근 가능한 프로젝트 조회 */
+ public PageResp<IdAndNameDTO> getAllProjects(Map<String, String> user) throws JsonProcessingException {
+
+ List<IdAndNameDTO> projects;
+ if (authService.isAdmin(user)) {
+ projects = authService.getAllProjects(user.get("token"));
+ }
+
+ else {
+ projects = authService.getProjectsWithUser(user);
+ }
+
+ return PageResp.<IdAndNameDTO>builder()
+ .contents(projects).build();
+ }
+}
--
GitLab