Skip to content

[Feat] 관리자 페이지 개편 (디자인, 로그인 유지, 데이터 조회, 통계) #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KiSeungMin merged 7 commits into from
Sep 21, 2026
Merged

[Feat] 관리자 페이지 개편 (디자인, 로그인 유지, 데이터 조회, 통계) #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc6abfe
[Fix] 관리자 로그인이 30분 만에 풀리던 문제를 고치고 유저 삭제를 없앤다
KiSeungMin Sep 21, 2026
4d5f991
[Feat] 관리자 화면 공통 레이아웃을 만들고 로그인, 공지, 피드백 화면을 새로 그린다
KiSeungMin Sep 21, 2026
f88ede0
[Feat] 관리자 화면에서 유저, 학습 기록, 스터디룸, 성장 데이터를 모두 볼 수 있게 한다
KiSeungMin Sep 21, 2026
2bfc193
[Fix] 관리자 화면의 박스 높이, 깜빡임, 로고를 고치고 사이드바를 접을 수 있게 한다
KiSeungMin Sep 21, 2026
1efc71b
[Feat] 관리자 통계와 요약 숫자에서 게스트와 관리자 계정을 뺀다
KiSeungMin Sep 21, 2026
abd05ae
[Chore] 관리자 화면에서 게스트 제외 안내 문구를 뺀다
KiSeungMin Sep 21, 2026
8c2dccf
[Fix] 관리자 화면의 오늘 날짜를 서울 시간대로 읽고 인증 테스트를 새 동작에 맞춘다
KiSeungMin Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 39 additions & 92 deletions src/main/java/com/aisip/OnO/backend/admin/controller/AdminAnalysisController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.aisip.OnO.backend.admin.controller;

import com.aisip.OnO.backend.admin.repository.AdminStatsQueryRepository;
import com.aisip.OnO.backend.admin.service.AdminStatsService;
import com.aisip.OnO.backend.mission.service.MissionLogService;
import com.aisip.OnO.backend.practicenote.service.PracticeNoteService;
import com.aisip.OnO.backend.problem.entity.AnalysisStatus;
import com.aisip.OnO.backend.problem.service.ProblemService;
import com.aisip.OnO.backend.user.dto.UserResponseDto;
import com.aisip.OnO.backend.user.entity.User;
import com.aisip.OnO.backend.user.service.UserService;
Expand All @@ -17,9 +16,9 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Slf4j
Expand All @@ -28,10 +27,16 @@
@RequestMapping("/admin")
public class AdminAnalysisController {

/** 서비스 기준 시간대. 인자 없는 now() 는 서버 기본 시간대를 따라 하루가 밀릴 수 있다. */
private static final ZoneId KST = ZoneId.of("Asia/Seoul");

private final UserService userService;
private final ProblemService problemService;
private final MissionLogService missionLogService;
private final PracticeNoteService practiceNoteService;
private final AdminStatsService adminStatsService;
private final AdminStatsQueryRepository adminStatsQueryRepository;

/** 한 번에 볼 수 있는 최대 기간. 날짜별 표와 차트가 한 화면에 들어가는 선이다. */
private static final int MAX_RANGE_DAYS = 366;

@GetMapping("/analysis")
public String getAllAnalysis(
Expand All @@ -41,14 +46,7 @@ public String getAllAnalysis(
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate,
Model model
) {
long allUserCount = userService.countAllUsers();
long allProblemCount = problemService.countAllProblems();
long allPracticeNoteCount = practiceNoteService.countAllPracticeNotes();
long allPracticeLogCount = missionLogService.countNotePracticeLogs();
long allProblemAnalysisCount = problemService.countAllProblemAnalyses();
Map<AnalysisStatus, Long> allAnalysisStatusCounts = problemService.countProblemAnalysesByStatus();

LocalDate today = LocalDate.now();
LocalDate today = LocalDate.now(KST);
LocalDate selectedStartDate = startDate != null ? startDate : today.minusDays(29);
LocalDate selectedEndDate = endDate != null ? endDate : today;

Expand All @@ -57,90 +55,39 @@ public String getAllAnalysis(
selectedStartDate = selectedEndDate;
selectedEndDate = temp;
}
if (ChronoUnit.DAYS.between(selectedStartDate, selectedEndDate) + 1 > MAX_RANGE_DAYS) {
selectedStartDate = selectedEndDate.minusDays(MAX_RANGE_DAYS - 1);
}

AdminStatsService.Period period = adminStatsService.period(selectedStartDate, selectedEndDate);
AdminStatsService.Daily daily = adminStatsService.daily(selectedStartDate, selectedEndDate);

// 선택 기간 날짜별 출석 유저 수 및 신규 가입자 수
Map<LocalDate, Long> dailyActiveUsers = missionLogService.getDailyActiveUsersCount(selectedStartDate, selectedEndDate);
Map<LocalDate, Long> dailyVisits = missionLogService.getDailyVisitCount(selectedStartDate, selectedEndDate);
Map<LocalDate, Long> dailyNewUsers = userService.getDailyNewUsersCount(selectedStartDate, selectedEndDate);
Map<LocalDate, Long> dailyPracticeNotes = practiceNoteService.getDailyPracticeNotesCount(selectedStartDate, selectedEndDate);
Map<LocalDate, Long> dailyPracticeLogs = missionLogService.getDailyNotePracticeLogsCount(selectedStartDate, selectedEndDate);
Map<LocalDate, Long> dailyProblems = problemService.getDailyProblemsCount(selectedStartDate, selectedEndDate);
Map<AnalysisStatus, Long> periodAnalysisStatusCounts = problemService.countProblemAnalysesByStatus(selectedStartDate, selectedEndDate);

// 선택 기간 신규 가입자 총합
long recentNewUsersCount = dailyNewUsers.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodVisitCount = dailyVisits.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodActiveUserCount = dailyActiveUsers.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodUniqueVisitorCount = missionLogService.countUniqueVisitors(selectedStartDate, selectedEndDate);
long periodPracticeNoteCount = dailyPracticeNotes.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodPracticeLogCount = dailyPracticeLogs.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodProblemCount = dailyProblems.values().stream()
.mapToLong(Long::longValue)
.sum();
long periodCompletedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.COMPLETED, 0L);
long periodFailedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.FAILED, 0L);
long periodProcessingAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.PROCESSING, 0L);
long periodNotStartedAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.NOT_STARTED, 0L);
long periodNoImageAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.NO_IMAGE, 0L);
long periodRateLimitExceededAnalysisCount = periodAnalysisStatusCounts.getOrDefault(AnalysisStatus.RATE_LIMIT_EXCEEDED, 0L);
long periodFinishedAnalysisCount = periodCompletedAnalysisCount + periodFailedAnalysisCount;
double periodAnalysisFailureRate = periodFinishedAnalysisCount == 0
? 0.0
: (double) periodFailedAnalysisCount * 100 / periodFinishedAnalysisCount;

long selectedDays = ChronoUnit.DAYS.between(selectedStartDate, selectedEndDate) + 1;
double averageDailyVisitors = selectedDays > 0
? (double) periodActiveUserCount / selectedDays
: 0.0;

model.addAttribute("allUserCount", allUserCount);
model.addAttribute("allProblemCount", allProblemCount);
model.addAttribute("allPracticeNoteCount", allPracticeNoteCount);
model.addAttribute("allPracticeLogCount", allPracticeLogCount);
model.addAttribute("allProblemAnalysisCount", allProblemAnalysisCount);
model.addAttribute("allCompletedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.COMPLETED, 0L));
model.addAttribute("allFailedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.FAILED, 0L));
model.addAttribute("allProcessingAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.PROCESSING, 0L));
model.addAttribute("allNotStartedAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.NOT_STARTED, 0L));
model.addAttribute("allNoImageAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.NO_IMAGE, 0L));
model.addAttribute("allRateLimitExceededAnalysisCount", allAnalysisStatusCounts.getOrDefault(AnalysisStatus.RATE_LIMIT_EXCEEDED, 0L));
model.addAttribute("dailyActiveUsers", dailyActiveUsers);
model.addAttribute("dailyVisits", dailyVisits);
model.addAttribute("dailyNewUsers", dailyNewUsers);
model.addAttribute("dailyPracticeNotes", dailyPracticeNotes);
model.addAttribute("dailyPracticeLogs", dailyPracticeLogs);
model.addAttribute("dailyProblems", dailyProblems);
model.addAttribute("recentNewUsersCount", recentNewUsersCount);
model.addAttribute("periodVisitCount", periodVisitCount);
model.addAttribute("periodActiveUserCount", periodActiveUserCount);
model.addAttribute("periodUniqueVisitorCount", periodUniqueVisitorCount);
model.addAttribute("periodPracticeNoteCount", periodPracticeNoteCount);
model.addAttribute("periodPracticeLogCount", periodPracticeLogCount);
model.addAttribute("periodProblemCount", periodProblemCount);
model.addAttribute("periodCompletedAnalysisCount", periodCompletedAnalysisCount);
model.addAttribute("periodFailedAnalysisCount", periodFailedAnalysisCount);
model.addAttribute("periodProcessingAnalysisCount", periodProcessingAnalysisCount);
model.addAttribute("periodNotStartedAnalysisCount", periodNotStartedAnalysisCount);
model.addAttribute("periodNoImageAnalysisCount", periodNoImageAnalysisCount);
model.addAttribute("periodRateLimitExceededAnalysisCount", periodRateLimitExceededAnalysisCount);
model.addAttribute("periodAnalysisFailureRate", periodAnalysisFailureRate);
model.addAttribute("averageDailyVisitors", averageDailyVisitors);
model.addAttribute("startDate", selectedStartDate);
model.addAttribute("endDate", selectedEndDate);
model.addAttribute("days", period.days());
model.addAttribute("previousStartDate", period.previous().start());
model.addAttribute("previousEndDate", period.previous().end());
model.addAttribute("today", today);
model.addAttribute("quickStart7Days", today.minusDays(6));
model.addAttribute("quickStart30Days", today.minusDays(29));
model.addAttribute("quickStart90Days", today.minusDays(89));
model.addAttribute("today", today);
model.addAttribute("quickStartMonth", today.withDayOfMonth(1));

model.addAttribute("dailyActiveUsers", daily.activeUsers());
model.addAttribute("dailyNewUsers", daily.newUsers());
model.addAttribute("dailyProblems", daily.problems());
model.addAttribute("dailySolves", daily.solves());
model.addAttribute("dailyPracticeNotes", daily.practiceNotes());
model.addAttribute("dailyRows", daily.rowsNewestFirst());
model.addAttribute("dailyTotals", daily.totals());

model.addAttribute("userStats", adminStatsService.userStats(period, daily, today));
model.addAttribute("learningStats", adminStatsService.learningStats(period, daily));
model.addAttribute("analysisStats", adminStatsService.analysisStats(period));
model.addAttribute("growthStats", adminStatsService.growthStats(period, daily));
model.addAttribute("roomStats", adminStatsService.roomStats(period));
model.addAttribute("topProblemWriters", adminStatsQueryRepository.topProblemWriters(selectedStartDate, selectedEndDate, 10));
model.addAttribute("topSolvers", adminStatsQueryRepository.topSolvers(selectedStartDate, selectedEndDate, 10));

return "analysis";
}
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/com/aisip/OnO/backend/admin/controller/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
package com.aisip.OnO.backend.admin.controller;

import com.aisip.OnO.backend.admin.service.AdminStatsService;
import com.aisip.OnO.backend.notice.service.NoticeService;
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 java.time.LocalDate;
import java.time.ZoneId;

@Slf4j
@RequiredArgsConstructor
@Controller
@RequestMapping("/admin")
public class AdminController {

/** 서비스 기준 시간대. 인자 없는 now() 는 서버 기본 시간대를 따라 하루가 밀릴 수 있다. */
private static final ZoneId KST = ZoneId.of("Asia/Seoul");

private final AdminStatsService adminStatsService;
private final NoticeService noticeService;

@GetMapping("/main")
public String adminPage() {
public String adminPage(Model model) {
LocalDate today = LocalDate.now(KST);
model.addAttribute("today", today);
model.addAttribute("home", adminStatsService.home(today));
model.addAttribute("activeNotice", noticeService.findActiveNoticeForAdmin());
return "admin";
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/aisip/OnO/backend/admin/controller/AdminFeedbackController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.aisip.OnO.backend.admin.controller;

import com.aisip.OnO.backend.admin.dto.AdminPager;
import com.aisip.OnO.backend.feedback.dto.FeedbackResponseDto;
import com.aisip.OnO.backend.feedback.service.FeedbackService;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
Expand All @@ -22,6 +24,7 @@ public class AdminFeedbackController {
public String feedbackList(
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "20") int size,
HttpServletRequest request,
Model model
) {
// 쿼리 파라미터는 사용자 입력이다. page 가 음수이거나 size 가 0 이하면
Expand All @@ -38,6 +41,7 @@ public String feedbackList(
model.addAttribute("currentPage", selectedPage);
model.addAttribute("totalPages", pageResult.getTotalPages());
model.addAttribute("size", selectedSize);
model.addAttribute("pager", AdminPager.of(request, "page", selectedPage, selectedSize, pageResult.getTotalElements()));

int blockSize = 10;
int blockStart = (selectedPage / blockSize) * blockSize;
Expand Down
Loading
Loading