nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

refactor(config_management): config_group ref to use full model name

Browse Source 
ref: #248 #390 #366
This commit is contained in:
Jon Lockwood
2024-11-17 23:47:33 +09:30
parent 5f7b6ef9eb
commit 3afc63d8fc
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/config_management/serializers/config_group.py
View File

@ -89,13 +89,13 @@ class ConfigGroupModelSerializer(
'v2:_api_v2_config_group_software-list',
request=self.context['view'].request,
kwargs = {
'group_id': item.pk
'config_group_id': item.pk
}
),
'notes': reverse(
"v2:_api_v2_config_group_notes-list",
request=self._context['view'].request,
kwargs={'group_id': item.pk}
kwargs={'config_group_id': item.pk}
),
'organization': reverse(
'v2:_api_v2_organization-list',

8
app/config_management/serializers/config_group_software.py
View File

@ -105,7 +105,7 @@ class ConfigGroupSoftwareModelSerializer(
if 'view' in self._context:
if 'group_id' in self._context['view'].kwargs:
if 'config_group_id' in self._context['view'].kwargs:
self.Meta.read_only_fields += [
'organization',
@ -121,11 +121,11 @@ class ConfigGroupSoftwareModelSerializer(
if 'view' in self._context:
if 'group_id' in self._context['view'].kwargs:
if 'config_group_id' in self._context['view'].kwargs:
self.validated_data['config_group_id'] = int(self._context['view'].kwargs['group_id'])
self.validated_data['config_group_id'] = int(self._context['view'].kwargs['config_group_id'])
parent_item = ConfigGroups.objects.get(pk = int(self._context['view'].kwargs['group_id']))
parent_item = ConfigGroups.objects.get(pk = int(self._context['view'].kwargs['config_group_id']))
self.validated_data['organization_id'] = parent_item.organization.id

4
app/config_management/tests/functional/config_groups/test_config_groups_notes_viewset.py
View File

@ -48,8 +48,8 @@ class NotePermissionsAPI(
)
self.url_kwargs = {'group_id': self.note_item.id}
self.url_kwargs = {'config_group_id': self.note_item.id}
self.url_view_kwargs = {'group_id': self.note_item.id, 'pk': self.item.pk }
self.url_view_kwargs = {'config_group_id': self.note_item.id, 'pk': self.item.pk }
self.add_data = {'note': 'a note added', 'organization': self.organization.id}

4
app/config_management/tests/functional/config_groups_software/test_config_groups_software_viewset.py
View File

@ -130,7 +130,7 @@ class ConfigGroupSoftwarePermissionsAPI(TestCase, APIPermissions):
name = 'one'
)
self.url_kwargs = { 'group_id': self.config_group.id }
self.url_kwargs = { 'config_group_id': self.config_group.id }
self.software = Software.objects.create(
organization = self.organization,
@ -164,7 +164,7 @@ class ConfigGroupSoftwarePermissionsAPI(TestCase, APIPermissions):
)
self.url_view_kwargs = {'group_id': self.config_group.id, 'pk': self.item.id}
self.url_view_kwargs = {'config_group_id': self.config_group.id, 'pk': self.item.id}
self.add_data = {
'organization': self.organization.id,

2
app/config_management/tests/unit/config_groups_software/test_config_groups_software_api_v2.py
View File

@ -61,7 +61,7 @@ class ConfigGroupsAPI(
version = self.software_version
)
self.url_view_kwargs = {'group_id': self.config_group.id, 'pk': self.item.id}
self.url_view_kwargs = {'config_group_id': self.config_group.id, 'pk': self.item.id}
view_permissions = Permission.objects.get(
codename = 'view_' + self.model._meta.model_name,

4
app/config_management/viewsets/config_group_software.py
View File

@ -75,9 +75,9 @@ class ViewSet( ModelViewSet ):
def get_queryset(self):
if 'group_id' in self.kwargs:
if 'config_group_id' in self.kwargs:
self.queryset = super().get_queryset().filter(config_group = self.kwargs['group_id'])
self.queryset = super().get_queryset().filter(config_group = self.kwargs['config_group_id'])
else: