5fe51ab1d5
- localStorage와 DB ID 불일치 문제 해결 - 프로젝트별 보고서 시간 필터링 수정 - 일반 사용자에게 일일공수 메뉴 숨김 - 공통 헤더 및 인증 시스템 구현 - 프로젝트별 일일공수 분리 기능 추가 (ProjectDailyWork 모델) - IssuesAPI에서 project_id 누락 문제 수정 - 사용자 인증 통합 (TokenManager 기반)
110 lines
4.0 KiB
Python
110 lines
4.0 KiB
Python
from sqlalchemy import Column, Integer, BigInteger, String, DateTime, Float, Boolean, Text, ForeignKey, Enum
|
|
from sqlalchemy.ext.declarative import declarative_base
|
|
from sqlalchemy.orm import relationship
|
|
from datetime import datetime, timezone, timedelta
|
|
import enum
|
|
|
|
# 한국 시간대 설정
|
|
KST = timezone(timedelta(hours=9))
|
|
|
|
def get_kst_now():
|
|
"""현재 한국 시간 반환"""
|
|
return datetime.now(KST)
|
|
|
|
Base = declarative_base()
|
|
|
|
class UserRole(str, enum.Enum):
|
|
admin = "admin"
|
|
user = "user"
|
|
|
|
class IssueStatus(str, enum.Enum):
|
|
new = "new"
|
|
progress = "progress"
|
|
complete = "complete"
|
|
|
|
class IssueCategory(str, enum.Enum):
|
|
material_missing = "material_missing"
|
|
design_error = "design_error" # 설계미스 (기존 dimension_defect 대체)
|
|
incoming_defect = "incoming_defect"
|
|
inspection_miss = "inspection_miss" # 검사미스 (신규 추가)
|
|
|
|
class User(Base):
|
|
__tablename__ = "users"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
username = Column(String, unique=True, index=True, nullable=False)
|
|
hashed_password = Column(String, nullable=False)
|
|
full_name = Column(String)
|
|
role = Column(Enum(UserRole), default=UserRole.user)
|
|
is_active = Column(Boolean, default=True)
|
|
created_at = Column(DateTime, default=get_kst_now)
|
|
|
|
# Relationships
|
|
issues = relationship("Issue", back_populates="reporter")
|
|
daily_works = relationship("DailyWork", back_populates="created_by")
|
|
projects = relationship("Project", back_populates="created_by")
|
|
|
|
class Issue(Base):
|
|
__tablename__ = "issues"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
photo_path = Column(String)
|
|
photo_path2 = Column(String) # 두 번째 사진 경로
|
|
category = Column(Enum(IssueCategory), nullable=False)
|
|
description = Column(Text, nullable=False)
|
|
status = Column(Enum(IssueStatus), default=IssueStatus.new)
|
|
reporter_id = Column(Integer, ForeignKey("users.id"))
|
|
project_id = Column(BigInteger, ForeignKey("projects.id"))
|
|
report_date = Column(DateTime, default=get_kst_now)
|
|
work_hours = Column(Float, default=0)
|
|
detail_notes = Column(Text)
|
|
|
|
# Relationships
|
|
reporter = relationship("User", back_populates="issues")
|
|
project = relationship("Project", back_populates="issues")
|
|
|
|
class Project(Base):
|
|
__tablename__ = "projects"
|
|
|
|
id = Column(BigInteger, primary_key=True, index=True)
|
|
job_no = Column(String, unique=True, nullable=False, index=True)
|
|
project_name = Column(String, nullable=False)
|
|
created_by_id = Column(Integer, ForeignKey("users.id"))
|
|
created_at = Column(DateTime, default=get_kst_now)
|
|
is_active = Column(Boolean, default=True)
|
|
|
|
# Relationships
|
|
created_by = relationship("User", back_populates="projects")
|
|
issues = relationship("Issue", back_populates="project")
|
|
|
|
class DailyWork(Base):
|
|
__tablename__ = "daily_works"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
date = Column(DateTime, nullable=False, index=True)
|
|
worker_count = Column(Integer, nullable=False)
|
|
regular_hours = Column(Float, nullable=False)
|
|
overtime_workers = Column(Integer, default=0)
|
|
overtime_hours = Column(Float, default=0)
|
|
overtime_total = Column(Float, default=0)
|
|
total_hours = Column(Float, nullable=False)
|
|
created_by_id = Column(Integer, ForeignKey("users.id"))
|
|
created_at = Column(DateTime, default=get_kst_now)
|
|
|
|
# Relationships
|
|
created_by = relationship("User", back_populates="daily_works")
|
|
|
|
class ProjectDailyWork(Base):
|
|
__tablename__ = "project_daily_works"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
date = Column(DateTime, nullable=False, index=True)
|
|
project_id = Column(BigInteger, ForeignKey("projects.id"), nullable=False)
|
|
hours = Column(Float, nullable=False)
|
|
created_by_id = Column(Integer, ForeignKey("users.id"))
|
|
created_at = Column(DateTime, default=get_kst_now)
|
|
|
|
# Relationships
|
|
project = relationship("Project")
|
|
created_by = relationship("User")
|