Advance mapping search with proper ordering (#100)

* Advance Search For mappings Page

* lint resolved

* minor change

* comment resolved

* lint resolved

* bump up version

* ordering by value

* bump up patch version

fyle_accounting_mappings/views.py

@@ -286,11 +286,11 @@ def get_queryset(self):
         elif mapped is False:
             param = ~Q(mapping__destination_type=destination_type)
         else:
-            return ExpenseAttribute.objects.filter(Q(**filters))
+            return ExpenseAttribute.objects.filter(Q(**filters)).order_by('value')
         final_filter = Q(**filters)
         if param:
             final_filter = final_filter & param
-        return ExpenseAttribute.objects.filter(final_filter)
+        return ExpenseAttribute.objects.filter(final_filter).order_by('value')
 
 
 class CategoryAttributesMappingView(ListAPIView):
@@ -337,11 +337,11 @@ def get_queryset(self):
         elif mapped is False:
             param = ~Q(categorymapping__source_category_id__in=source_categories)
         else:
-            return ExpenseAttribute.objects.filter(Q(**filters))
+            return ExpenseAttribute.objects.filter(Q(**filters)).order_by('value')
         final_filter = Q(**filters)
         if param:
             final_filter = final_filter & param
-        return ExpenseAttribute.objects.filter(final_filter)
+        return ExpenseAttribute.objects.filter(final_filter).order_by('value')
 
 class EmployeeAttributesMappingView(ListAPIView):
 
@@ -383,11 +383,11 @@ def get_queryset(self):
         elif mapped is False:
             param = ~Q(employeemapping__source_employee_id__in=source_employees)
         else:
-            return ExpenseAttribute.objects.filter(Q(**filters))
+            return ExpenseAttribute.objects.filter(Q(**filters)).order_by('value')
         final_filter = Q(**filters)
         if param:
             final_filter = final_filter & param
-        return ExpenseAttribute.objects.filter(final_filter)
+        return ExpenseAttribute.objects.filter(final_filter).order_by('value')
 
 
 class ExpenseFieldView(ListAPIView):

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='fyle-accounting-mappings',
-    version='1.31.0',
+    version='1.31.1',
     author='Shwetabh Kumar',
     author_email='[email protected]',
     description='Django application to store the fyle accounting mappings in a generic manner',