migration, auth, refactoring, formatting

orm/__init__.py

@@ -1,41 +1,29 @@
-from orm.rbac import Operation, Resource, Permission, Role
-from services.auth.roles import RoleStorage
-from orm.community import Community
-from orm.user import User, UserRating
-from orm.topic import Topic, TopicFollower
-from orm.notification import Notification
-from orm.shout import Shout
-from orm.reaction import Reaction
-from services.stat.reacted import ReactedStorage
-from services.zine.topics import TopicStorage
-from services.auth.users import UserStorage
-from services.stat.viewed import ViewedStorage
-from base.orm import Base, engine, local_session
-
-__all__ = [
-    "User",
-    "Role",
-    "Operation",
-    "Permission",
-    "Community",
-    "Shout",
-    "Topic",
-    "TopicFollower",
-    "Notification",
-    "Reaction",
-    "UserRating",
-]
-
-Base.metadata.create_all(engine)
-Operation.init_table()
-Resource.init_table()
-User.init_table()
-Community.init_table()
-Role.init_table()
-
-with local_session() as session:
-    ViewedStorage.init(session)
-    ReactedStorage.init(session)
-    RoleStorage.init(session)
-    UserStorage.init(session)
-    TopicStorage.init(session)
+from base.orm import Base, engine
+from orm.community import Community
+from orm.notification import Notification
+from orm.rbac import Operation, Resource, Permission, Role
+from orm.reaction import Reaction
+from orm.shout import Shout
+from orm.topic import Topic, TopicFollower
+from orm.user import User, UserRating
+
+__all__ = [
+    "User",
+    "Role",
+    "Operation",
+    "Permission",
+    "Community",
+    "Shout",
+    "Topic",
+    "TopicFollower",
+    "Notification",
+    "Reaction",
+    "UserRating",
+]
+
+Base.metadata.create_all(engine)
+Operation.init_table()
+Resource.init_table()
+User.init_table()
+Community.init_table()
+Role.init_table()

orm/collab.py

@@ -1,5 +1,7 @@
 from datetime import datetime
+
 from sqlalchemy import Boolean, Column, String, ForeignKey, DateTime
+
 from base.orm import Base
 
 

orm/collection.py

@@ -1,5 +1,7 @@
 from datetime import datetime
+
 from sqlalchemy import Column, String, ForeignKey, DateTime
+
 from base.orm import Base
 
 

orm/community.py

@@ -1,5 +1,7 @@
 from datetime import datetime
+
 from sqlalchemy import Column, String, ForeignKey, DateTime
+
 from base.orm import Base, local_session
 
 

orm/notification.py

@@ -1,4 +1,5 @@
 from sqlalchemy import Column, String, JSON as JSONType
+
 from base.orm import Base
 
 

orm/rbac.py

@@ -1,6 +1,8 @@
 import warnings
+
 from sqlalchemy import String, Column, ForeignKey, UniqueConstraint, TypeDecorator
 from sqlalchemy.orm import relationship
+
 from base.orm import Base, REGISTRY, engine, local_session
 from orm.community import Community
 

orm/reaction.py

@@ -1,7 +1,9 @@
 from datetime import datetime
+
 from sqlalchemy import Column, String, ForeignKey, DateTime
-from base.orm import Base
 from sqlalchemy import Enum
+
+from base.orm import Base
 from services.stat.reacted import ReactedStorage, ReactionKind
 from services.stat.viewed import ViewedStorage
 

orm/shout.py

@@ -1,12 +1,14 @@
 from datetime import datetime
+
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
-from orm.user import User
-from orm.topic import Topic, ShoutTopic
+
+from base.orm import Base
 from orm.reaction import Reaction
+from orm.topic import Topic, ShoutTopic
+from orm.user import User
 from services.stat.reacted import ReactedStorage
 from services.stat.viewed import ViewedStorage
-from base.orm import Base
 
 
 class ShoutReactionsFollower(Base):

orm/topic.py

@@ -1,5 +1,7 @@
 from datetime import datetime
+
 from sqlalchemy import Column, String, ForeignKey, DateTime, JSON as JSONType
+
 from base.orm import Base
 
 

orm/user.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+
 from sqlalchemy import (
     Column,
     Integer,
@@ -9,6 +10,7 @@ from sqlalchemy import (
     JSON as JSONType,
 )
 from sqlalchemy.orm import relationship
+
 from base.orm import Base, local_session
 from orm.rbac import Role
 from services.auth.roles import RoleStorage