Revert "S1158 - Nom des documents téléchargés (#1478)"

This reverts commit f858ebd.

Makefile

@@ -5,9 +5,6 @@ SHELL := /bin/bash
 server:
 	@python manage.py runserver 0.0.0.0:8001
 
-worker:
-	@python -m celery -A core.worker worker -B -l INFO
-
 fmt:
 	@pre-commit run --all-files
 

conventions/services/avenants.py

@@ -13,8 +13,6 @@
 from conventions.services.search import AvenantListSearchService
 from upload.services import UploadService
 
-from .utils import convention_upload_filename
-
 logger = logging.getLogger(__name__)
 
 
@@ -143,16 +141,14 @@ def complete_avenants_for_avenant(
         if avenant_form.is_valid():
             file = request.FILES["nom_fichier_signe"]
             if file:
-                upload_filename = convention_upload_filename(avenant)
-
+                now = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M")
+                filename = f"{now}_convention_{avenant.uuid}_signed.pdf"
                 upload_service = UploadService(
                     convention_dirpath=f"conventions/{avenant.uuid}/convention_docs",
-                    filename=upload_filename,
+                    filename=filename,
                 )
-
                 upload_service.upload_file(file)
-                avenant.nom_fichier_signe = upload_filename
-
+                avenant.nom_fichier_signe = filename
             for avenant_type in avenant_form.cleaned_data["avenant_types"]:
                 avenanttype = AvenantType.objects.get(nom=avenant_type)
                 avenant.avenant_types.add(avenanttype)

conventions/services/file.py

@@ -8,8 +8,6 @@
 from core.storage import client
 from upload.services import UploadService
 
-from .utils import convention_upload_filename
-
 logger = logging.getLogger(__name__)
 
 
@@ -18,19 +16,19 @@ class ConventionFileService:
     def upload_convention_file(
         cls, convention: Convention, file: File, update_statut: bool = True
     ):
-        upload_filename = convention_upload_filename(convention)
-
+        now = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M")
+        filename = f"{now}_convention_{convention.uuid}_signed.pdf"
         upload_service = UploadService(
             convention_dirpath=f"conventions/{convention.uuid}/convention_docs",
-            filename=upload_filename,
+            filename=filename,
         )
         upload_service.upload_file(file)
 
         if update_statut and not convention.statut == ConventionStatut.DENONCEE.label:
             convention.statut = ConventionStatut.SIGNEE.label
             convention.televersement_convention_signee_le = datetime.date.today()
 
-        convention.nom_fichier_signe = upload_filename
+        convention.nom_fichier_signe = filename
         convention.save()
 
     @classmethod

conventions/services/utils.py

@@ -1,5 +1,4 @@
 import json
-from datetime import datetime
 from enum import Enum
 
 from django.http import HttpRequest
@@ -148,29 +147,3 @@ def set_from_form_or_object(field, form, obj):
             else getattr(obj, field)
         ),
     )
-
-
-def convention_upload_filename(convention: Convention) -> str:
-
-    def _normalize(numero: str | None) -> str | None:
-        if numero:
-            return numero.replace(" ", "_")
-
-    parts = []
-
-    if convention.parent:
-        parts += [
-            f"convention_{_normalize(convention.parent.numero)}",
-            f"avenant_{_normalize(convention.numero) or 'N'}",
-        ]
-    else:
-        parts += [
-            f"convention_{_normalize(convention.numero) or 'NUM'}",
-        ]
-
-    if convention.statut == ConventionStatut.PROJET.label:
-        parts.append("projet")
-
-    parts.append(datetime.now().strftime("%Y-%m-%d_%H-%M"))
-
-    return f"{'_'.join(parts)}.pdf"