From ad8363cb327a5afd6d65f1ca6d039a4af3b150c4 Mon Sep 17 00:00:00 2001 From: Tianjing Li Date: Tue, 19 Nov 2024 10:43:29 -0500 Subject: [PATCH] chore: Fix Groups/UserGroupsAssociation table overlap issue (#847) Fix overlap issue --- src/backend/database_models/group.py | 2 +- src/backend/database_models/user.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/database_models/group.py b/src/backend/database_models/group.py index c4988edd41..3d5af61b05 100644 --- a/src/backend/database_models/group.py +++ b/src/backend/database_models/group.py @@ -10,6 +10,6 @@ class Group(Base): display_name: Mapped[str] = mapped_column(String) users = relationship("User", secondary="user_group", backref="groups") - user_associations = relationship("UserGroupAssociation", back_populates="group") + user_associations = relationship("UserGroupAssociation", back_populates="group", overlaps="groups,users") __table_args__ = (UniqueConstraint("display_name", name="unique_display_name"),) diff --git a/src/backend/database_models/user.py b/src/backend/database_models/user.py index 816a429609..7850bff974 100644 --- a/src/backend/database_models/user.py +++ b/src/backend/database_models/user.py @@ -28,7 +28,7 @@ class UserGroupAssociation(Base): ) display: Mapped[str] = mapped_column() - group = relationship("Group", back_populates="user_associations") + group = relationship("Group", back_populates="user_associations", overlaps="groups,user_associations,users") class User(Base):