diff --git a/backend/routers/__pycache__/inbox.cpython-311.pyc b/backend/routers/__pycache__/inbox.cpython-311.pyc index 0794dd7..2d39406 100644 Binary files a/backend/routers/__pycache__/inbox.cpython-311.pyc and b/backend/routers/__pycache__/inbox.cpython-311.pyc differ diff --git a/backend/routers/__pycache__/issues.cpython-311.pyc b/backend/routers/__pycache__/issues.cpython-311.pyc index 34d6e8c..3a3a98b 100644 Binary files a/backend/routers/__pycache__/issues.cpython-311.pyc and b/backend/routers/__pycache__/issues.cpython-311.pyc differ diff --git a/backend/routers/__pycache__/reports.cpython-311.pyc b/backend/routers/__pycache__/reports.cpython-311.pyc index 9303efd..aa0ab6d 100644 Binary files a/backend/routers/__pycache__/reports.cpython-311.pyc and b/backend/routers/__pycache__/reports.cpython-311.pyc differ diff --git a/backend/routers/issues.py b/backend/routers/issues.py index f812072..45cee33 100644 --- a/backend/routers/issues.py +++ b/backend/routers/issues.py @@ -65,7 +65,8 @@ async def read_issues( if status: query = query.filter(Issue.status == status) - issues = query.offset(skip).limit(limit).all() + # 최신순 정렬 (report_date 기준) + issues = query.order_by(Issue.report_date.desc()).offset(skip).limit(limit).all() return issues @router.get("/admin/all", response_model=List[schemas.Issue]) @@ -93,7 +94,8 @@ async def read_all_issues_admin( if status: query = query.filter(Issue.status == status) - issues = query.offset(skip).limit(limit).all() + # 최신순 정렬 (report_date 기준) + issues = query.order_by(Issue.report_date.desc()).offset(skip).limit(limit).all() return issues @router.get("/{issue_id}", response_model=schemas.Issue) diff --git a/backend/routers/reports.py b/backend/routers/reports.py index 5bf90f9..e3dbad5 100644 --- a/backend/routers/reports.py +++ b/backend/routers/reports.py @@ -92,7 +92,7 @@ async def get_report_issues( if current_user.role == UserRole.user: query = query.filter(Issue.reporter_id == current_user.id) - issues = query.order_by(Issue.report_date).all() + issues = query.order_by(Issue.report_date.desc()).all() return [{ "id": issue.id, diff --git a/frontend/issues-archive.html b/frontend/issues-archive.html index 6cdd746..e070e84 100644 --- a/frontend/issues-archive.html +++ b/frontend/issues-archive.html @@ -395,15 +395,15 @@ filteredIssues.sort((a, b) => { switch (sortOrder) { case 'newest': - return new Date(b.updated_at || b.created_at) - new Date(a.updated_at || a.created_at); + return new Date(b.report_date) - new Date(a.report_date); case 'oldest': - return new Date(a.updated_at || a.created_at) - new Date(b.updated_at || b.created_at); + return new Date(a.report_date) - new Date(b.report_date); case 'completed': - return new Date(b.updated_at || b.created_at) - new Date(a.updated_at || a.created_at); + return new Date(b.disposed_at || b.report_date) - new Date(a.disposed_at || a.report_date); case 'category': return (a.category || '').localeCompare(b.category || ''); default: - return new Date(b.updated_at || b.created_at) - new Date(a.updated_at || a.created_at); + return new Date(b.report_date) - new Date(a.report_date); } }); } diff --git a/frontend/issues-inbox.html b/frontend/issues-inbox.html index e4ba2b0..18f2e09 100644 --- a/frontend/issues-inbox.html +++ b/frontend/issues-inbox.html @@ -703,14 +703,14 @@ filteredIssues.sort((a, b) => { switch (sortOrder) { case 'newest': - return new Date(b.created_at) - new Date(a.created_at); + return new Date(b.report_date) - new Date(a.report_date); case 'oldest': - return new Date(a.created_at) - new Date(b.created_at); + return new Date(a.report_date) - new Date(b.report_date); case 'priority': const priorityOrder = { 'high': 3, 'medium': 2, 'low': 1 }; return (priorityOrder[b.priority] || 1) - (priorityOrder[a.priority] || 1); default: - return new Date(b.created_at) - new Date(a.created_at); + return new Date(b.report_date) - new Date(a.report_date); } }); } diff --git a/frontend/issues-management.html b/frontend/issues-management.html index e612071..6071939 100644 --- a/frontend/issues-management.html +++ b/frontend/issues-management.html @@ -406,14 +406,14 @@ const priorityOrder = { 'high': 3, 'medium': 2, 'low': 1 }; return (priorityOrder[b.priority] || 1) - (priorityOrder[a.priority] || 1); case 'newest': - return new Date(b.created_at) - new Date(a.created_at); + return new Date(b.report_date) - new Date(a.report_date); case 'oldest': - return new Date(a.created_at) - new Date(b.created_at); + return new Date(a.report_date) - new Date(b.report_date); case 'status': const statusOrder = { 'new': 4, 'processing': 3, 'pending': 2, 'completed': 1 }; return (statusOrder[b.status] || 0) - (statusOrder[a.status] || 0); default: - return new Date(b.created_at) - new Date(a.created_at); + return new Date(b.report_date) - new Date(a.report_date); } }); }