update configuration docker setup for data platform
This commit is contained in:
7
03-apiservice/app/models/__init__.py
Normal file
7
03-apiservice/app/models/__init__.py
Normal file
@@ -0,0 +1,7 @@
|
||||
"""
|
||||
Database models package
|
||||
"""
|
||||
from app.models.user import User, Role
|
||||
from app.models.upload import UploadHistory
|
||||
|
||||
__all__ = ["User", "Role", "UploadHistory"]
|
||||
33
03-apiservice/app/models/upload.py
Normal file
33
03-apiservice/app/models/upload.py
Normal file
@@ -0,0 +1,33 @@
|
||||
"""
|
||||
Upload History model for tracking file uploads
|
||||
"""
|
||||
from sqlalchemy import Column, Integer, String, DateTime, Text
|
||||
from sqlalchemy.sql import func
|
||||
from app.db.base import Base
|
||||
|
||||
|
||||
class UploadHistory(Base):
|
||||
"""
|
||||
Upload history tracking
|
||||
Stores information about uploaded files and their processing status
|
||||
"""
|
||||
__tablename__ = "upload_history"
|
||||
__table_args__ = {'schema': 'fastapi'}
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
upload_id = Column(String, unique=True, index=True, nullable=False)
|
||||
filename = Column(String, nullable=False)
|
||||
filepath = Column(String, nullable=False)
|
||||
description = Column(Text)
|
||||
status = Column(String, default="pending")
|
||||
job_id = Column(String)
|
||||
logs = Column(Text)
|
||||
uploaded_by = Column(String)
|
||||
uploaded_at = Column(DateTime(timezone=True), server_default=func.now(), nullable=False)
|
||||
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
||||
|
||||
airflow_dag_run_id = Column(String)
|
||||
airflow_state = Column(String)
|
||||
processing_started_at = Column(DateTime(timezone=True))
|
||||
processing_completed_at = Column(DateTime(timezone=True))
|
||||
error_message = Column(Text)
|
||||
55
03-apiservice/app/models/user.py
Normal file
55
03-apiservice/app/models/user.py
Normal file
@@ -0,0 +1,55 @@
|
||||
"""
|
||||
User and Role models for local user management
|
||||
Note: This is separate from Keycloak users - used for tracking and audit
|
||||
"""
|
||||
from sqlalchemy import Column, Integer, String, Boolean, DateTime, Table, ForeignKey
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.sql import func
|
||||
from app.db.base import Base
|
||||
|
||||
# Association table for many-to-many relationship
|
||||
user_roles = Table(
|
||||
'user_roles',
|
||||
Base.metadata,
|
||||
Column('user_id', Integer, ForeignKey('fastapi.users.id'), primary_key=True),
|
||||
Column('role_id', Integer, ForeignKey('fastapi.roles.id'), primary_key=True),
|
||||
schema='fastapi'
|
||||
)
|
||||
|
||||
|
||||
class User(Base):
|
||||
"""
|
||||
Local user record (synced from Keycloak)
|
||||
Used for tracking, audit, and local permissions
|
||||
"""
|
||||
__tablename__ = "users"
|
||||
__table_args__ = {'schema': 'fastapi'}
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
keycloak_id = Column(String, unique=True, index=True, nullable=False) # Keycloak sub
|
||||
username = Column(String, unique=True, index=True, nullable=False)
|
||||
email = Column(String, unique=True, index=True)
|
||||
full_name = Column(String)
|
||||
is_active = Column(Boolean, default=True)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
||||
last_login = Column(DateTime(timezone=True))
|
||||
|
||||
# Relationships
|
||||
roles = relationship("Role", secondary=user_roles, back_populates="users")
|
||||
|
||||
|
||||
class Role(Base):
|
||||
"""
|
||||
Roles (synced from Keycloak)
|
||||
"""
|
||||
__tablename__ = "roles"
|
||||
__table_args__ = {'schema': 'fastapi'}
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
name = Column(String, unique=True, nullable=False, index=True) # admin, operation
|
||||
description = Column(String)
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
|
||||
# Relationships
|
||||
users = relationship("User", secondary=user_roles, back_populates="roles")
|
||||
Reference in New Issue
Block a user