diff --git a/backend/database/__pycache__/models.cpython-311.pyc b/backend/database/__pycache__/models.cpython-311.pyc index 02df15b..72796a9 100644 Binary files a/backend/database/__pycache__/models.cpython-311.pyc and b/backend/database/__pycache__/models.cpython-311.pyc differ diff --git a/backend/database/__pycache__/schemas.cpython-311.pyc b/backend/database/__pycache__/schemas.cpython-311.pyc index fa6b2cc..745a75c 100644 Binary files a/backend/database/__pycache__/schemas.cpython-311.pyc and b/backend/database/__pycache__/schemas.cpython-311.pyc differ diff --git a/backend/database/models.py b/backend/database/models.py index dd9983a..6760c4a 100644 --- a/backend/database/models.py +++ b/backend/database/models.py @@ -115,10 +115,15 @@ class Issue(Base): original_data = Column(JSONB) # 원본 데이터 보존 modification_log = Column(JSONB, default=lambda: []) # 수정 이력 + # 중복 신고 추적 시스템 + duplicate_of_issue_id = Column(Integer, ForeignKey("issues.id")) # 중복 대상 이슈 ID + duplicate_reporters = Column(JSONB, default=lambda: []) # 중복 신고자 목록 + # Relationships reporter = relationship("User", back_populates="issues", foreign_keys=[reporter_id]) - reviewer = relationship("User", foreign_keys=[reviewed_by_id]) + reviewer = relationship("User", foreign_keys=[reviewed_by_id], overlaps="reviewed_issues") project = relationship("Project", back_populates="issues") + duplicate_of = relationship("Issue", remote_side=[id], foreign_keys=[duplicate_of_issue_id]) class Project(Base): __tablename__ = "projects" diff --git a/backend/database/schemas.py b/backend/database/schemas.py index 8e59d1d..d443933 100644 --- a/backend/database/schemas.py +++ b/backend/database/schemas.py @@ -124,6 +124,10 @@ class Issue(IssueBase): original_data: Optional[Dict[str, Any]] = None modification_log: Optional[List[Dict[str, Any]]] = None + # 중복 신고 추적 시스템 + duplicate_of_issue_id: Optional[int] = None + duplicate_reporters: Optional[List[Dict[str, Any]]] = None + class Config: from_attributes = True @@ -132,6 +136,7 @@ class IssueDisposalRequest(BaseModel): """부적합 폐기 요청""" disposal_reason: DisposalReasonType = DisposalReasonType.duplicate custom_disposal_reason: Optional[str] = None + duplicate_of_issue_id: Optional[int] = None # 중복 대상 이슈 ID class IssueReviewRequest(BaseModel): """부적합 검토 및 수정 요청""" diff --git a/backend/migrations/015_add_duplicate_tracking.sql b/backend/migrations/015_add_duplicate_tracking.sql new file mode 100644 index 0000000..11e161b --- /dev/null +++ b/backend/migrations/015_add_duplicate_tracking.sql @@ -0,0 +1,100 @@ +-- 015_add_duplicate_tracking.sql +-- 중복 신고 추적 시스템 추가 + +BEGIN; + +-- migration_log 테이블 생성 (멱등성) +CREATE TABLE IF NOT EXISTS migration_log ( + id SERIAL PRIMARY KEY, + migration_file VARCHAR(255) NOT NULL UNIQUE, + executed_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + status VARCHAR(50), + notes TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- 마이그레이션 파일 이름 +DO $$ +DECLARE + migration_name VARCHAR(255) := '015_add_duplicate_tracking.sql'; + migration_notes TEXT := '중복 신고 추적 시스템: duplicate_of_issue_id, duplicate_reporters 컬럼 추가'; + current_status VARCHAR(50); +BEGIN + SELECT status INTO current_status FROM migration_log WHERE migration_file = migration_name; + + IF current_status IS NULL THEN + RAISE NOTICE '--- 마이그레이션 % 시작 ---', migration_name; + + -- issues 테이블에 중복 추적 컬럼 추가 + -- 중복 대상 이슈 ID + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'issues' AND column_name = 'duplicate_of_issue_id') THEN + ALTER TABLE issues ADD COLUMN duplicate_of_issue_id INTEGER; + RAISE NOTICE '✅ issues.duplicate_of_issue_id 컬럼이 추가되었습니다.'; + ELSE + RAISE NOTICE 'ℹ️ issues.duplicate_of_issue_id 컬럼이 이미 존재합니다.'; + END IF; + + -- 중복 신고자 목록 (JSONB 배열) + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'issues' AND column_name = 'duplicate_reporters') THEN + ALTER TABLE issues ADD COLUMN duplicate_reporters JSONB DEFAULT '[]'::jsonb; + RAISE NOTICE '✅ issues.duplicate_reporters 컬럼이 추가되었습니다.'; + ELSE + RAISE NOTICE 'ℹ️ issues.duplicate_reporters 컬럼이 이미 존재합니다.'; + END IF; + + -- 외래 키 제약 조건 추가 (duplicate_of_issue_id) + IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'issues_duplicate_of_issue_id_fkey') THEN + ALTER TABLE issues ADD CONSTRAINT issues_duplicate_of_issue_id_fkey + FOREIGN KEY (duplicate_of_issue_id) REFERENCES issues(id); + RAISE NOTICE '✅ issues_duplicate_of_issue_id_fkey 외래 키 제약 조건이 추가되었습니다.'; + ELSE + RAISE NOTICE 'ℹ️ issues_duplicate_of_issue_id_fkey 외래 키 제약 조건이 이미 존재합니다.'; + END IF; + + -- 인덱스 추가 + IF NOT EXISTS (SELECT 1 FROM pg_indexes WHERE tablename = 'issues' AND indexname = 'idx_issues_duplicate_of') THEN + CREATE INDEX idx_issues_duplicate_of ON issues (duplicate_of_issue_id) WHERE duplicate_of_issue_id IS NOT NULL; + RAISE NOTICE '✅ idx_issues_duplicate_of 인덱스가 생성되었습니다.'; + ELSE + RAISE NOTICE 'ℹ️ idx_issues_duplicate_of 인덱스가 이미 존재합니다.'; + END IF; + + -- JSONB 인덱스 추가 (중복 신고자 검색 성능 향상) + IF NOT EXISTS (SELECT 1 FROM pg_indexes WHERE tablename = 'issues' AND indexname = 'idx_issues_duplicate_reporters_gin') THEN + CREATE INDEX idx_issues_duplicate_reporters_gin ON issues USING GIN (duplicate_reporters); + RAISE NOTICE '✅ idx_issues_duplicate_reporters_gin 인덱스가 생성되었습니다.'; + ELSE + RAISE NOTICE 'ℹ️ idx_issues_duplicate_reporters_gin 인덱스가 이미 존재합니다.'; + END IF; + + -- 마이그레이션 검증 + DECLARE + col_count INTEGER; + idx_count INTEGER; + fk_count INTEGER; + BEGIN + SELECT COUNT(*) INTO col_count FROM information_schema.columns WHERE table_name = 'issues' AND column_name IN ('duplicate_of_issue_id', 'duplicate_reporters'); + SELECT COUNT(*) INTO idx_count FROM pg_indexes WHERE tablename = 'issues' AND indexname IN ('idx_issues_duplicate_of', 'idx_issues_duplicate_reporters_gin'); + SELECT COUNT(*) INTO fk_count FROM pg_constraint WHERE conname = 'issues_duplicate_of_issue_id_fkey'; + + RAISE NOTICE '=== 마이그레이션 검증 결과 ==='; + RAISE NOTICE '추가된 컬럼: %/2개', col_count; + RAISE NOTICE '생성된 인덱스: %/2개', idx_count; + RAISE NOTICE '생성된 FK: %/1개', fk_count; + + IF col_count = 2 AND idx_count = 2 AND fk_count = 1 THEN + RAISE NOTICE '✅ 마이그레이션이 성공적으로 완료되었습니다!'; + INSERT INTO migration_log (migration_file, status, notes) VALUES (migration_name, 'SUCCESS', migration_notes); + ELSE + RAISE EXCEPTION '❌ 마이그레이션 검증 실패!'; + END IF; + END; + + ELSIF current_status = 'SUCCESS' THEN + RAISE NOTICE 'ℹ️ 마이그레이션 %는 이미 성공적으로 실행되었습니다. 스킵합니다.', migration_name; + ELSE + RAISE NOTICE '⚠️ 마이그레이션 %는 이전에 실패했습니다. 수동 확인이 필요합니다.', migration_name; + END IF; +END $$; + +COMMIT; diff --git a/backend/routers/__pycache__/inbox.cpython-311.pyc b/backend/routers/__pycache__/inbox.cpython-311.pyc index e53ad54..0794dd7 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/inbox.py b/backend/routers/inbox.py index b2fab5c..b57be18 100644 --- a/backend/routers/inbox.py +++ b/backend/routers/inbox.py @@ -70,6 +70,32 @@ async def dispose_issue( "preserved_at": datetime.now().isoformat() } + # 중복 처리 로직 + if disposal_request.disposal_reason == DisposalReasonType.duplicate and disposal_request.duplicate_of_issue_id: + # 중복 대상 이슈 확인 + target_issue = db.query(Issue).filter(Issue.id == disposal_request.duplicate_of_issue_id).first() + if not target_issue: + raise HTTPException(status_code=404, detail="중복 대상 이슈를 찾을 수 없습니다.") + + # 중복 신고자를 대상 이슈에 추가 + current_reporters = target_issue.duplicate_reporters or [] + new_reporter = { + "user_id": issue.reporter_id, + "username": issue.reporter.username, + "full_name": issue.reporter.full_name, + "report_date": issue.report_date.isoformat() if issue.report_date else None, + "added_at": datetime.now().isoformat() + } + + # 중복 체크 (이미 추가된 신고자인지 확인) + existing_reporter = next((r for r in current_reporters if r.get("user_id") == issue.reporter_id), None) + if not existing_reporter: + current_reporters.append(new_reporter) + target_issue.duplicate_reporters = current_reporters + + # 현재 이슈에 중복 대상 설정 + issue.duplicate_of_issue_id = disposal_request.duplicate_of_issue_id + # 폐기 처리 issue.review_status = ReviewStatus.disposed issue.disposal_reason = disposal_request.disposal_reason @@ -303,3 +329,38 @@ async def get_inbox_statistics( "total_in_management": management_count, "total_issues": db.query(Issue).count() } + +@router.get("/management-issues") +async def get_management_issues( + project_id: Optional[int] = None, + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db) +): + """관리함 이슈 목록 조회 (중복 선택용)""" + try: + query = db.query(Issue).filter( + Issue.review_status.in_([ReviewStatus.in_progress, ReviewStatus.completed]) + ) + + # 프로젝트 필터 적용 + if project_id: + query = query.filter(Issue.project_id == project_id) + + issues = query.order_by(Issue.reviewed_at.desc()).limit(50).all() + + # 간단한 형태로 반환 (제목과 ID만) + result = [] + for issue in issues: + result.append({ + "id": issue.id, + "description": issue.description[:100] + "..." if len(issue.description) > 100 else issue.description, + "category": issue.category.value, + "reporter_name": issue.reporter.full_name or issue.reporter.username, + "reviewed_at": issue.reviewed_at.isoformat() if issue.reviewed_at else None, + "duplicate_count": len(issue.duplicate_reporters) if issue.duplicate_reporters else 0 + }) + + return result + + except Exception as e: + raise HTTPException(status_code=500, detail=f"관리함 이슈 조회 중 오류가 발생했습니다: {str(e)}") diff --git a/frontend/issues-inbox.html b/frontend/issues-inbox.html index 0158f61..e4ba2b0 100644 --- a/frontend/issues-inbox.html +++ b/frontend/issues-inbox.html @@ -293,7 +293,7 @@
- @@ -308,6 +308,20 @@ placeholder="폐기 사유를 입력하세요...">
+ +
+ +

동일 프로젝트의 관리함에 있는 이슈 중 중복 대상을 선택하세요:

+ +
+
+ 관리함 이슈를 불러오는 중... +
+
+ + +
+