Add support for Bird observation creation (with provided species)

backend/nature_go/observation/models.py

@@ -64,11 +64,11 @@ class Meta:
 
 class Observation(models.Model):
     ORGAN_CHOICES = [
+        ('whole', 'whole'),
         ('leaf', 'leaf'),
         ('flower', 'flower'),
         ('fruit', 'fruit'),
         ('bark', 'bark'),
-        ('whole', 'whole'),
     ]
 
     user = models.ForeignKey(User, on_delete=models.CASCADE)

backend/nature_go/observation/serializers.py

@@ -11,7 +11,7 @@ class ObservationSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Observation
-        fields = ['id', 'user', 'image', 'organ', 'species', 'location', 'datetime', 'identification_response', 'xp']
+        fields = ['id', 'user', 'image', 'type', 'organ', 'species', 'location', 'datetime', 'identification_response', 'xp']
 
 
 class SpeciesSerializer(serializers.ModelSerializer):

backend/nature_go/observation/urls.py

@@ -5,8 +5,8 @@
 
 urlpatterns = format_suffix_patterns([
     path('', views.SpeciesList.as_view(), name='species-list'),
-    path('plant', views.PlantSpeciesList.as_view(), name='plant-species-list'),
-    path('bird', views.BirdSpeciesList.as_view(), name='bird-species-list'),
+    path('plant/', views.PlantSpeciesList.as_view(), name='plant-species-list'),
+    path('bird/', views.BirdSpeciesList.as_view(), name='bird-species-list'),
     path('all/', views.SpeciesAllList.as_view(), name='species-all-list'),
     path('labeled/', views.SpeciesLabeledList.as_view(), name='species-labeled-list'),
     path('<int:pk>/', views.SpeciesDetail.as_view(), name='species-detail'),

backend/nature_go/observation/views.py

@@ -27,6 +27,7 @@ def get_queryset(self):
         user = self.request.user
         return Species.objects.filter(type=Species.PLANT_TYPE, observation__user=user).distinct()
 
+
 class BirdSpeciesList(SpeciesList):
     def get_queryset(self):
         user = self.request.user
@@ -122,6 +123,7 @@ def get_queryset(self):
 
 class ObservationCreate(generics.CreateAPIView):
     serializer_class = ObservationSerializer
+    queryset = Observation.objects.none() # dummy queryset
 
     def create(self, request, *args, **kwargs):
         serializer = ObservationSerializer(data=request.data)
@@ -132,10 +134,16 @@ def create(self, request, *args, **kwargs):
             raise e
         # Save the serializer first so we can access the image
         observation = serializer.save(user=self.request.user)
-        observation.identification_response = identification.plantnet_identify(
-            image_path=observation.image.path, organ=observation.organ)
-        # observation.location, observation.datetime = identification.read_exif(observation.image.path)
-        observation.save()
+
+        # Run identification service
+        if observation.type == Species.PLANT_TYPE:
+            observation.identification_response = identification.plantnet_identify(
+                image_path=observation.image.path, organ=observation.organ)
+            observation.save()
+        elif observation.type == Species.BIRD_TYPE:
+            if not (observation.species and observation.species.type == Species.BIRD_TYPE):
+                raise serializers.ValidationError('For bird observations, a bird species must be provided')
+
         serializer = ObservationSerializer(instance=observation)
         return Response(serializer.data)