Skip to content

Commit 2102b74

Browse files
committed
- fix legacy uploads for system user validation
1 parent 114cac2 commit 2102b74

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

kirovy/models/cnc_user.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@ def get_queryset(self) -> models.QuerySet:
7272
"""
7373
return super().get_queryset().exclude(cncnet_id__in=self._SYSTEM_CNCNET_IDS)
7474

75+
def all_including_legacy_uploader(self):
76+
"""Base queryset that includes the legacy upload user.
77+
78+
:return:
79+
A queryset that only returns all.
80+
"""
81+
return super().get_queryset().exclude(cncnet_id=constants.MigrationUser.CNCNET_ID)
82+
7583

7684
class CncUser(AbstractBaseUser):
7785
CncnetUserGroup = constants.CncnetUserGroup

kirovy/serializers/cnc_map_serializers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ class Meta:
7979

8080
cnc_user_id = serializers.PrimaryKeyRelatedField(
8181
source="cnc_user",
82-
queryset=CncUser.objects.all(),
82+
# Allow system users
83+
queryset=CncUser.objects.all_including_legacy_uploader(),
8384
pk_field=serializers.UUIDField(),
8485
)
8586

0 commit comments

Comments
 (0)