Fix stale read and extra query on element image on CreateElementTranscriptions

arkindex/documents/api/ml.py

@@ -183,7 +183,7 @@ class ElementTranscriptionsBulk(CreateAPIView):
         # and this endpoint is immediately used after to create transcriptions
         return Element.objects.filter(
             corpus__in=Corpus.objects.writable(self.request.user)
-        ).using('default').select_related('corpus')
+        ).using('default').select_related('corpus', 'image')
 
     def get_serializer_context(self):
         context = super().get_serializer_context()

arkindex/documents/tests/test_bulk_element_transcriptions.py

@@ -88,7 +88,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence, orientation in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -148,7 +148,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence, orientation, element_confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -209,7 +209,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
         self.assertEqual(created_elts.count(), 1)
 
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -251,7 +251,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
         }
 
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -300,7 +300,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
         }
 
         self.client.force_login(self.user)
-        with self.assertNumQueries(14):
+        with self.assertNumQueries(13):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.huge_page.id}),
                 format='json',
@@ -467,7 +467,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
         }
 
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -534,7 +534,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': top_level.id}),
                 format='json',
@@ -582,7 +582,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',
@@ -645,7 +645,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.rotated_page.id}),
                 format='json',
@@ -682,7 +682,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(16):
+        with self.assertNumQueries(15):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.mirrored_page.id}),
                 format='json',
@@ -719,7 +719,7 @@ class TestBulkElementTranscriptions(FixtureAPITestCase):
             } for poly, text, confidence in transcriptions]
         }
         self.client.force_login(self.user)
-        with self.assertNumQueries(8):
+        with self.assertNumQueries(7):
             response = self.client.post(
                 reverse('api:element-transcriptions-bulk', kwargs={'pk': self.page.id}),
                 format='json',