Merge branch 'main' into develop/0.2.0

kontor-scripts/json_to_mariadb.py

@@ -1,5 +1,5 @@
 """
-copy data from SQLite to MariaDB
+copy data from JSON to MariaDB
 """
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
 from pathlib import Path

kontor-scripts/schema/admin.py

@@ -7,15 +7,15 @@ from sqlalchemy.orm import relationship, mapped_column, Mapped
 from .base import Base, BaseMixin
 
 
-class User(Base, BaseMixin):
-    __tablename__ = 'user'
+class Profile(Base, BaseMixin):
+    __tablename__ = 'profile'
     first_name = Column(String(255))
     last_name = Column(String(255))
     user_name = Column(String(255), nullable=False)
     email = Column(String(255))
     password = Column(String(255))
     enabled = Column(BIT(1))
-    matrix = relationship("AuthorizationMatrix")
+    assignments = relationship("Assignment")
     tokens = relationship("Token")
 
     def get_full_name(self) -> str:
@@ -35,22 +35,22 @@ class Token(Base, BaseMixin):
     name = Column(String(255))
     last_used_date: Mapped[datetime] = mapped_column()
     enabled = Column(BIT(1))
-    user_id = Column(String(255), ForeignKey("user.id"), nullable=False)
-    user = relationship("User", back_populates="tokens")
+    profile_id = Column(String(255), ForeignKey("profile.id"), nullable=False)
+    profile = relationship("Profile", back_populates="tokens")
 
 
-class Role(Base, BaseMixin):
-    __tablename__ = "role"
+class Permission(Base, BaseMixin):
+    __tablename__ = "permission"
     name = Column(String(255), nullable=False)
-    matrix = relationship("AuthorizationMatrix")
+    assignments = relationship("Assignment")
 
 
-class AuthorizationMatrix(Base, BaseMixin):
-    __tablename__ = "authorization_matrix"
-    user_id = Column(String, ForeignKey("user.id"), nullable=False)
-    user = relationship("User", back_populates="matrix")
-    role_id = Column(String, ForeignKey("role.id"), nullable=False)
-    role = relationship("Role", back_populates="matrix")
+class Assignment(Base, BaseMixin):
+    __tablename__ = "assignment"
+    profile_id = Column(String, ForeignKey("profile.id"), nullable=False)
+    profile = relationship("Profile", back_populates="assignments")
+    permission_id = Column(String, ForeignKey("permission.id"), nullable=False)
+    permission = relationship("Permission", back_populates="assignments")
 
 
 class ModuleData(Base, BaseMixin):

kontor-scripts/schema/database.py

@@ -13,7 +13,7 @@ from sqlalchemy.orm import sessionmaker
 from .tysc import Card, CardSet, Rooster, Team, FieldPosition, Player, Vendor, Sport
 from .comic import Issue, TradePaperback, StoryArc, Volume, ComicWork, Artist, Comic, Publisher, WorkType
 from .bookshelf import ArticleAuthor, BookAuthor, BookshelfPublisher, Article, Book, Author
-from .admin import Mail, MailAccount, ModuleData, Role, User, Token, AuthorizationMatrix
+from .admin import Mail, MailAccount, ModuleData, Permission, Profile, Token, Assignment
 from .metadata import MetaDataTable, MetaDataColumn
 from .media import MediaVideo, MediaArticle, MediaFile, MediaActor, MediaActorFile
 
@@ -81,10 +81,10 @@ class KontorDB:
         self.registry[MediaVideo.__tablename__] = MediaVideo
         self.registry[MetaDataColumn.__tablename__] = MetaDataColumn
         self.registry[MetaDataTable.__tablename__] = MetaDataTable
-        self.registry[AuthorizationMatrix.__tablename__] = AuthorizationMatrix
+        self.registry[Assignment.__tablename__] = Assignment
         self.registry[Token.__tablename__] = Token
-        self.registry[User.__tablename__] = User
-        self.registry[Role.__tablename__] = Role
+        self.registry[Profile.__tablename__] = Profile
+        self.registry[Permission.__tablename__] = Permission
         self.registry[ModuleData.__tablename__] = ModuleData
         self.registry[MailAccount.__tablename__] = MailAccount
         self.registry[Mail.__tablename__] = Mail