Sfoglia il codice sorgente

modified user model

tomoya 2 anni fa
parent
commit
787ed261e3

+ 0 - 1
backend/app/app/db/base.py

@@ -1,7 +1,6 @@
 # Import all the models, so that Base has them before being
 # imported by Alembic
 from app.db.base_class import Base  # noqa
-from app.models.item import Item  # noqa
 from app.models.user import User  # noqa
 from app.models.video import Video
 from app.models.enum import Progress, Membership

+ 0 - 1
backend/app/app/models/__init__.py

@@ -1,4 +1,3 @@
-from .item import Item
 from .user import User
 from .video import Video
 from .enum import Membership, Progress

+ 0 - 17
backend/app/app/models/item.py

@@ -1,17 +0,0 @@
-from typing import TYPE_CHECKING
-
-from sqlalchemy import Column, ForeignKey, Integer, String, Text
-from sqlalchemy.orm import relationship
-
-from app.db.base_class import Base
-
-if TYPE_CHECKING:
-    from .user import User  # noqa: F401
-
-
-class Item(Base):
-    id = Column(Integer, primary_key=True, index=True)
-    title = Column(String(30), index=True)
-    description = Column(Text)
-    owner_id = Column(Integer, ForeignKey("user.id"))
-    owner = relationship("User", back_populates="items")

+ 0 - 1
backend/app/app/models/user.py

@@ -20,5 +20,4 @@ class User(Base):
   available_time = Column(Integer, default=0)
   is_active = Column(Boolean(), default=True)
   is_superuser = Column(Boolean(), default=False)
-  items = relationship("Item", back_populates="owner")
   videos = relationship("Video", back_populates="owner")

+ 1 - 0
backend/app/app/models/video.py

@@ -17,5 +17,6 @@ class Video(Base):
   progress_state = Column(String(10), 
                     ForeignKey("progress.state", ondelete="RESTRICT", onupdate="CASCADE"),
                     default="waiting")
+  time = Column(Integer)
   owner_id = Column(Integer, ForeignKey("user.id"))
   owner = relationship("User", back_populates="videos")