[release] 대중교통 길찾기 기능 배포 서버에 반영

.github/workflows/cd-develop.yml

@@ -2,7 +2,7 @@ name: CI/CD
 
 on:
 #  push:
-#    branches: [ "develop" ]
+#    branches: [ "feature/seungmin" ]
   pull_request:
     branches: [ "main" ]
 

build.gradle

@@ -31,6 +31,7 @@ dependencies {
 	implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0'
 	implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'

src/main/java/com/wayble/server/admin/controller/AdminController.java

@@ -0,0 +1,96 @@
+package com.wayble.server.admin.controller;
+
+import com.wayble.server.admin.dto.SystemStatusDto;
+import com.wayble.server.admin.service.AdminSystemService;
+import com.wayble.server.admin.service.AdminUserService;
+import com.wayble.server.admin.service.AdminWaybleZoneService;
+import jakarta.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Slf4j
+@Controller
+@RequestMapping("/admin")
+@RequiredArgsConstructor
+public class AdminController {
+
+    private final AdminSystemService adminSystemService;
+    private final AdminUserService adminUserService;
+    private final AdminWaybleZoneService adminWaybleZoneService;
+
+    @Value("${spring.admin.username}")
+    private String adminUsername;
+
+    @Value("${spring.admin.password}")
+    private String adminPassword;
+
+    @GetMapping("")
+    public String adminLoginPage(HttpSession session, Model model) {
+        // 이미 로그인된 경우 대시보드로 리다이렉트
+        if (session.getAttribute("adminLoggedIn") != null) {
+            return "redirect:/admin/dashboard";
+        }
+        return "admin/login";
+    }
+
+    @PostMapping("/login")
+    public String adminLogin(
+            @RequestParam String username,
+            @RequestParam String password,
+            HttpSession session,
+            Model model
+    ) {
+        if (adminUsername.equals(username) && adminPassword.equals(password)) {
+            session.setAttribute("adminLoggedIn", true);
+            session.setAttribute("adminUsername", username);
+            log.info("관리자 로그인 성공: {}", username);
+            return "redirect:/admin/dashboard";
+        } else {
+            model.addAttribute("error", "잘못된 사용자명 또는 비밀번호입니다.");
+            log.warn("관리자 로그인 실패 시도: {}", username);
+            return "admin/login";
+        }
+    }
+
+    @GetMapping("/dashboard")
+    public String adminDashboard(HttpSession session, Model model) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        // 시스템 상태 조회
+        SystemStatusDto systemStatus = SystemStatusDto.of(
+            adminSystemService.isApiServerHealthy(),
+            adminSystemService.isDatabaseHealthy(),
+            adminSystemService.isElasticsearchHealthy(),
+            adminSystemService.isFileStorageHealthy()
+        );
+
+        // 통계 데이터 조회
+        long totalUserCount = adminUserService.getTotalUserCount();
+        long totalDeletedUserCount = adminUserService.getTotalDeletedUserCount();
+        long totalWaybleZoneCount = adminWaybleZoneService.getTotalWaybleZoneCounts();
+
+        model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
+        model.addAttribute("systemStatus", systemStatus);
+        model.addAttribute("totalUserCount", totalUserCount);
+        model.addAttribute("totalDeletedUserCount", totalDeletedUserCount);
+        model.addAttribute("totalWaybleZoneCount", totalWaybleZoneCount);
+        return "admin/dashboard";
+    }
+
+    @PostMapping("/logout")
+    public String adminLogout(HttpSession session) {
+        session.invalidate();
+        log.info("관리자 로그아웃");
+        return "redirect:/admin";
+    }
+}

src/main/java/com/wayble/server/admin/controller/user/AdminUserController.java

@@ -0,0 +1,57 @@
+package com.wayble.server.admin.controller.user;
+
+import com.wayble.server.admin.dto.user.AdminUserDetailDto;
+import com.wayble.server.admin.dto.user.AdminUserThumbnailDto;
+import com.wayble.server.admin.service.AdminUserService;
+import com.wayble.server.common.response.CommonResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequiredArgsConstructor
+@Validated
+@RequestMapping("/api/v1/admin/users")
+public class AdminUserController {
+
+    private final AdminUserService adminUserService;
+
+    @GetMapping("/count")
+    public CommonResponse<Long> getTotalUserCount() {
+        return CommonResponse.success(adminUserService.getTotalUserCount());
+    }
+
+    @GetMapping()
+    public CommonResponse<List<AdminUserThumbnailDto>> findByCondition(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "100") int size)
+    {
+        return CommonResponse.success(adminUserService.findUsersByPage(page, size));
+    }
+
+    @GetMapping("/{userId}")
+    public CommonResponse<Optional<AdminUserDetailDto>> findUserById(@PathVariable("userId") long userId) {
+        return CommonResponse.success(adminUserService.findUserById(userId));
+    }
+
+    @GetMapping("/deleted/count")
+    public CommonResponse<Long> getTotalDeletedUserCount() {
+        return CommonResponse.success(adminUserService.getTotalDeletedUserCount());
+    }
+
+    @GetMapping("/deleted")
+    public CommonResponse<List<AdminUserThumbnailDto>> findDeletedUsers(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "100") int size)
+    {
+        return CommonResponse.success(adminUserService.findDeletedUsersByPage(page, size));
+    }
+
+    @GetMapping("/deleted/{userId}")
+    public CommonResponse<Optional<AdminUserDetailDto>> findDeletedUserById(@PathVariable("userId") long userId) {
+        return CommonResponse.success(adminUserService.findDeletedUserById(userId));
+    }
+}

src/main/java/com/wayble/server/admin/controller/user/AdminUserViewController.java

@@ -0,0 +1,124 @@
+package com.wayble.server.admin.controller.user;
+
+import com.wayble.server.admin.dto.user.AdminUserDetailDto;
+import com.wayble.server.admin.dto.user.AdminUserPageDto;
+import com.wayble.server.admin.service.AdminUserService;
+import jakarta.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.util.Optional;
+
+@Slf4j
+@Controller
+@RequestMapping("/admin/users")
+@RequiredArgsConstructor
+public class AdminUserViewController {
+
+    private final AdminUserService adminUserService;
+
+    @GetMapping
+    public String getUsers(HttpSession session, Model model,
+                          @RequestParam(defaultValue = "0") int page,
+                          @RequestParam(defaultValue = "100") int size) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        // 페이징 데이터 조회
+        AdminUserPageDto pageData = adminUserService.getUsersWithPaging(page, size);
+
+        model.addAttribute("pageData", pageData);
+        model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
+
+        log.debug("사용자 목록 조회 - 페이지: {}, 전체: {}", page, pageData.totalElements());
+
+        return "admin/user/users";
+    }
+
+    @GetMapping("/{id}")
+    public String getUserDetail(HttpSession session, Model model, @PathVariable Long id) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        Optional<AdminUserDetailDto> userOpt = adminUserService.findUserById(id);
+        if (userOpt.isEmpty()) {
+            return "redirect:/admin/user/users?error=notfound";
+        }
+
+        model.addAttribute("user", userOpt.get());
+        model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
+
+        log.debug("사용자 상세 조회 - ID: {}", id);
+
+        return "admin/user/user-detail";
+    }
+
+    @GetMapping("/deleted")
+    public String getDeletedUsers(HttpSession session, Model model,
+                                 @RequestParam(defaultValue = "0") int page,
+                                 @RequestParam(defaultValue = "100") int size) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        // 페이징 데이터 조회
+        AdminUserPageDto pageData = adminUserService.getDeletedUsersWithPaging(page, size);
+
+        model.addAttribute("pageData", pageData);
+        model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
+
+        log.debug("삭제된 사용자 목록 조회 - 페이지: {}, 전체: {}", page, pageData.totalElements());
+
+        return "admin/user/deleted-users";
+    }
+
+    @GetMapping("/deleted/{id}")
+    public String getDeletedUserDetail(HttpSession session, Model model, @PathVariable Long id) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        Optional<AdminUserDetailDto> userOpt = adminUserService.findDeletedUserById(id);
+        if (userOpt.isEmpty()) {
+            return "redirect:/admin/users/deleted?error=notfound";
+        }
+
+        model.addAttribute("user", userOpt.get());
+        model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
+
+        log.debug("삭제된 사용자 상세 조회 - ID: {}", id);
+
+        return "admin/user/deleted-user-detail";
+    }
+
+    @PostMapping("/deleted/{id}/restore")
+    public String restoreUser(HttpSession session, 
+                             @PathVariable Long id,
+                             RedirectAttributes redirectAttributes) {
+        // 로그인 확인
+        if (session.getAttribute("adminLoggedIn") == null) {
+            return "redirect:/admin";
+        }
+
+        try {
+            adminUserService.restoreUser(id);
+            redirectAttributes.addFlashAttribute("successMessage", "사용자가 성공적으로 복원되었습니다.");
+            log.info("사용자 복원 완료 - ID: {}, 관리자: {}", id, session.getAttribute("adminUsername"));
+            return "redirect:/admin/users/" + id;
+        } catch (Exception e) {
+            log.error("사용자 복원 실패 - ID: {}", id, e);
+            redirectAttributes.addFlashAttribute("errorMessage", "사용자 복원에 실패했습니다: " + e.getMessage());
+            return "redirect:/admin/users/deleted/" + id;
+        }
+    }
+}

src/main/java/com/wayble/server/admin/controller/wayblezone/AdminWaybleZoneController.java

@@ -0,0 +1,73 @@
+package com.wayble.server.admin.controller.wayblezone;
+
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneCreateDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneDetailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneThumbnailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneUpdateDto;
+import com.wayble.server.admin.service.AdminWaybleZoneService;
+import com.wayble.server.common.response.CommonResponse;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequiredArgsConstructor
+@Validated
+@RequestMapping("/api/v1/admin/wayble-zones")
+public class AdminWaybleZoneController {
+
+    private final AdminWaybleZoneService adminWaybleZoneService;
+
+    @GetMapping()
+    public CommonResponse<List<AdminWaybleZoneThumbnailDto>> findByCondition(
+            @RequestParam(name = "page", defaultValue = "0") int page,
+            @RequestParam(name = "size", defaultValue = "20") int size)
+    {
+        return CommonResponse.success(adminWaybleZoneService.findWaybleZonesByPage(page, size));
+    }
+
+    @GetMapping("/count")
+    public CommonResponse<Long> findAllWaybleZoneCount() {
+        return CommonResponse.success(adminWaybleZoneService.getTotalWaybleZoneCounts());
+    }
+
+    @GetMapping("/{waybleZoneId}")
+    public CommonResponse<Optional<AdminWaybleZoneDetailDto>> findWaybleZoneById(@PathVariable("waybleZoneId") long waybleZoneId) {
+        return CommonResponse.success(adminWaybleZoneService.findWaybleZoneById(waybleZoneId));
+    }
+
+    @PostMapping
+    public CommonResponse<Long> createWaybleZone(@Valid @RequestBody AdminWaybleZoneCreateDto createDto) {
+        Long waybleZoneId = adminWaybleZoneService.createWaybleZone(createDto);
+        return CommonResponse.success(waybleZoneId);
+    }
+
+    @PutMapping("/{waybleZoneId}")
+    public CommonResponse<Long> updateWaybleZone(@PathVariable("waybleZoneId") Long waybleZoneId,
+                                                @Valid @RequestBody AdminWaybleZoneUpdateDto updateDto) {
+        // DTO의 ID와 URL의 ID가 일치하는지 확인
+        AdminWaybleZoneUpdateDto validatedDto = new AdminWaybleZoneUpdateDto(
+            waybleZoneId,
+            updateDto.zoneName(),
+            updateDto.contactNumber(),
+            updateDto.zoneType(),
+            updateDto.state(),
+            updateDto.city(),
+            updateDto.district(),
+            updateDto.streetAddress(),
+            updateDto.detailAddress(),
+            updateDto.latitude(),
+            updateDto.longitude(),
+            updateDto.mainImageUrl()
+        );
+
+        Long updatedWaybleZoneId = adminWaybleZoneService.updateWaybleZone(validatedDto);
+        return CommonResponse.success(updatedWaybleZoneId);
+    }
+}