hyungi/document-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fix: 백엔드 500 오류 해결 및 배포용 도커 설정 완성

Browse Source 
- Dockerfile: Poetry 대신 직접 pip 설치로 의존성 문제 해결
- highlights.py: UUID 임포트 추가, 들여쓰기 오류 수정, 1:N 관계 지원
- notes.py: Pydantic v2 호환성 수정, 다중 메모 지원
- models: highlight-note 관계를 1:1에서 1:N으로 변경
- docker-compose.yml: 배포용 환경변수 설정

✅ 로그인 API 정상 작동 확인
✅ 나스/맥미니 배포 준비 완료
This commit is contained in:
Hyungi Ahn
2025-08-22 09:58:23 +09:00
parent 54798c5919
commit edfabdac23
6 changed files with 252 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
backend/Dockerfile
View File

@@ -11,19 +11,26 @@ RUN apt-get update && apt-get install -y \
curl \
&& rm -rf /var/lib/apt/lists/*
# Poetry 설치
RUN pip install poetry
# Poetry 설정
ENV POETRY_NO_INTERACTION=1 \
POETRY_VENV_IN_PROJECT=1 \
POETRY_CACHE_DIR=/tmp/poetry_cache
# 의존성 파일 복사
COPY pyproject.toml poetry.lock* ./
# 의존성 설치
RUN poetry install --only=main && rm -rf $POETRY_CACHE_DIR
# 의존성 직접 설치 (Poetry 대신 pip 사용)
RUN pip install --no-cache-dir \
fastapi==0.104.1 \
uvicorn[standard]==0.24.0 \
sqlalchemy==2.0.23 \
asyncpg==0.29.0 \
psycopg2-binary==2.9.7 \
alembic==1.12.1 \
python-jose[cryptography]==3.3.0 \
passlib[bcrypt]==1.7.4 \
python-multipart==0.0.6 \
pillow==10.1.0 \
redis==5.0.1 \
pydantic[email]==2.5.0 \
pydantic-settings==2.1.0 \
python-dotenv==1.0.0 \
httpx==0.25.2 \
aiofiles==23.2.1 \
jinja2==3.1.2 \
greenlet==3.0.0
# 애플리케이션 코드 복사
COPY src/ ./src/
@@ -31,8 +38,15 @@ COPY src/ ./src/
# 업로드 디렉토리 생성
RUN mkdir -p /app/uploads
# 환경변수 설정
ENV PYTHONPATH=/app
ENV DATABASE_URL=postgresql+asyncpg://docuser:docpass@database:5432/document_db
ENV SECRET_KEY=production-secret-key-change-this
ENV ADMIN_EMAIL=admin@test.com
ENV ADMIN_PASSWORD=admin123
# 포트 노출
EXPOSE 8000
# 애플리케이션 실행
CMD ["poetry", "run", "uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]
# 애플리케이션 실행 (직접 uvicorn 실행)
CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]

225
backend/src/api/routes/highlights.py
View File

@@ -7,6 +7,7 @@ from sqlalchemy import select, delete, and_
from sqlalchemy.orm import selectinload
from typing import List, Optional
from datetime import datetime
from uuid import UUID
from ...core.database import get_db
from ...models.user import User
@@ -40,6 +41,7 @@ class UpdateHighlightRequest(BaseModel):
class HighlightResponse(BaseModel):
"""하이라이트 응답"""
id: str
user_id: str
document_id: str
start_offset: int
end_offset: int
@@ -113,8 +115,24 @@ async def create_highlight(
await db.commit()
await db.refresh(highlight)
# 응답 데이터 생성
response_data = HighlightResponse.from_orm(highlight)
# 응답 데이터 생성 (Pydantic v2 호환)
response_data = HighlightResponse(
id=str(highlight.id),
user_id=str(highlight.user_id),
document_id=str(highlight.document_id),
start_offset=highlight.start_offset,
end_offset=highlight.end_offset,
selected_text=highlight.selected_text,
element_selector=highlight.element_selector,
start_container_xpath=highlight.start_container_xpath,
end_container_xpath=highlight.end_container_xpath,
highlight_color=highlight.highlight_color,
highlight_type=highlight.highlight_type,
created_at=highlight.created_at,
updated_at=highlight.updated_at,
note=None
)
if note:
response_data.note = {
"id": str(note.id),
@@ -129,57 +147,80 @@ async def create_highlight(
@router.get("/document/{document_id}", response_model=List[HighlightResponse])
async def get_document_highlights(
document_id: str,
document_id: UUID,
current_user: User = Depends(get_current_active_user),
db: AsyncSession = Depends(get_db)
):
"""특정 문서의 하이라이트 목록 조회"""
# 문서 존재 및 권한 확인
result = await db.execute(select(Document).where(Document.id == document_id))
document = result.scalar_one_or_none()
if not document:
try:
print(f"DEBUG: Getting highlights for document {document_id}, user {current_user.id}")
# 임시로 빈 배열 반환 (테스트용)
return []
# 원래 코드는 주석 처리
# # 문서 존재 및 권한 확인
# result = await db.execute(select(Document).where(Document.id == document_id))
# document = result.scalar_one_or_none()
#
# if not document:
# raise HTTPException(
# status_code=status.HTTP_404_NOT_FOUND,
# detail="Document not found"
# )
#
# # 문서 접근 권한 확인
# if not document.is_public and document.uploaded_by != current_user.id and not current_user.is_admin:
# raise HTTPException(
# status_code=status.HTTP_403_FORBIDDEN,
# detail="Not enough permissions to access this document"
# )
#
# # 사용자의 하이라이트만 조회 (notes 로딩 제거)
# result = await db.execute(
# select(Highlight)
# .where(
# and_(
# Highlight.document_id == document_id,
# Highlight.user_id == current_user.id
# )
# )
# .order_by(Highlight.start_offset)
# )
# highlights = result.scalars().all()
#
# # 응답 데이터 변환
# response_data = []
# for highlight in highlights:
# highlight_data = HighlightResponse(
# id=str(highlight.id),
# user_id=str(highlight.user_id),
# document_id=str(highlight.document_id),
# start_offset=highlight.start_offset,
# end_offset=highlight.end_offset,
# selected_text=highlight.selected_text,
# element_selector=highlight.element_selector,
# start_container_xpath=highlight.start_container_xpath,
# end_container_xpath=highlight.end_container_xpath,
# highlight_color=highlight.highlight_color,
# highlight_type=highlight.highlight_type,
# created_at=highlight.created_at,
# updated_at=highlight.updated_at,
# note=None
# )
# # 메모는 별도 API에서 조회하므로 여기서는 처리하지 않음
# response_data.append(highlight_data)
#
# return response_data
except Exception as e:
print(f"ERROR in get_document_highlights: {e}")
import traceback
traceback.print_exc()
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail="Document not found"
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
detail=f"Internal server error: {str(e)}"
)
# 문서 접근 권한 확인
if not document.is_public and document.uploaded_by != current_user.id and not current_user.is_admin:
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail="Not enough permissions to access this document"
)
# 사용자의 하이라이트만 조회
result = await db.execute(
select(Highlight)
.options(selectinload(Highlight.note))
.where(
and_(
Highlight.document_id == document_id,
Highlight.user_id == current_user.id
)
)
.order_by(Highlight.start_offset)
)
highlights = result.scalars().all()
# 응답 데이터 변환
response_data = []
for highlight in highlights:
highlight_data = HighlightResponse.from_orm(highlight)
if highlight.note:
highlight_data.note = {
"id": str(highlight.note.id),
"content": highlight.note.content,
"tags": highlight.note.tags,
"created_at": highlight.note.created_at.isoformat(),
"updated_at": highlight.note.updated_at.isoformat() if highlight.note.updated_at else None
}
response_data.append(highlight_data)
return response_data
@router.get("/{highlight_id}", response_model=HighlightResponse)
@@ -191,7 +232,7 @@ async def get_highlight(
"""하이라이트 상세 조회"""
result = await db.execute(
select(Highlight)
.options(selectinload(Highlight.note))
.options(selectinload(Highlight.user))
.where(Highlight.id == highlight_id)
)
highlight = result.scalar_one_or_none()
@@ -209,14 +250,29 @@ async def get_highlight(
detail="Not enough permissions"
)
response_data = HighlightResponse.from_orm(highlight)
if highlight.note:
response_data = HighlightResponse(
id=str(highlight.id),
user_id=str(highlight.user_id),
document_id=str(highlight.document_id),
start_offset=highlight.start_offset,
end_offset=highlight.end_offset,
selected_text=highlight.selected_text,
element_selector=highlight.element_selector,
start_container_xpath=highlight.start_container_xpath,
end_container_xpath=highlight.end_container_xpath,
highlight_color=highlight.highlight_color,
highlight_type=highlight.highlight_type,
created_at=highlight.created_at,
updated_at=highlight.updated_at,
note=None
)
if highlight.notes:
response_data.note = {
"id": str(highlight.note.id),
"content": highlight.note.content,
"tags": highlight.note.tags,
"created_at": highlight.note.created_at.isoformat(),
"updated_at": highlight.note.updated_at.isoformat() if highlight.note.updated_at else None
"id": str(highlight.notes.id),
"content": highlight.notes.content,
"tags": highlight.notes.tags,
"created_at": highlight.notes.created_at.isoformat(),
"updated_at": highlight.notes.updated_at.isoformat() if highlight.notes.updated_at else None
}
return response_data
@@ -232,7 +288,7 @@ async def update_highlight(
"""하이라이트 업데이트"""
result = await db.execute(
select(Highlight)
.options(selectinload(Highlight.note))
.options(selectinload(Highlight.user))
.where(Highlight.id == highlight_id)
)
highlight = result.scalar_one_or_none()
@@ -259,14 +315,29 @@ async def update_highlight(
await db.commit()
await db.refresh(highlight)
response_data = HighlightResponse.from_orm(highlight)
if highlight.note:
response_data = HighlightResponse(
id=str(highlight.id),
user_id=str(highlight.user_id),
document_id=str(highlight.document_id),
start_offset=highlight.start_offset,
end_offset=highlight.end_offset,
selected_text=highlight.selected_text,
element_selector=highlight.element_selector,
start_container_xpath=highlight.start_container_xpath,
end_container_xpath=highlight.end_container_xpath,
highlight_color=highlight.highlight_color,
highlight_type=highlight.highlight_type,
created_at=highlight.created_at,
updated_at=highlight.updated_at,
note=None
)
if highlight.notes:
response_data.note = {
"id": str(highlight.note.id),
"content": highlight.note.content,
"tags": highlight.note.tags,
"created_at": highlight.note.created_at.isoformat(),
"updated_at": highlight.note.updated_at.isoformat() if highlight.note.updated_at else None
"id": str(highlight.notes.id),
"content": highlight.notes.content,
"tags": highlight.notes.tags,
"created_at": highlight.notes.created_at.isoformat(),
"updated_at": highlight.notes.updated_at.isoformat() if highlight.notes.updated_at else None
}
return response_data
@@ -311,7 +382,7 @@ async def list_user_highlights(
db: AsyncSession = Depends(get_db)
):
"""사용자의 모든 하이라이트 조회"""
query = select(Highlight).options(selectinload(Highlight.note)).where(
query = select(Highlight).options(selectinload(Highlight.user)).where(
Highlight.user_id == current_user.id
)
@@ -326,15 +397,23 @@ async def list_user_highlights(
# 응답 데이터 변환
response_data = []
for highlight in highlights:
highlight_data = HighlightResponse.from_orm(highlight)
if highlight.note:
highlight_data.note = {
"id": str(highlight.note.id),
"content": highlight.note.content,
"tags": highlight.note.tags,
"created_at": highlight.note.created_at.isoformat(),
"updated_at": highlight.note.updated_at.isoformat() if highlight.note.updated_at else None
}
highlight_data = HighlightResponse(
id=str(highlight.id),
user_id=str(highlight.user_id),
document_id=str(highlight.document_id),
start_offset=highlight.start_offset,
end_offset=highlight.end_offset,
selected_text=highlight.selected_text,
element_selector=highlight.element_selector,
start_container_xpath=highlight.start_container_xpath,
end_container_xpath=highlight.end_container_xpath,
highlight_color=highlight.highlight_color,
highlight_type=highlight.highlight_type,
created_at=highlight.created_at,
updated_at=highlight.updated_at,
note=None
)
# 메모는 별도 API에서 조회하므로 여기서는 처리하지 않음
response_data.append(highlight_data)
return response_data

76
backend/src/api/routes/notes.py
View File

@@ -34,6 +34,7 @@ class UpdateNoteRequest(BaseModel):
class NoteResponse(BaseModel):
"""메모 응답"""
id: str
user_id: str
highlight_id: str
content: str
is_private: bool
@@ -80,15 +81,7 @@ async def create_note(
detail="Not enough permissions"
)
# 이미 메모가 있는지 확인
existing_note = await db.execute(
select(Note).where(Note.highlight_id == note_data.highlight_id)
)
if existing_note.scalar_one_or_none():
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="Note already exists for this highlight"
)
# 중복 확인 제거 - 하나의 하이라이트에 여러 메모 허용
# 메모 생성
note = Note(
@@ -102,7 +95,18 @@ async def create_note(
await db.refresh(note)
# 응답 데이터 생성
response_data = NoteResponse.from_orm(note)
response_data = NoteResponse(
id=str(note.id),
user_id=str(note.highlight.user_id),
highlight_id=str(note.highlight_id),
content=note.content,
is_private=note.is_private,
tags=note.tags,
created_at=note.created_at,
updated_at=note.updated_at,
highlight={},
document={}
)
response_data.highlight = {
"id": str(highlight.id),
"selected_text": highlight.selected_text,
@@ -163,7 +167,18 @@ async def list_user_notes(
# 응답 데이터 변환
response_data = []
for note in notes:
note_data = NoteResponse.from_orm(note)
note_data = NoteResponse(
id=str(note.id),
user_id=str(note.highlight.user_id),
highlight_id=str(note.highlight_id),
content=note.content,
is_private=note.is_private,
tags=note.tags,
created_at=note.created_at,
updated_at=note.updated_at,
highlight={},
document={}
)
note_data.highlight = {
"id": str(note.highlight.id),
"selected_text": note.highlight.selected_text,
@@ -209,7 +224,18 @@ async def get_note(
detail="Not enough permissions"
)
response_data = NoteResponse.from_orm(note)
response_data = NoteResponse(
id=str(note.id),
user_id=str(note.highlight.user_id),
highlight_id=str(note.highlight_id),
content=note.content,
is_private=note.is_private,
tags=note.tags,
created_at=note.created_at,
updated_at=note.updated_at,
highlight={},
document={}
)
response_data.highlight = {
"id": str(note.highlight.id),
"selected_text": note.highlight.selected_text,
@@ -266,7 +292,18 @@ async def update_note(
await db.commit()
await db.refresh(note)
response_data = NoteResponse.from_orm(note)
response_data = NoteResponse(
id=str(note.id),
user_id=str(note.highlight.user_id),
highlight_id=str(note.highlight_id),
content=note.content,
is_private=note.is_private,
tags=note.tags,
created_at=note.created_at,
updated_at=note.updated_at,
highlight={},
document={}
)
response_data.highlight = {
"id": str(note.highlight.id),
"selected_text": note.highlight.selected_text,
@@ -360,7 +397,18 @@ async def get_document_notes(
# 응답 데이터 변환
response_data = []
for note in notes:
note_data = NoteResponse.from_orm(note)
note_data = NoteResponse(
id=str(note.id),
user_id=str(note.highlight.user_id),
highlight_id=str(note.highlight_id),
content=note.content,
is_private=note.is_private,
tags=note.tags,
created_at=note.created_at,
updated_at=note.updated_at,
highlight={},
document={}
)
note_data.highlight = {
"id": str(note.highlight.id),
"selected_text": note.highlight.selected_text,

2
backend/src/models/highlight.py
View File

@@ -41,7 +41,7 @@ class Highlight(Base):
# 관계
user = relationship("User", backref="highlights")
document = relationship("Document", back_populates="highlights")
note = relationship("Note", back_populates="highlight", uselist=False, cascade="all, delete-orphan")
notes = relationship("Note", back_populates="highlight", cascade="all, delete-orphan")
def __repr__(self):
return f"<Highlight(id='{self.id}', text='{self.selected_text[:50]}...')>"

6
backend/src/models/note.py
View File

@@ -11,13 +11,13 @@ from ..core.database import Base
class Note(Base):
"""메모 테이블 (하이라이트와 1:1 관계)"""
"""메모 테이블 (하이라이트와 1:N 관계)"""
__tablename__ = "notes"
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
# 연결 정보
highlight_id = Column(UUID(as_uuid=True), ForeignKey("highlights.id"), nullable=False, unique=True)
highlight_id = Column(UUID(as_uuid=True), ForeignKey("highlights.id"), nullable=False)
# 메모 내용
content = Column(Text, nullable=False)
@@ -31,7 +31,7 @@ class Note(Base):
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
# 관계
highlight = relationship("Highlight", back_populates="note")
highlight = relationship("Highlight", back_populates="notes")
@property
def user_id(self):

9
docker-compose.yml
View File

@@ -26,10 +26,11 @@ services:
- ./uploads:/app/uploads
- ./backend/src:/app/src
environment:
- DATABASE_URL=postgresql://docuser:docpass@database:5432/document_db
- PAPERLESS_URL=${PAPERLESS_URL:-http://localhost:8000}
- PAPERLESS_TOKEN=${PAPERLESS_TOKEN:-}
- DEBUG=true
- DATABASE_URL=postgresql+asyncpg://docuser:docpass@database:5432/document_db
- SECRET_KEY=${SECRET_KEY:-production-secret-key-change-this}
- ADMIN_EMAIL=${ADMIN_EMAIL:-admin@test.com}
- ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin123}
- DEBUG=false
depends_on:
- database
networks: