mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-10-31 13:15:43 +00:00 
			
		
		
		
	refactor: refactor unnecessary else / elif when if block has a return statement (#5735)
				
					
				
			The use of `else` or `elif` becomes redundant and can be dropped if the last statement under the leading `if` / `elif` block is a `return` statement. In the case of an `elif` after `return`, it can be written as a separate `if` block. For `else` blocks after `return`, the statements can be shifted out of `else`. Please refer to the examples below for reference. Refactoring the code this way can improve code-readability and make it easier to maintain. Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
This commit is contained in:
		| @@ -46,8 +46,7 @@ class BuildFilter(rest_filters.FilterSet): | ||||
|         """Filter the queryset to either include or exclude orders which are active.""" | ||||
|         if str2bool(value): | ||||
|             return queryset.filter(status__in=BuildStatusGroups.ACTIVE_CODES) | ||||
|         else: | ||||
|             return queryset.exclude(status__in=BuildStatusGroups.ACTIVE_CODES) | ||||
|         return queryset.exclude(status__in=BuildStatusGroups.ACTIVE_CODES) | ||||
|  | ||||
|     overdue = rest_filters.BooleanFilter(label='Build is overdue', method='filter_overdue') | ||||
|  | ||||
| @@ -55,8 +54,7 @@ class BuildFilter(rest_filters.FilterSet): | ||||
|         """Filter the queryset to either include or exclude orders which are overdue.""" | ||||
|         if str2bool(value): | ||||
|             return queryset.filter(Build.OVERDUE_FILTER) | ||||
|         else: | ||||
|             return queryset.exclude(Build.OVERDUE_FILTER) | ||||
|         return queryset.exclude(Build.OVERDUE_FILTER) | ||||
|  | ||||
|     assigned_to_me = rest_filters.BooleanFilter(label='assigned_to_me', method='filter_assigned_to_me') | ||||
|  | ||||
| @@ -69,8 +67,7 @@ class BuildFilter(rest_filters.FilterSet): | ||||
|  | ||||
|         if value: | ||||
|             return queryset.filter(responsible__in=owners) | ||||
|         else: | ||||
|             return queryset.exclude(responsible__in=owners) | ||||
|         return queryset.exclude(responsible__in=owners) | ||||
|  | ||||
|     assigned_to = rest_filters.NumberFilter(label='responsible', method='filter_responsible') | ||||
|  | ||||
| @@ -102,8 +99,7 @@ class BuildFilter(rest_filters.FilterSet): | ||||
|         """Filter by whether or not the order has a project code""" | ||||
|         if str2bool(value): | ||||
|             return queryset.exclude(project_code=None) | ||||
|         else: | ||||
|             return queryset.filter(project_code=None) | ||||
|         return queryset.filter(project_code=None) | ||||
|  | ||||
|  | ||||
| class BuildList(APIDownloadMixin, ListCreateAPI): | ||||
| @@ -292,8 +288,7 @@ class BuildLineFilter(rest_filters.FilterSet): | ||||
|         """Filter by whether each BuildLine is fully allocated""" | ||||
|         if str2bool(value): | ||||
|             return queryset.filter(allocated__gte=F('quantity')) | ||||
|         else: | ||||
|             return queryset.filter(allocated__lt=F('quantity')) | ||||
|         return queryset.filter(allocated__lt=F('quantity')) | ||||
|  | ||||
|     available = rest_filters.BooleanFilter(label=_('Available'), method='filter_available') | ||||
|  | ||||
| @@ -310,8 +305,7 @@ class BuildLineFilter(rest_filters.FilterSet): | ||||
|  | ||||
|         if str2bool(value): | ||||
|             return queryset.filter(flt) | ||||
|         else: | ||||
|             return queryset.exclude(flt) | ||||
|         return queryset.exclude(flt) | ||||
|  | ||||
|  | ||||
| class BuildLineEndpoint: | ||||
| @@ -508,8 +502,7 @@ class BuildItemFilter(rest_filters.FilterSet): | ||||
|         """Filter the queryset based on whether build items are tracked""" | ||||
|         if str2bool(value): | ||||
|             return queryset.exclude(install_into=None) | ||||
|         else: | ||||
|             return queryset.filter(install_into=None) | ||||
|         return queryset.filter(install_into=None) | ||||
|  | ||||
|  | ||||
| class BuildItemList(ListCreateAPI): | ||||
|   | ||||
| @@ -314,9 +314,8 @@ class Build(MPTTModel, InvenTree.models.InvenTreeBarcodeMixin, InvenTree.models. | ||||
|         """Return all Build Order objects under this one.""" | ||||
|         if cascade: | ||||
|             return Build.objects.filter(parent=self.pk) | ||||
|         else: | ||||
|             descendants = self.get_descendants(include_self=True) | ||||
|             Build.objects.filter(parent__pk__in=[d.pk for d in descendants]) | ||||
|         descendants = self.get_descendants(include_self=True) | ||||
|         Build.objects.filter(parent__pk__in=[d.pk for d in descendants]) | ||||
|  | ||||
|     def sub_build_count(self, cascade=True): | ||||
|         """Return the number of sub builds under this one. | ||||
| @@ -957,8 +956,7 @@ class Build(MPTTModel, InvenTree.models.InvenTreeBarcodeMixin, InvenTree.models. | ||||
|                 return 1 | ||||
|             elif item.part in variant_parts: | ||||
|                 return 2 | ||||
|             else: | ||||
|                 return 3 | ||||
|             return 3 | ||||
|  | ||||
|         new_items = [] | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user