Change API to accomodate for invoice numbers

src/pretix/api/serializers/order.py

@@ -115,5 +115,5 @@ class InvoiceSerializer(I18nAwareModelSerializer):
 
     class Meta:
         model = Invoice
-        fields = ('order', 'invoice_no', 'is_cancellation', 'invoice_from', 'invoice_to', 'date', 'refers', 'locale',
+        fields = ('order', 'number', 'is_cancellation', 'invoice_from', 'invoice_to', 'date', 'refers', 'locale',
                   'introductory_text', 'additional_text', 'payment_provider_text', 'footer_text', 'lines')

src/pretix/api/views/order.py

@@ -1,5 +1,6 @@
 import django_filters
 from django.db.models import Q
+from django.db.models.functions import Concat
 from django.http import FileResponse
 from django_filters.rest_framework import DjangoFilterBackend, FilterSet
 from rest_framework import viewsets
@@ -137,12 +138,21 @@ class OrderPositionViewSet(viewsets.ReadOnlyModelViewSet):
 
 
 class InvoiceFilter(FilterSet):
-    refers = django_filters.CharFilter(name='refers', lookup_expr='invoice_no__iexact')
+    refers = django_filters.CharFilter(method='refers_qs')
+    number = django_filters.CharFilter(method='nr_qs')
     order = django_filters.CharFilter(name='order', lookup_expr='code__iexact')
 
+    def refers_qs(self, queryset, name, value):
+        return queryset.annotate(
+            refers_nr=Concat('refers__prefix', 'refers__invoice_no')
+        ).filter(refers_nr__iexact=value)
+
+    def nr_qs(self, queryset, name, value):
+        return queryset.filter(nr__iexact=value)
+
     class Meta:
         model = Invoice
-        fields = ['order', 'invoice_no', 'is_cancellation', 'refers', 'locale']
+        fields = ['order', 'number', 'is_cancellation', 'refers', 'locale']
 
 
 class RetryException(APIException):
@@ -155,15 +165,17 @@ class InvoiceViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = InvoiceSerializer
     queryset = Invoice.objects.none()
     filter_backends = (DjangoFilterBackend, OrderingFilter)
-    ordering = ('invoice_no',)
-    ordering_fields = ('invoice_no', 'date')
+    ordering = ('nr',)
+    ordering_fields = ('nr', 'date')
     filter_class = InvoiceFilter
-    lookup_field = 'invoice_no'
-    lookup_url_kwarg = 'invoice_no'
     permission = 'can_view_orders'
+    lookup_url_kwarg = 'number'
+    lookup_field = 'nr'
 
     def get_queryset(self):
-        return self.request.event.invoices.prefetch_related('lines').select_related('order')
+        return self.request.event.invoices.prefetch_related('lines').select_related('order', 'refers').annotate(
+            nr=Concat('prefix', 'invoice_no')
+        )
 
     @detail_route()
     def download(self, request, **kwargs):

src/tests/api/test_orders.py

@@ -256,7 +256,7 @@ def invoice(order):
 
 TEST_INVOICE_RES = {
     "order": "FOO",
-    "invoice_no": "00001",
+    "number": "DUMMY-00001",
     "is_cancellation": False,
     "invoice_from": "",
     "invoice_to": "Sample company",
@@ -291,10 +291,10 @@ def test_invoice_list(token_client, organizer, event, order, invoice):
     resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?order=BAR'.format(organizer.slug, event.slug))
     assert [] == resp.data['results']
 
-    resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?invoice_no={}'.format(
-        organizer.slug, event.slug, invoice.invoice_no))
+    resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?number={}'.format(
+        organizer.slug, event.slug, invoice.number))
     assert [res] == resp.data['results']
-    resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?invoice_no=XXX'.format(
+    resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?number=XXX'.format(
         organizer.slug, event.slug))
     assert [] == resp.data['results']
 
@@ -313,15 +313,15 @@ def test_invoice_list(token_client, organizer, event, order, invoice):
     resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?is_cancellation=true'.format(
         organizer.slug, event.slug))
     assert len(resp.data['results']) == 1
-    assert resp.data['results'][0]['invoice_no'] == ic.invoice_no
+    assert resp.data['results'][0]['number'] == ic.number
 
     resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?refers={}'.format(
-        organizer.slug, event.slug, invoice.invoice_no))
+        organizer.slug, event.slug, invoice.number))
     assert len(resp.data['results']) == 1
-    assert resp.data['results'][0]['invoice_no'] == ic.invoice_no
+    assert resp.data['results'][0]['number'] == ic.number
 
     resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/?refers={}'.format(
-        organizer.slug, event.slug, ic.invoice_no))
+        organizer.slug, event.slug, ic.number))
     assert [] == resp.data['results']
 
 
@@ -330,6 +330,6 @@ def test_invoice_detail(token_client, organizer, event, invoice):
     res = dict(TEST_INVOICE_RES)
 
     resp = token_client.get('/api/v1/organizers/{}/events/{}/invoices/{}/'.format(organizer.slug, event.slug,
-                                                                                  invoice.invoice_no))
+                                                                                  invoice.number))
     assert resp.status_code == 200
     assert res == resp.data