Refactor code

Author: k9845

api/migrations/0205_merge_20240227_0819.py

@@ -0,0 +1,15 @@
+# Generated by Django 3.2.23 on 2024-02-27 08:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0190_auto_20240220_0510'),
+        ('api', '0190_remove_export_selector'),
+        ('api', '0204_merge_20240129_0639'),
+    ]
+
+    operations = [
+    ]

api/serializers.py

@@ -2378,7 +2378,7 @@ def create(self, validated_data):
         else:
             title = "Export"
         user = self.context['request'].user
-        validated_data['url'] = f'https://{settings.EXPORT_ALLOWED_DOMAIN}/{export_type}/{export_id}/export/'
+        validated_data['url'] = f'https://{settings.FRONTEND_URL}/{export_type}/{export_id}/export/'
         validated_data['requested_by'] = user
         export = super().create(validated_data)
         if export.url:

api/tasks.py

@@ -24,7 +24,7 @@ def build_storage_state(tmp_dir, user, token):
     state = {
         "origins": [
             {
-                "origin": "https://" + settings.EXPORT_ALLOWED_DOMAIN + "/",
+                "origin": "https://" + settings.FRONTEND_URL + "/",
                 "localStorage": [
                     {
                         "name": "user",

main/settings.py

@@ -129,7 +129,6 @@
     *env('DJANGO_ADDITIONAL_ALLOWED_HOSTS'),
 ]
 
-EXPORT_ALLOWED_DOMAIN = [ *env('EXPORT_ALLOWED_HOSTS') ]
 SECRET_KEY = env('DJANGO_SECRET_KEY')
 DEBUG = env('DJANGO_DEBUG')
 GO_ENVIRONMENT = env('GO_ENVIRONMENT')

main/urls.py

@@ -228,7 +228,6 @@
 
     url(r"^api/v2/event/(?P<pk>\d+)", api_views.EventViewset.as_view({"get": "retrieve"})),
     url(r"^api/v2/event/(?P<slug>[-\w]+)", api_views.EventViewset.as_view({"get": "retrieve"}, lookup_field="slug")),
-    #url(r"^api/v2/local-unit/", LocalUnitViewSet.as_view()),
     url(r"^api/v2/delegation-office/(?P<pk>\d+)", DelegationOfficeDetailAPIView.as_view()),
     url(r"^api/v2/delegation-office/", DelegationOfficeListAPIView.as_view()),
     url(r"^tinymce/", include("tinymce.urls")),

main/utils.py

@@ -11,6 +11,8 @@
 from django.utils.dateparse import parse_datetime, parse_date
 from django.db import models, router
 from django.contrib.contenttypes.models import ContentType
+from rest_framework.negotiation import DefaultContentNegotiation
+from rest_framework import exceptions
 
 
 def is_tableau(request):
@@ -161,3 +163,16 @@ def datetime_fields_to_date(
             parse_datetime,
             lambda x: x.date().isoformat(),
         )
+
+
+class SpreadSheetContentNegotiation(DefaultContentNegotiation):
+    MEDIA_TYPES = [
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'text/html',  # To allow download from browser
+    ]
+
+    def select_renderer(self, request, renderers, format_suffix):
+        accepts = self.get_accept_list(request)
+        if not set(self.MEDIA_TYPES).intersection(set(accepts)):
+            raise exceptions.NotAcceptable(available_renderers=renderers)
+        return (None, self.MEDIA_TYPES[0])

per/drf_views.py

@@ -15,10 +15,12 @@
 from django_filters import rest_framework as filters
 from django.db.models import Q
 from django.conf import settings
-from drf_spectacular.utils import extend_schema, extend_schema_view
+from django.views import View
 from django.shortcuts import get_object_or_404
 from django.db import transaction
+from drf_spectacular.utils import extend_schema, extend_schema_view
 
+from main.utils import SpreadSheetContentNegotiation
 from .admin_classes import RegionRestrictedAdmin
 from api.models import Country
 from deployments.models import SectorTag
@@ -256,6 +258,8 @@ def get_queryset(self):
 class ExportPerView(views.APIView):
     permission_classes = [permissions.IsAuthenticated]
 
+    content_negotiation_class = SpreadSheetContentNegotiation
+
     def get(self, request, pk, format=None):
         per = get_object_or_404(Overview, pk=pk)
         per_queryset = Overview.objects.filter(id=per.id)
@@ -458,6 +462,7 @@ def get(self, request, pk, format=None):
         wb.save(response)
         return response
 
+
 class NewPerWorkPlanViewSet(viewsets.ModelViewSet):
     permission_classes = (IsAuthenticated,)
     queryset = PerWorkPlan.objects.all()

per/migrations/0096_migrate_formdata_notes.py

@@ -6,27 +6,7 @@
 class Migration(migrations.Migration):
 
     def migrate_formdata_notes(apps, schema_editor):
-        Form = apps.get_model('per', 'Form')
-        FormData = apps.get_model('per', 'FormData')
-        FormComponentResponse = apps.get_model('per', 'FormComponentResponse')
-        count = 0
-        for form in Form.objects.all():
-            area = form.area
-            for component_response in area.formcomponent_set.all():
-                form_component_response = FormComponentResponse.objects.filter(
-                    component=component_response,
-                )
-                for response in form_component_response:
-                    form_data_entries = FormData.objects.filter(
-                        form=form,
-                        question__component=response.component
-                    )
-                    if form_data_entries.exists():
-                        form_data_entry = form_data_entries.first()
-                    response.notes = form_data_entry.notes
-                    response.save(update_fields=['notes'])
-                    count += 1
-        print(f'Total {count} notes updated')
+        pass
 
     dependencies = [
         ('per', '0095_perdocumentupload'),

per/migrations/0103_merge_0100_migrate_all_notes_0102_merge_20240216_0447.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.23 on 2024-02-27 08:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('per', '0100_migrate_all_notes'),
+        ('per', '0102_merge_20240216_0447'),
+    ]
+
+    operations = [
+    ]