feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596

chloend · 2024-12-17T10:09:25Z

DDB = dépôt(s) de besoin

Quoi ?

Permettre de demander des modifications sur un DDB ou de le clôturer si nécessaire.

Pourquoi ?

Actuellement, les admins sont contraints de mettre une mention "HS" sur le titre des besoins afin de les trier. Cela leur permettra de gagner du temps et d'améliorer le suivi des DDB.

Comment ?

1. Modèle `Tender`

Ajout de l'attribut email_sent_for_modification : un booléen à False par défaut

Ajout de deux méthodes :

reset_modification_request : réinitialise les champs email_sent_for_modification et/ou changes_information lorsque des modifications ont été apportées et que le statut du besoin passe de "brouillon" à "publié".
set_modification_request : sauvegarde les champs email_sent_for_modification, status et logs après avoir cliqué sur le bouton d'envoi de modification dans l'admin.

2. Modèle `Conversation`

a. Ajout deux de `TemplateTransactional` dans une migration :

TENDERS_AUTHOR_MODIFICATION_REQUEST : template de mail de demande de modification d'un DDB
TENDERS_AUTHOR_REJECT_MESSAGE : template de mail de rejet du DDB

Captures d'écran (optionnel)

Capture des besoins avec mention "HS"
Capture des besoins avec le champ email_sent_for_modification à True
Capture des besoins dont le statut est "rejeté".

Autre (optionnel)

À la demande de @SebastienReuiller, j'ai remplacé toutes les références à "@beta.gouv.fr" par "@inclusion.gouv.fr"

lemarche/tenders/migrations/0097_add_templatetransactional_tender_author_reject_message.py

lemarche/www/pages/views.py

lemarche/tenders/admin.py

lemarche/www/tenders/tasks.py

lemarche/utils/urls.py

lemarche/www/tenders/tasks.py

lemarche/tenders/admin.py

lemarche/tenders/management/commands/update_tender_status_to_rejected.py

...ions/0018_add_templatetransactional_tender_author_modification_request_and_reject_message.py

SebastienReuiller

Super fonctionnalité, bravo !
Je t'ai fait quelques retours ;)

lemarche/api/tenders/views.py

lemarche/www/tenders/tasks.py

lemarche/tenders/admin.py

Guilouf

Lorsque la demande à été rejetée, elle est toujours listée parmi les demandes de l'acheteur, mais rien n'indique qu'elle a été rejetée. Il faudrait faire pareil quel lorsqu'elle est cloturée, ex:

clevercloud/tenders_update_status_to_rejected.sh

SebastienReuiller · 2025-02-04T16:54:18Z

Merci @Guilouf .

J'ai ajouté le badge "Rejeté" sur le dashboard :

Sur la liste :

Et sur le détail :

J'ai aussi ajouté des tests.

lemarche/static/js/favorite_item.js

lemarche/siaes/management/commands/import_esat_from_asp.py

lemarche/siaes/management/commands/import_esat_from_csv.py

lemarche/siaes/management/commands/import_esat_gesat.py

lemarche/siaes/management/commands/import_esat_handeco.py

lemarche/siaes/management/commands/import_sep.py

lemarche/www/auth/views.py

lemarche/www/siaes/views.py

SebastienReuiller · 2025-02-05T14:50:07Z

J'ai également corrigé le chevauchement sur le lien. Merci @Guilouf pour ta vigilance.

Avant:

Après:

…method

…ation' change

…mpty

gitguardian · 2025-02-07T16:22:50Z

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
While these secrets were previously flagged, we no longer have a reference to the
specific commits where they were detected. Once a secret has been leaked into a git
repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.

^{_{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.}}

SebastienReuiller · 2025-02-07T16:41:27Z

Nouveau message dans la liste:

Onglet et message pour les rejetés:

Guilouf

Ca me parait nickel, merci pour tes corrections !

chloend force-pushed the chloend/tender-hs branch from 0fba46e to 2a56a9c Compare December 18, 2024 20:14

chloend self-assigned this Dec 18, 2024

chloend force-pushed the chloend/tender-hs branch from 2a56a9c to f174a7c Compare December 18, 2024 20:56

madjid-asa requested review from SebastienReuiller and madjid-asa December 19, 2024 11:10

madjid-asa reviewed Dec 19, 2024

View reviewed changes

lemarche/tenders/migrations/0097_add_templatetransactional_tender_author_reject_message.py Outdated Show resolved Hide resolved

lemarche/www/pages/views.py Outdated Show resolved Hide resolved

chloend force-pushed the chloend/tender-hs branch 5 times, most recently from dbc29a9 to 3e3e43c Compare December 30, 2024 18:23

chloend force-pushed the chloend/tender-hs branch from 3e3e43c to f988dcb Compare December 31, 2024 11:47

chloend requested a review from Guilouf December 31, 2024 11:48

Guilouf reviewed Dec 31, 2024

View reviewed changes

chloend force-pushed the chloend/tender-hs branch from f988dcb to d0adabc Compare December 31, 2024 13:49

chloend force-pushed the chloend/tender-hs branch from d0adabc to 9a3db2b Compare January 16, 2025 05:28

chloend marked this pull request as ready for review January 16, 2025 05:48

chloend requested review from Guilouf and madjid-asa January 16, 2025 05:48

SebastienReuiller requested changes Jan 21, 2025

View reviewed changes

lemarche/api/tenders/views.py Outdated Show resolved Hide resolved

lemarche/www/tenders/tasks.py Outdated Show resolved Hide resolved

lemarche/tenders/admin.py Outdated Show resolved Hide resolved

SebastienReuiller force-pushed the chloend/tender-hs branch from d1fb8e2 to 050deb2 Compare January 30, 2025 13:56

Guilouf requested changes Jan 30, 2025

View reviewed changes

clevercloud/tenders_update_status_to_rejected.sh Outdated Show resolved Hide resolved

madjid-asa force-pushed the chloend/tender-hs branch from 6392e03 to 43f6abd Compare February 4, 2025 21:25

github-advanced-security bot found potential problems Feb 4, 2025

View reviewed changes

lemarche/static/js/favorite_item.js Dismissed Show dismissed Hide dismissed

github-advanced-security bot found potential problems Feb 4, 2025

View reviewed changes

SebastienReuiller force-pushed the chloend/tender-hs branch from 43f6abd to 6392e03 Compare February 5, 2025 08:32

gip-inclusion deleted a comment from gitguardian bot Feb 5, 2025

chloend and others added 22 commits February 7, 2025 17:22

Add 'changes_information' to tender admin

04a0de2

Add 'email_sent_for_modification' and 'changes_information' in clean …

f19be7b

…method

Admin : send emails if tender needs modification or is rejected

f65da6c

Data persistance if 'email_sent_for_modification' and 'changes_inform…

06faf86

…ation' change

'email_sent_for_modification' is readonly while tender is not published

69d102a

Add 'get_object_update_url' to retrieve updated urls from any app

8c83b2c

Test 'get_object_update_url' function

9f958a8

Replace email domain for non prod envs and tests

8c77c90

Use 'get_object_update_url' instead of 'get_object_share_url'

5e8ccb0

Add an additional message in the mail if changes_information is not e…

d5c8ce2

…mpty

Store the date of email sent in tender.logs

2a64723

Create 'update_tender_status_to_rejected' command with its tests

364a68c

Create 'tenders_update_status_to_rejected' script and add it to cron

18dac17

final commit

be0d941

remove useless condition

92515ed

add reject button

532d28a

send an email to author when refect after deadline

a4f5b97

set absolute link for email

3a2152f

fix migrations conflict

490bb68

add rejected badge

664298d

update cmd name to make it easy to find

bf517f1

avoid link and contact name overlap

39c636b

SebastienReuiller force-pushed the chloend/tender-hs branch from 2a9321f to 39c636b Compare February 7, 2025 16:22

SebastienReuiller added 2 commits February 7, 2025 17:28

add filter email_sent_for_modification to increase query perf

4d5c06c

add rejected tab and display good message

8dc0ca3

fix test with good factory

ab02acb

SebastienReuiller requested a review from Guilouf February 7, 2025 16:46

Guilouf approved these changes Feb 11, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596

feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596

chloend commented Dec 17, 2024 •

edited

Loading

SebastienReuiller left a comment

Guilouf left a comment

SebastienReuiller commented Feb 4, 2025

SebastienReuiller commented Feb 5, 2025

gitguardian bot commented Feb 7, 2025 •

edited

Loading

SebastienReuiller commented Feb 7, 2025

Guilouf left a comment

feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596

Are you sure you want to change the base?

feat(Admin des Besoins): Demande de modification ou clôture d'un besoin #1596

Conversation

chloend commented Dec 17, 2024 • edited Loading

Quoi ?

Pourquoi ?

Comment ?

1. Modèle Tender

2. Modèle Conversation

a. Ajout deux de TemplateTransactional dans une migration :

Captures d'écran (optionnel)

Autre (optionnel)

SebastienReuiller left a comment

Choose a reason for hiding this comment

Guilouf left a comment

Choose a reason for hiding this comment

SebastienReuiller commented Feb 4, 2025

SebastienReuiller commented Feb 5, 2025

gitguardian bot commented Feb 7, 2025 • edited Loading

️✅ There are no secrets present in this pull request anymore.

SebastienReuiller commented Feb 7, 2025

Guilouf left a comment

Choose a reason for hiding this comment

chloend commented Dec 17, 2024 •

edited

Loading

1. Modèle `Tender`

2. Modèle `Conversation`

a. Ajout deux de `TemplateTransactional` dans une migration :

gitguardian bot commented Feb 7, 2025 •

edited

Loading