[AJP-2]

ajapaik/ajapaik/migrations/0025_photomodelsuggestionalternativecategory_photomodelsuggestionresult.py

@@ -0,0 +1,42 @@
+# Generated by Django 3.2.7 on 2023-09-27 19:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ajapaik', '0024_auto_20230204_1918'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PhotoModelSuggestionResult',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True, db_index=True)),
+                ('viewpoint_elevation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')),
+                ('scene', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')),
+                ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='PhotoModelSuggestionAlternativeCategory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(auto_now_add=True, db_index=True)),
+                ('viewpoint_elevation_alternation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Ground'), (1, 'Raised'), (2, 'Aerial')], null=True, verbose_name='Viewpoint elevation')),
+                ('scene_alternation', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Interior'), (1, 'Exterior')], null=True, verbose_name='Scene')),
+                ('photo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ajapaik.photo')),
+                ('proposer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photo_scene_suggestions_alternation', to='ajapaik.profile')),
+            ],
+            options={
+                'db_table': 'ajapaik_photomodelsuggestionalternativecategory',
+                'unique_together': {('proposer', 'photo_id', 'viewpoint_elevation_alternation'), ('proposer', 'photo_id', 'scene_alternation')},
+            },
+        ),
+    ]

ajapaik/ajapaik_object_categorization/urls.py

@@ -1,7 +1,6 @@
 from django.conf.urls import url
 
 from ajapaik.ajapaik_object_categorization import views
-from ajapaik.ajapaik_object_categorization import api
 
 urlpatterns = [
     url(r'^get-latest-category/(?P<photo_id>\d+)/$', views.get_latest_category_from_result_table,
@@ -16,8 +15,3 @@
         name='get_uncategorized_images')
 ]
 
-
-urlpatterns += [
-    url(r'^api/v1/annotation/(?P<annotation_id>\d+)/$', api.Category.as_view(),
-        name='object_categorization_api_category'),
-]

ajapaik/ajapaik_object_categorization/views.py

@@ -32,7 +32,7 @@ def propose_alternative_category(request: HttpRequest) -> HttpResponse:
     alternative.viewpoint_elevation_alternation = request.POST.get("viewpoint_elevation_to_alternate", None)
     alternative.scene_alternation = request.POST.get("scene_to_alternate", None)
     alternative.photo_id = request.POST.get("photo_id", None)
-    alternative.proposer = request.user.profile  # assuming you have a user profile model and the user is authenticated
+    alternative.proposer = request.user.profile
     alternative.save()
 
     return response.success()