remove typeform

StartupsPoleEmploi · Mar 15, 2023 · d4409f1 · d4409f1
1 parent d63faf1
commit d4409f1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 138 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -29,44 +29,6 @@ config :vae,
   rncp: [
     url: "https://api.francecompetences.fr/referentiels/v1/fiches",
     api_key: System.get_env("RNCP_API_KEY")
-  ],
-  reminders: [
-    stock: [
-      users: [
-        template_id: 848_006,
-        form_urls: [
-          certifiers: [
-            default: %{
-              url: System.get_env("TYPEFORM_STOCK_REMINDER")
-            }
-          ]
-        ]
-      ]
-    ],
-    monthly: [
-      users: [
-        form_urls: [
-          certifiers: [
-            asp: %{
-              ids: [1, 3],
-              url: System.get_env("TYPEFORM_MONTH_BACK_ASP")
-            },
-            educ_nat: %{
-              ids: [2],
-              url: System.get_env("TYPEFORM_MONTH_BACK_EDUC_NAT")
-            },
-            labour_ministry: %{
-              ids: [4],
-              url: System.get_env("TYPEFORM_MONTH_BACK_MINISTRY")
-            },
-            other: %{
-              ids: [],
-              url: System.get_env("TYPEFORM_MONTH_BACK_OTHER")
-            }
-          ]
-        ]
-      ]
-    ]
   ]
 
 config :vae, VaeWeb.Endpoint,
@@ -115,10 +77,10 @@ config :vae, Vae.Scheduler,
       schedule: "0 5 * * *", # 5AM every day
       task: {Vae.UserApplications.FollowUp, :send_unsubmitted_raise_email, []}
     ],
-    get_admissibility_updates: [
-      schedule: "30 5 * * *", # 5.30AM every day
-      task: {Vae.UserApplications.FollowUp, :send_admissibility_update_email, []}
-    ],
+    # get_admissibility_updates: [
+    #   schedule: "30 5 * * *", # 5.30AM every day
+    #   task: {Vae.UserApplications.FollowUp, :send_admissibility_update_email, []}
+    # ],
     send_delegate_recap: [
       schedule: "45 5 1,15 * *", # 5.45AM first and 15th of month
       task: {Vae.UserApplications.FollowUp, :send_delegate_recap_email, []}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,6 +37,8 @@ services:
     command: yarn setup
     depends_on:
       - nginx
+    environment:
+      - NODE_OPTIONS=--openssl-legacy-provider
     env_file:
       - ./.env
     healthcheck:
@@ -45,7 +47,7 @@ services:
       timeout: 3s
       retries: 3
       start_period: 1m
-    image: node:16.17.0
+    image: node:18.15.0
     volumes:
       - ../avril-livret1:/app
       - ./scripts/utils/healthcheck_retry.sh:/healthcheck_retry.sh
@@ -54,6 +56,8 @@ services:
     command: yarn setup
     depends_on:
       - nginx
+    environment:
+      - NODE_OPTIONS=--openssl-legacy-provider
     env_file:
       - ./.env
     healthcheck:
@@ -62,7 +66,7 @@ services:
       timeout: 3s
       retries: 3
       start_period: 1m
-    image: node:16.17.0
+    image: node:18.15.0
     volumes:
       - ../avril-profil:/app
       - ./scripts/utils/healthcheck_retry.sh:/healthcheck_retry.sh

diff --git a/lib/vae/user_applications/config.ex b/lib/vae/user_applications/config.ex
diff --git a/lib/vae/user_applications/polls.ex b/lib/vae/user_applications/polls.ex
diff --git a/lib/vae_web/controllers/user_application_controller.ex b/lib/vae_web/controllers/user_application_controller.ex
@@ -2,7 +2,7 @@ defmodule VaeWeb.UserApplicationController do
   require Logger
   use VaeWeb, :controller
 
-  alias Vae.{UserApplications.Polls, Certification, Delegate, Identity, User, UserApplication, Repo}
+  alias Vae.{Certification, Delegate, Identity, User, UserApplication, Repo}
   alias Vae.Booklet.{Cerfa, Education, CurrentSituation}
   plug VaeWeb.Plugs.ApplicationAccess,
        [verify_with_hash: :delegate_access_hash] when action in [:show, :cerfa]
@@ -100,34 +100,32 @@ defmodule VaeWeb.UserApplicationController do
   end
 
   def admissible(conn, %{"id" => id}) do
-    Repo.get(UserApplication, id)
-    |> case do
-      nil ->
-        redirect(conn, to: Routes.root_path(conn, :index))
-
-      application ->
-        UserApplication.admissible_now(application)
-
-        conn
-        |> put_flash(:success, "Merci pour votre réponse")
-        |> redirect(to: Routes.root_path(conn, :index))
-    end
+    user_application_admissibility_status(conn, true, id)
   end
 
   def inadmissible(conn, %{"id" => id}) do
+    user_application_admissibility_status(conn, false, id)
+  end
+
+  defp user_application_admissibility_status(conn, is_admissible, id) do
     Repo.get(UserApplication, id)
-    |> Repo.preload(delegate: :certifiers)
     |> case do
       nil ->
-        redirect(conn, to: Routes.root_path(conn, :index))
+        conn
+        |> Phoenix.Controller.put_flash(:warning, "La candidature n'a pas été trouvée")
+        |> Phoenix.Controller.redirect(conn, to: Routes.root_path(conn, :index))
 
       application ->
-        UserApplication.inadmissible_now(application)
-
-        url_form = Polls.define_form_url_from_application(application)
+        if is_admissible do
+          UserApplication.admissible_now(application)
+        else
+          UserApplication.inadmissible_now(application)
+        end
 
         conn
-        |> redirect(external: url_form || Routes.root_path(conn, :index))
+        |> Phoenix.Controller.put_flash(:success, "Merci pour votre réponse")
+        |> Phoenix.Controller.redirect(to: Routes.root_path(conn, :index))
     end
+
   end
 end