app&appversion&flowhistory&role&permission

backend/app/db/models.py

@@ -1,8 +1,8 @@
-from sqlalchemy import Boolean, Column, Integer, String, DateTime,ForeignKey
+from sqlalchemy import Boolean, Column, Integer, String, DateTime,ForeignKey,Table
 from sqlalchemy.ext.declarative import as_declarative
 from sqlalchemy.orm import relationship
 from datetime import datetime
-
+from app.db.session import Base
 from app.core.security import chacha20Decrypt
 
 @as_declarative()
@@ -11,6 +11,21 @@ class Base:
     create_time = Column(DateTime, default=datetime.now)
     update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now)
 
+
+userrole = Table(
+    "userrole",
+    Base.metadata,
+    Column("userid",Integer,ForeignKey("user.id")),
+    Column("roleid",Integer,ForeignKey("role.id")),
+)
+
+rolepermission = Table(
+    "rolepermission",
+    Base.metadata,
+    Column("roleid",Integer,ForeignKey("role.id")),
+    Column("permissionid",Integer,ForeignKey("permission.id")),
+)
+
 class User(Base):
     __tablename__ = "user"
 
@@ -20,6 +35,25 @@ class User(Base):
     hashed_password = Column(String(200), nullable=False)
     is_active = Column(Boolean, default=True)
     is_superuser = Column(Boolean, default=False)
+    roles = relationship("Role",secondary=userrole,back_populates="users")
+
+
+class Role(Base):
+    __tablename__ = "role"
+
+    name = Column(String(100))
+    description = Column(String(255))
+    users = relationship("User",secondary=userrole,back_populates="roles")
+    permissions = relationship("Permission",secondary=rolepermission,back_populates="roles")
+
+class Permission(Base):
+    __tablename__ = "permission"
+
+    menu = Column(String(100))
+    function = Column(String(255))
+    privilege = Column(String(100))
+    roles = relationship("Role",secondary=rolepermission,back_populates="permissions")
+
 
 class App(Base):
     __tablename__ = "app"
@@ -28,8 +62,25 @@ class App(Base):
     appname = Column(String(200), nullable=False)
     appid = Column(String(100), index=True, nullable=False)
     version = Column(Integer)
-    updateuser = Column(Integer,ForeignKey("user.id"))
-    user = relationship('User')
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+
+class AppVersion(Base):
+    __tablename__ = "appversion"
+
+    domainurl = Column(String(200), nullable=False) 
+    appname = Column(String(200), nullable=False)
+    appid = Column(String(100), index=True, nullable=False)
+    version = Column(Integer)
+    versionname = Column(String(200), nullable=False)
+    comment = Column(String(200), nullable=False)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
+
 
 class AppSetting(Base):
     __tablename__ = "appsetting"
@@ -64,7 +115,11 @@ class Flow(Base):
     eventid = Column(String(100), index=True, nullable=False)
     domainurl = Column(String(200)) 
     name = Column(String(200))   
-    content = Column(String)  
+    content = Column(String) 
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
 
 class FlowHistory(Base):
     __tablename__ = "flowhistory"
@@ -75,8 +130,11 @@ class FlowHistory(Base):
     domainurl = Column(String(200)) 
     name = Column(String(200))   
     content = Column(String)  
-    createuser = Column(Integer,ForeignKey("user.id"))
     version = Column(Integer)
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
 
 class Tenant(Base):
     __tablename__ = "tenant"
@@ -98,7 +156,10 @@ class Domain(Base):
     def decrypt_kintonepwd(self):
         decrypted_pwd = chacha20Decrypt(self.kintonepwd)
         return decrypted_pwd
-
+    createuserid = Column(Integer,ForeignKey("user.id"))
+    updateuserid = Column(Integer,ForeignKey("user.id"))
+    createuser = relationship('User',foreign_keys=[createuserid]) 
+    updateuser = relationship('User',foreign_keys=[updateuserid]) 
 
 class UserDomain(Base):
     __tablename__ = "userdomain"