fix(devops): Correct feature flagging validation for enabled software and enabled orgs

ref: #670 #659
This commit is contained in:
2025-03-07 16:23:48 +09:30
parent b60aa3be7a
commit 5dd4bddea9

View File

@ -94,24 +94,22 @@ class ModelSerializer(
def is_valid(self, raise_exception = False):
is_valid = super().is_valid( raise_exception = raise_exception )
valid_software_orgs = []
software = self.validated_data.get('software', None)
software = self.initial_data.get('software', None)
organization = self.validated_data.get('organization', None)
organization = self.initial_data.get('organization', None)
if getattr(self, 'instance', None):
software = self.instance.software
software = self.instance.software.id
organization = self.instance.organization
organization = self.instance.organization.id
valid_software_orgs = Software.objects.filter(
feature_flagging__enabled = True,
feature_flagging__software = software
feature_flagging__software_id = int(software)
).distinct().values_list(
'feature_flagging__organization',
flat = True
@ -127,7 +125,7 @@ class ModelSerializer(
code = 'feature_flagging_disabled'
)
if organization.id not in valid_software_orgs:
if int(organization) not in valid_software_orgs:
raise centurion_exceptions.ValidationError(
detail = {
@ -136,6 +134,8 @@ class ModelSerializer(
code = 'feature_flagging_wrong_organizaiton'
)
is_valid = super().is_valid( raise_exception = raise_exception )
return is_valid