From 5180f8e84a2b4e5939e958d95508a3c881b370f3 Mon Sep 17 00:00:00 2001 From: Rik Smale Date: Sun, 8 Dec 2024 12:14:27 +0100 Subject: [PATCH 1/2] fix(core): add mail for new members to workspace admins --- .../page/workspace_new_member.html.eex | 73 +++++++++++++++++++ .../controllers/page_controller_test.exs | 7 ++ 2 files changed, 80 insertions(+) create mode 100644 lib/omsmailer_web/templates/page/workspace_new_member.html.eex diff --git a/lib/omsmailer_web/templates/page/workspace_new_member.html.eex b/lib/omsmailer_web/templates/page/workspace_new_member.html.eex new file mode 100644 index 0000000..1cf1e3e --- /dev/null +++ b/lib/omsmailer_web/templates/page/workspace_new_member.html.eex @@ -0,0 +1,73 @@ + + + + +<%= render(OmsmailerWeb.SnippetsView, "head.html", title: "MyAEGEE: A new member has joined their first local") %> + + + + + + + + + + +
  + + + + + + +
+ + + + + + +
+
 
+
+ + + + + + + + + +
+ Logo +
+
A new member has joined their first local!
+
First name: <%= @parameters["member_firstname"] %>
+
Last name: <%= @parameters["member_firstname"] %>
+
Email: <%= @parameters["member_email"] %>
+ +
+ + + + + + +
+
This email was autogenerated by MyAEGEE mailer.
+
+
+
+ + + + + + diff --git a/test/omsmailer_web/controllers/page_controller_test.exs b/test/omsmailer_web/controllers/page_controller_test.exs index 756ec6c..b8bca40 100644 --- a/test/omsmailer_web/controllers/page_controller_test.exs +++ b/test/omsmailer_web/controllers/page_controller_test.exs @@ -130,6 +130,13 @@ defmodule OmsmailerWeb.PageControllerTest do assert_email_delivered_with(subject: "pirates") end + # Workspace new member works + test "POST / workspace_new_member", %{conn: conn} do + conn = post conn, "/", %{template: "workspace_new_member.html", parameters: %{member_firstname: "Franz", member_lastname: "Ferdinant", user_id: 1, email: "f.ferdinant@aegee.test"}, from: "mailer@aegee.org", to: "test@aegee.org", subject: "pirates"} + assert json_response(conn, 200) + assert_email_delivered_with(subject: "pirates") + end + # Membership expired test "POST / membership expired", %{conn: conn} do conn = post conn, "/", %{template: "membership_expired.html", parameters: %{body: "AEGEE-Dresden", last_payment: "2018-11-23T08:51:04.038159"}, from: "mailer@aegee.org", to: "test@aegee.org", subject: "pirates"} From 7c097881893006016297fd0253d73d304fcdf13f Mon Sep 17 00:00:00 2001 From: Rik Smale <13023439+WikiRik@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:48:13 +0100 Subject: [PATCH 2/2] chore: fix typo Co-authored-by: Leon Vreling <49942406+LeonVreling@users.noreply.github.com> --- lib/omsmailer_web/templates/page/workspace_new_member.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/omsmailer_web/templates/page/workspace_new_member.html.eex b/lib/omsmailer_web/templates/page/workspace_new_member.html.eex index 1cf1e3e..a38ff5e 100644 --- a/lib/omsmailer_web/templates/page/workspace_new_member.html.eex +++ b/lib/omsmailer_web/templates/page/workspace_new_member.html.eex @@ -40,7 +40,7 @@
A new member has joined their first local!
First name: <%= @parameters["member_firstname"] %>
-
Last name: <%= @parameters["member_firstname"] %>
+
Last name: <%= @parameters["member_lastname"] %>
Email: <%= @parameters["member_email"] %>
Profile: " style="background-color:#1468C5;border-radius:50px;color:#ffffff;display:inline-block;font-family: 'lato', 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:18px;font-weight: bold;line-height:40px;text-align:center;text-decoration:none;width:270px;-webkit-text-size-adjust:none;" target="_blank">https://my.aegee.eu/members/<%= Map.fetch!(@parameters, "user_id") %>