Peut faire un essai avant d’ajouter des préinscriptions (#1027)

betagouv · May 4, 2021 · a7556b5 · a7556b5
1 parent 934d5d5
commit a7556b5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/app/controllers/SignupController.scala b/app/controllers/SignupController.scala
@@ -185,11 +185,17 @@ case class SignupController @Inject() (
                       )
                     )
 
+                  val insertRequests: Future[List[(Either[Error, Unit], SignupRequest)]] =
+                    if (form.dryRun)
+                      Future.successful(newSignups.map(signup => (().asRight, signup)))
+                    else
+                      Future
+                        .traverse(newSignups)(signup =>
+                          signupService.addSignupRequest(signup).map(result => (result, signup))
+                        )
+
                   EitherT(
-                    Future
-                      .traverse(newSignups)(signup =>
-                        signupService.addSignupRequest(signup).map(result => (result, signup))
-                      )
+                    insertRequests
                       .map { results =>
                         val errors: List[(SignupRequest, Error)] = results
                           .flatMap { case (result, signup) =>

diff --git a/app/models/formModels.scala b/app/models/formModels.scala
@@ -83,14 +83,15 @@ object formModels {
 
   }
 
-  final case class AddSignupsFormData(emails: String)
+  final case class AddSignupsFormData(emails: String, dryRun: Boolean)
 
   object AddSignupsFormData {
 
     val form =
       Form(
         mapping(
           "emails" -> text,
+          "dryRun" -> boolean,
         )(AddSignupsFormData.apply)(AddSignupsFormData.unapply)
       )
 

diff --git a/app/views/signupAdmin.scala b/app/views/signupAdmin.scala
@@ -188,6 +188,20 @@ object signupAdmin {
               ),
             )
           ),
+          div(
+            cls := "mdl-cell mdl-cell--12-col",
+            label(
+              cls := "mdl-checkbox mdl-js-checkbox",
+              input(
+                id := "dryRun",
+                name := "dryRun",
+                `type` := "checkbox",
+                cls := "mdl-checkbox__input",
+                value := "true"
+              ),
+              span(cls := "mdl-checkbox__label", "Essai (test sans ajout)")
+            )
+          ),
           div(
             cls := "mdl-cell mdl-cell--12-col",
             button(
@@ -210,7 +224,7 @@ object signupAdmin {
         ),
         tbody(
           frag(
-            signups.filter(_._2.isEmpty).map { case (signup, _) =>
+            signups.filter(_._2.isEmpty).sortBy(_._1.requestDate).reverse.map { case (signup, _) =>
               tr(
                 td(cls := "mdl-data-table__cell--non-numeric", signup.email),
                 td(signup.requestDate.toString),