Eliminate admin N+1 queries and lazy-load app routes

This commit is contained in:
yoyuzh
2026-04-12 00:48:23 +08:00
parent 30a9bbc1e7
commit 9af2d38e37
9 changed files with 290 additions and 65 deletions

View File

@@ -8,6 +8,7 @@ import com.yoyuzh.files.core.FileBlobRepository;
import com.yoyuzh.files.core.FileEntity; import com.yoyuzh.files.core.FileEntity;
import com.yoyuzh.files.core.FileEntityRepository; import com.yoyuzh.files.core.FileEntityRepository;
import com.yoyuzh.files.core.FileEntityType; import com.yoyuzh.files.core.FileEntityType;
import com.yoyuzh.files.core.FileBlob;
import com.yoyuzh.files.core.StoredFile; import com.yoyuzh.files.core.StoredFile;
import com.yoyuzh.files.core.StoredFileEntityRepository; import com.yoyuzh.files.core.StoredFileEntityRepository;
import com.yoyuzh.files.core.StoredFileRepository; import com.yoyuzh.files.core.StoredFileRepository;
@@ -23,7 +24,12 @@ import org.springframework.util.StringUtils;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -82,8 +88,15 @@ public class AdminInspectionQueryService {
entityType, entityType,
PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt")) PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"))
); );
List<AdminFileBlobResponse> items = result.getContent().stream() List<FileEntity> entities = result.getContent();
.map(this::toFileBlobResponse) Map<String, FileBlob> blobsByObjectKey = loadBlobsByObjectKey(entities);
Map<Long, StoredFileEntityRepository.FileEntityLinkStatsProjection> linkStatsByEntityId = loadLinkStatsByEntityId(entities);
List<AdminFileBlobResponse> items = entities.stream()
.map(entity -> toFileBlobResponse(
entity,
blobsByObjectKey.get(entity.getObjectKey()),
linkStatsByEntityId.get(entity.getId())
))
.toList(); .toList();
return new PageResponse<>(items, result.getTotalElements(), page, size); return new PageResponse<>(items, result.getTotalElements(), page, size);
} }
@@ -126,10 +139,17 @@ public class AdminInspectionQueryService {
); );
} }
private AdminFileBlobResponse toFileBlobResponse(FileEntity entity) { private AdminFileBlobResponse toFileBlobResponse(FileEntity entity,
var blob = fileBlobRepository.findByObjectKey(entity.getObjectKey()).orElse(null); FileBlob blob,
long linkedStoredFileCount = storedFileEntityRepository.countByFileEntityId(entity.getId()); StoredFileEntityRepository.FileEntityLinkStatsProjection linkStats) {
long linkedOwnerCount = storedFileEntityRepository.countDistinctOwnersByFileEntityId(entity.getId()); long linkedStoredFileCount = linkStats == null || linkStats.getLinkedStoredFileCount() == null
? 0L
: linkStats.getLinkedStoredFileCount();
long linkedOwnerCount = linkStats == null || linkStats.getLinkedOwnerCount() == null
? 0L
: linkStats.getLinkedOwnerCount();
String sampleOwnerUsername = linkStats == null ? null : linkStats.getSampleOwnerUsername();
String sampleOwnerEmail = linkStats == null ? null : linkStats.getSampleOwnerEmail();
return new AdminFileBlobResponse( return new AdminFileBlobResponse(
entity.getId(), entity.getId(),
blob == null ? null : blob.getId(), blob == null ? null : blob.getId(),
@@ -141,8 +161,8 @@ public class AdminInspectionQueryService {
entity.getReferenceCount(), entity.getReferenceCount(),
linkedStoredFileCount, linkedStoredFileCount,
linkedOwnerCount, linkedOwnerCount,
storedFileEntityRepository.findSampleOwnerUsernameByFileEntityId(entity.getId()), sampleOwnerUsername,
storedFileEntityRepository.findSampleOwnerEmailByFileEntityId(entity.getId()), sampleOwnerEmail,
entity.getCreatedBy() == null ? null : entity.getCreatedBy().getId(), entity.getCreatedBy() == null ? null : entity.getCreatedBy().getId(),
entity.getCreatedBy() == null ? null : entity.getCreatedBy().getUsername(), entity.getCreatedBy() == null ? null : entity.getCreatedBy().getUsername(),
entity.getCreatedAt(), entity.getCreatedAt(),
@@ -153,6 +173,37 @@ public class AdminInspectionQueryService {
); );
} }
private Map<String, FileBlob> loadBlobsByObjectKey(List<FileEntity> entities) {
Set<String> objectKeys = entities.stream()
.map(FileEntity::getObjectKey)
.filter(StringUtils::hasText)
.collect(Collectors.toSet());
if (objectKeys.isEmpty()) {
return Map.of();
}
return fileBlobRepository.findAllByObjectKeyIn(objectKeys).stream()
.collect(Collectors.toMap(
FileBlob::getObjectKey,
Function.identity(),
(left, right) -> left
));
}
private Map<Long, StoredFileEntityRepository.FileEntityLinkStatsProjection> loadLinkStatsByEntityId(List<FileEntity> entities) {
Set<Long> entityIds = entities.stream()
.map(FileEntity::getId)
.filter(id -> id != null)
.collect(Collectors.toSet());
if (entityIds.isEmpty()) {
return Collections.emptyMap();
}
return storedFileEntityRepository.findAdminLinkStatsByFileEntityIds(entityIds).stream()
.collect(Collectors.toMap(
StoredFileEntityRepository.FileEntityLinkStatsProjection::getFileEntityId,
Function.identity()
));
}
private AdminShareResponse toAdminShareResponse(FileShareLink shareLink) { private AdminShareResponse toAdminShareResponse(FileShareLink shareLink) {
StoredFile file = shareLink.getFile(); StoredFile file = shareLink.getFile();
User owner = shareLink.getOwner(); User owner = shareLink.getOwner();

View File

@@ -21,7 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -41,8 +44,12 @@ public class AdminUserGovernanceService {
normalizeQuery(query), normalizeQuery(query),
PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt")) PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"))
); );
List<User> users = result.getContent();
Map<Long, Long> usedStorageByUserId = loadUsedStorageByUserIds(users);
return new PageResponse<>( return new PageResponse<>(
result.getContent().stream().map(this::toUserResponse).toList(), users.stream()
.map(user -> toUserResponse(user, usedStorageByUserId.getOrDefault(user.getId(), 0L)))
.toList(),
result.getTotalElements(), result.getTotalElements(),
page, page,
size size
@@ -150,7 +157,10 @@ public class AdminUserGovernanceService {
} }
private AdminUserResponse toUserResponse(User user) { private AdminUserResponse toUserResponse(User user) {
long usedStorageBytes = storedFileRepository.sumFileSizeByUserId(user.getId()); return toUserResponse(user, storedFileRepository.sumFileSizeByUserId(user.getId()));
}
private AdminUserResponse toUserResponse(User user, long usedStorageBytes) {
return new AdminUserResponse( return new AdminUserResponse(
user.getId(), user.getId(),
user.getUsername(), user.getUsername(),
@@ -165,6 +175,21 @@ public class AdminUserGovernanceService {
); );
} }
private Map<Long, Long> loadUsedStorageByUserIds(List<User> users) {
Set<Long> userIds = users.stream()
.map(User::getId)
.filter(id -> id != null)
.collect(Collectors.toSet());
if (userIds.isEmpty()) {
return Map.of();
}
return storedFileRepository.sumFileSizeByUserIds(userIds).stream()
.collect(Collectors.toMap(
StoredFileRepository.UserStorageUsageProjection::getUserId,
projection -> projection.getUsedStorageBytes() == null ? 0L : projection.getUsedStorageBytes()
));
}
private User getRequiredUser(Long userId) { private User getRequiredUser(Long userId) {
return userRepository.findById(userId) return userRepository.findById(userId)
.orElseThrow(() -> new BusinessException(ErrorCode.UNKNOWN, "user not found")); .orElseThrow(() -> new BusinessException(ErrorCode.UNKNOWN, "user not found"));

View File

@@ -3,12 +3,16 @@ package com.yoyuzh.files.core;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.util.Collection;
import java.util.List;
import java.util.Optional; import java.util.Optional;
public interface FileBlobRepository extends JpaRepository<FileBlob, Long> { public interface FileBlobRepository extends JpaRepository<FileBlob, Long> {
Optional<FileBlob> findByObjectKey(String objectKey); Optional<FileBlob> findByObjectKey(String objectKey);
List<FileBlob> findAllByObjectKeyIn(Collection<String> objectKeys);
@Query(""" @Query("""
select coalesce(sum(b.size), 0) select coalesce(sum(b.size), 0)
from FileBlob b from FileBlob b

View File

@@ -4,8 +4,23 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import java.util.Collection;
import java.util.List;
public interface StoredFileEntityRepository extends JpaRepository<StoredFileEntity, Long> { public interface StoredFileEntityRepository extends JpaRepository<StoredFileEntity, Long> {
interface FileEntityLinkStatsProjection {
Long getFileEntityId();
Long getLinkedStoredFileCount();
Long getLinkedOwnerCount();
String getSampleOwnerUsername();
String getSampleOwnerEmail();
}
@Query(""" @Query("""
select count(distinct relation.storedFile.id) select count(distinct relation.storedFile.id)
from StoredFileEntity relation from StoredFileEntity relation
@@ -41,4 +56,18 @@ public interface StoredFileEntityRepository extends JpaRepository<StoredFileEnti
where relation.fileEntity.id = :fileEntityId where relation.fileEntity.id = :fileEntityId
""") """)
String findSampleOwnerEmailByFileEntityId(@Param("fileEntityId") Long fileEntityId); String findSampleOwnerEmailByFileEntityId(@Param("fileEntityId") Long fileEntityId);
@Query("""
select relation.fileEntity.id as fileEntityId,
count(distinct relation.storedFile.id) as linkedStoredFileCount,
count(distinct owner.id) as linkedOwnerCount,
min(owner.username) as sampleOwnerUsername,
min(owner.email) as sampleOwnerEmail
from StoredFileEntity relation
join relation.storedFile storedFile
join storedFile.user owner
where relation.fileEntity.id in :fileEntityIds
group by relation.fileEntity.id
""")
List<FileEntityLinkStatsProjection> findAdminLinkStatsByFileEntityIds(@Param("fileEntityIds") Collection<Long> fileEntityIds);
} }

View File

@@ -8,11 +8,18 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
public interface StoredFileRepository extends JpaRepository<StoredFile, Long> { public interface StoredFileRepository extends JpaRepository<StoredFile, Long> {
interface UserStorageUsageProjection {
Long getUserId();
Long getUsedStorageBytes();
}
@EntityGraph(attributePaths = {"user", "blob"}) @EntityGraph(attributePaths = {"user", "blob"})
Page<StoredFile> findAllByOrderByCreatedAtDesc(Pageable pageable); Page<StoredFile> findAllByOrderByCreatedAtDesc(Pageable pageable);
@@ -104,6 +111,14 @@ public interface StoredFileRepository extends JpaRepository<StoredFile, Long> {
""") """)
long sumFileSizeByUserId(@Param("userId") Long userId); long sumFileSizeByUserId(@Param("userId") Long userId);
@Query("""
select f.user.id as userId, coalesce(sum(f.size), 0) as usedStorageBytes
from StoredFile f
where f.user.id in :userIds and f.directory = false and f.deletedAt is null
group by f.user.id
""")
List<UserStorageUsageProjection> sumFileSizeByUserIds(@Param("userIds") Collection<Long> userIds);
@Query(""" @Query("""
select coalesce(sum(f.size), 0) select coalesce(sum(f.size), 0)
from StoredFile f from StoredFile f

View File

@@ -5,7 +5,10 @@ import com.yoyuzh.auth.User;
import com.yoyuzh.auth.UserRepository; import com.yoyuzh.auth.UserRepository;
import com.yoyuzh.auth.UserRole; import com.yoyuzh.auth.UserRole;
import com.yoyuzh.common.PageResponse; import com.yoyuzh.common.PageResponse;
import com.yoyuzh.files.core.FileBlob;
import com.yoyuzh.files.core.FileBlobRepository; import com.yoyuzh.files.core.FileBlobRepository;
import com.yoyuzh.files.core.FileEntity;
import com.yoyuzh.files.core.FileEntityType;
import com.yoyuzh.files.core.FileEntityRepository; import com.yoyuzh.files.core.FileEntityRepository;
import com.yoyuzh.files.core.StoredFile; import com.yoyuzh.files.core.StoredFile;
import com.yoyuzh.files.core.StoredFileEntityRepository; import com.yoyuzh.files.core.StoredFileEntityRepository;
@@ -25,6 +28,9 @@ import java.util.List;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@@ -123,6 +129,63 @@ class AdminInspectionQueryServiceTest {
assertThat(response.items().get(0).ownerUsername()).isEqualTo("alice"); assertThat(response.items().get(0).ownerUsername()).isEqualTo("alice");
} }
@Test
void shouldListFileBlobsWithBatchLoadedBlobAndLinkStats() {
User creator = createUser(9L, "creator", "creator@example.com");
FileEntity entity = new FileEntity();
entity.setId(100L);
entity.setObjectKey("blobs/a");
entity.setEntityType(FileEntityType.VERSION);
entity.setStoragePolicyId(5L);
entity.setSize(1024L);
entity.setContentType("application/pdf");
entity.setReferenceCount(1);
entity.setCreatedBy(creator);
entity.setCreatedAt(LocalDateTime.now().minusMinutes(2));
FileBlob blob = new FileBlob();
blob.setId(88L);
blob.setObjectKey("blobs/a");
blob.setContentType("application/pdf");
blob.setSize(1024L);
blob.setCreatedAt(LocalDateTime.now().minusMinutes(3));
StoredFileEntityRepository.FileEntityLinkStatsProjection linkStats = mock(StoredFileEntityRepository.FileEntityLinkStatsProjection.class);
when(linkStats.getFileEntityId()).thenReturn(100L);
when(linkStats.getLinkedStoredFileCount()).thenReturn(1L);
when(linkStats.getLinkedOwnerCount()).thenReturn(1L);
when(linkStats.getSampleOwnerUsername()).thenReturn("alice");
when(linkStats.getSampleOwnerEmail()).thenReturn("alice@example.com");
when(fileEntityRepository.searchAdminEntities(anyString(), any(), anyString(), any(), any()))
.thenReturn(new PageImpl<>(List.of(entity)));
when(fileBlobRepository.findAllByObjectKeyIn(any())).thenReturn(List.of(blob));
when(storedFileEntityRepository.findAdminLinkStatsByFileEntityIds(any())).thenReturn(List.of(linkStats));
PageResponse<AdminFileBlobResponse> response = adminInspectionQueryService.listFileBlobs(
0,
10,
null,
null,
null,
null
);
assertThat(response.items()).hasSize(1);
assertThat(response.items().get(0).entityId()).isEqualTo(100L);
assertThat(response.items().get(0).blobId()).isEqualTo(88L);
assertThat(response.items().get(0).linkedStoredFileCount()).isEqualTo(1L);
assertThat(response.items().get(0).linkedOwnerCount()).isEqualTo(1L);
assertThat(response.items().get(0).sampleOwnerUsername()).isEqualTo("alice");
assertThat(response.items().get(0).sampleOwnerEmail()).isEqualTo("alice@example.com");
verify(fileBlobRepository, never()).findByObjectKey(anyString());
verify(storedFileEntityRepository, never()).countByFileEntityId(any());
verify(storedFileEntityRepository, never()).countDistinctOwnersByFileEntityId(any());
verify(storedFileEntityRepository, never()).findSampleOwnerUsernameByFileEntityId(any());
verify(storedFileEntityRepository, never()).findSampleOwnerEmailByFileEntityId(any());
}
private User createUser(Long id, String username, String email) { private User createUser(Long id, String username, String email) {
User user = new User(); User user = new User();
user.setId(id); user.setId(id);

View File

@@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -67,9 +68,12 @@ class AdminUserGovernanceServiceTest {
@Test @Test
void shouldListUsersWithPagination() { void shouldListUsersWithPagination() {
User user = createUser(1L, "alice", "alice@example.com"); User user = createUser(1L, "alice", "alice@example.com");
StoredFileRepository.UserStorageUsageProjection usageProjection = mock(StoredFileRepository.UserStorageUsageProjection.class);
when(usageProjection.getUserId()).thenReturn(1L);
when(usageProjection.getUsedStorageBytes()).thenReturn(2048L);
when(userRepository.searchByUsernameOrEmail(anyString(), any())) when(userRepository.searchByUsernameOrEmail(anyString(), any()))
.thenReturn(new PageImpl<>(List.of(user))); .thenReturn(new PageImpl<>(List.of(user)));
when(storedFileRepository.sumFileSizeByUserId(1L)).thenReturn(2048L); when(storedFileRepository.sumFileSizeByUserIds(any())).thenReturn(List.of(usageProjection));
PageResponse<AdminUserResponse> response = adminUserGovernanceService.listUsers(0, 10, "alice"); PageResponse<AdminUserResponse> response = adminUserGovernanceService.listUsers(0, 10, "alice");

View File

@@ -1,30 +1,29 @@
import { Suspense, lazy } from 'react';
import { BrowserRouter, Navigate, Route, Routes, useLocation } from 'react-router-dom'; import { BrowserRouter, Navigate, Route, Routes, useLocation } from 'react-router-dom';
import { AnimatePresence, motion } from 'motion/react'; import { AnimatePresence } from 'motion/react';
import AdminDashboard from './admin/dashboard';
import AdminFilesList from './admin/files-list';
import AdminStoragePoliciesList from './admin/storage-policies-list';
import AdminUsersList from './admin/users-list';
import AdminLayout from './admin/AdminLayout';
// 新增占位页面
import AdminSettings from './admin/settings';
import AdminFilesystem from './admin/filesystem';
import AdminFileBlobs from './admin/fileblobs';
import AdminShares from './admin/shares';
import AdminTasks from './admin/tasks';
import AdminOAuthApps from './admin/oauthapps';
import Layout from './components/layout/Layout';
import MobileLayout from './mobile-components/MobileLayout';
import { useIsMobile } from './hooks/useIsMobile'; import { useIsMobile } from './hooks/useIsMobile';
import Login from './account/pages/LoginPage';
import Overview from './workspace/pages/OverviewPage'; const Layout = lazy(() => import('./components/layout/Layout'));
import FilesPage from './workspace/pages/FilesPage'; const MobileLayout = lazy(() => import('./mobile-components/MobileLayout'));
import RecycleBin from './workspace/pages/RecycleBinPage'; const Login = lazy(() => import('./account/pages/LoginPage'));
import Shares from './sharing/pages/SharesPage'; const Overview = lazy(() => import('./workspace/pages/OverviewPage'));
import FileShare from './sharing/pages/FileSharePage'; const FilesPage = lazy(() => import('./workspace/pages/FilesPage'));
import Tasks from './common/pages/TasksPage'; const RecycleBin = lazy(() => import('./workspace/pages/RecycleBinPage'));
import Transfer from './transfer/pages/TransferPage'; const Shares = lazy(() => import('./sharing/pages/SharesPage'));
const FileShare = lazy(() => import('./sharing/pages/FileSharePage'));
const Tasks = lazy(() => import('./common/pages/TasksPage'));
const Transfer = lazy(() => import('./transfer/pages/TransferPage'));
const AdminLayout = lazy(() => import('./admin/AdminLayout'));
const AdminDashboard = lazy(() => import('./admin/dashboard'));
const AdminSettings = lazy(() => import('./admin/settings'));
const AdminFilesystem = lazy(() => import('./admin/filesystem'));
const AdminStoragePoliciesList = lazy(() => import('./admin/storage-policies-list'));
const AdminUsersList = lazy(() => import('./admin/users-list'));
const AdminFilesList = lazy(() => import('./admin/files-list'));
const AdminFileBlobs = lazy(() => import('./admin/fileblobs'));
const AdminShares = lazy(() => import('./admin/shares'));
const AdminTasks = lazy(() => import('./admin/tasks'));
const AdminOAuthApps = lazy(() => import('./admin/oauthapps'));
function AnimatedRoutes({ isMobile }: { isMobile: boolean }) { function AnimatedRoutes({ isMobile }: { isMobile: boolean }) {
const location = useLocation(); const location = useLocation();
@@ -32,40 +31,51 @@ function AnimatedRoutes({ isMobile }: { isMobile: boolean }) {
return ( return (
<AnimatePresence mode="wait"> <AnimatePresence mode="wait">
<Routes location={location}> <Suspense fallback={<RouteLoadingFallback />}>
<Route path="/login" element={<Login />} /> <Routes location={location}>
<Route path="/share/:token" element={<FileShare />} /> <Route path="/login" element={<Login />} />
<Route element={<AppLayout />}> <Route path="/share/:token" element={<FileShare />} />
<Route path="/" element={<Navigate to="/overview" replace />} /> <Route element={<AppLayout />}>
<Route path="/overview" element={<Overview />} /> <Route path="/" element={<Navigate to="/overview" replace />} />
<Route path="/files" element={<FilesPage />} /> <Route path="/overview" element={<Overview />} />
<Route path="/tasks" element={<Tasks />} /> <Route path="/files" element={<FilesPage />} />
<Route path="/shares" element={<Shares />} /> <Route path="/tasks" element={<Tasks />} />
<Route path="/recycle-bin" element={<RecycleBin />} /> <Route path="/shares" element={<Shares />} />
<Route path="/transfer" element={<Transfer />} /> <Route path="/recycle-bin" element={<RecycleBin />} />
<Route path="/transfer" element={<Transfer />} />
{/* 管理台路由重构 */}
<Route path="/admin" element={isMobile ? <Navigate to="/overview" replace /> : <AdminLayout />}>
<Route index element={<Navigate to="dashboard" replace />} />
<Route path="dashboard" element={<AdminDashboard />} />
<Route path="settings" element={<AdminSettings />} />
<Route path="filesystem" element={<AdminFilesystem />} />
<Route path="storage-policies" element={<AdminStoragePoliciesList />} />
<Route path="users" element={<AdminUsersList />} />
<Route path="files" element={<AdminFilesList />} />
<Route path="file-blobs" element={<AdminFileBlobs />} />
<Route path="shares" element={<AdminShares />} />
<Route path="tasks" element={<AdminTasks />} />
<Route path="oauth-apps" element={<AdminOAuthApps />} />
</Route>
<Route path="*" element={<Navigate to="/overview" replace />} /> <Route path="/admin" element={isMobile ? <Navigate to="/overview" replace /> : <AdminLayout />}>
</Route> <Route index element={<Navigate to="dashboard" replace />} />
</Routes> <Route path="dashboard" element={<AdminDashboard />} />
<Route path="settings" element={<AdminSettings />} />
<Route path="filesystem" element={<AdminFilesystem />} />
<Route path="storage-policies" element={<AdminStoragePoliciesList />} />
<Route path="users" element={<AdminUsersList />} />
<Route path="files" element={<AdminFilesList />} />
<Route path="file-blobs" element={<AdminFileBlobs />} />
<Route path="shares" element={<AdminShares />} />
<Route path="tasks" element={<AdminTasks />} />
<Route path="oauth-apps" element={<AdminOAuthApps />} />
</Route>
<Route path="*" element={<Navigate to="/overview" replace />} />
</Route>
</Routes>
</Suspense>
</AnimatePresence> </AnimatePresence>
); );
} }
function RouteLoadingFallback() {
return (
<div className="flex h-screen w-full items-center justify-center bg-aurora text-gray-900 dark:text-gray-100">
<div className="rounded-lg border border-white/20 bg-white/40 px-4 py-3 text-sm font-black uppercase tracking-[0.2em] shadow-lg backdrop-blur-xl dark:bg-black/30">
Loading...
</div>
</div>
);
}
export default function App() { export default function App() {
const isMobile = useIsMobile(); const isMobile = useIsMobile();

View File

@@ -821,3 +821,27 @@
- Verification passed with: - Verification passed with:
- `cd front && npm run lint` - `cd front && npm run lint`
- `cd front && npm run build` - `cd front && npm run build`
## 2026-04-12 Backend/Frontend Refactor Batch 26
- Review follow-up perf fixes were applied for two admin read-path N+1 hotspots plus route-level code-splitting in frontend root router.
- `AdminInspectionQueryService#listFileBlobs(...)` no longer executes per-row blob/owner/stat lookups:
- introduced batch blob load by object-key (`FileBlobRepository.findAllByObjectKeyIn(...)`)
- introduced batch entity-link aggregate query (`StoredFileEntityRepository.findAdminLinkStatsByFileEntityIds(...)`)
- mapping now uses in-memory maps (`objectKey -> blob`, `entityId -> link stats`) and keeps existing response semantics (`blobMissing`, `orphanRisk`, `referenceMismatch`) unchanged.
- `AdminUserGovernanceService#listUsers(...)` no longer executes per-user storage sum:
- introduced `StoredFileRepository.sumFileSizeByUserIds(...)` grouped aggregate query
- list path now batch-loads storage usage map and maps each row without per-user SQL.
- Regression tests updated/added:
- `AdminInspectionQueryServiceTest` now covers batch blob/link-stat mapping path and asserts old per-row repository methods are no longer used.
- `AdminUserGovernanceServiceTest` list-users path now stubs/asserts grouped `sumFileSizeByUserIds(...)`.
- Frontend route loading in `front/src/App.tsx` switched to lazy imports + `Suspense` fallback:
- all main pages and admin pages/layouts are now route-level lazy chunks instead of root synchronous imports.
- Verification passed with:
- `cd backend && mvn "-Dtest=AdminInspectionQueryServiceTest,AdminUserGovernanceServiceTest,AdminControllerIntegrationTest" test`
- result: 34 tests run, 0 failures
- full regression `cd backend && mvn test`
- Backend total after this batch: 378 tests passed.
- `cd front && npm run lint`
- `cd front && npm run build`
- build output now shows split chunks with main entry chunk `assets/index-CXR4rSrf.js` at **244.85 kB** (previously reported ~538.17 kB), and no Vite chunk-size warning.