wip

papermerge/core/db/models.py

@@ -61,15 +61,15 @@ class User(Base):
         back_populates="user", primaryjoin="User.id == Node.user_id"
     )
     home_folder_id: Mapped[UUID] = mapped_column(
-        ForeignKey("core_folder.basetreenode_ptr_id", deferrable=True)
+        ForeignKey("core_folder.basetreenode_ptr_id", deferrable=True), nullable=True
     )
     home_folder: Mapped["Folder"] = relationship(
         primaryjoin="User.home_folder_id == Folder.id",
         back_populates="user",
         viewonly=True,
     )
     inbox_folder_id: Mapped[UUID] = mapped_column(
-        ForeignKey("core_folder.basetreenode_ptr_id", deferrable=True)
+        ForeignKey("core_folder.basetreenode_ptr_id", deferrable=True), nullable=True
     )
     inbox_folder: Mapped["Folder"] = relationship(
         primaryjoin="User.home_folder_id == Folder.id",
@@ -103,7 +103,11 @@ class Node(Base):
     user: Mapped["User"] = relationship(
         back_populates="nodes", primaryjoin="User.id == Node.user_id"
     )
-    user_id: Mapped[UUID] = mapped_column(ForeignKey("core_user.id", use_alter=True))
+    user_id: Mapped[UUID] = mapped_column(
+        ForeignKey(
+            "core_user.id", use_alter=True, name="core_basetreenode_user_id_fkey"
+        )
+    )
     parent_id: Mapped[UUID] = mapped_column(
         ForeignKey("core_basetreenode.id"), nullable=True
     )

papermerge/core/features/document_types/tests/conftest.py

@@ -110,7 +110,10 @@ def _maker(username: str, is_superuser: bool = True):
             lang="de",
             user_id=user_id,
         )
-        db_session.add_all([db_home, db_inbox, db_user])
+        db_session.add(db_inbox)
+        db_session.add(db_home)
+        db_session.add(db_user)
+        db_session.commit()
         db_user.home_folder_id = db_home.id
         db_user.inbox_folder_id = db_inbox.id
         db_session.commit()