Skip to content

Commit a020884

Browse files
committed
fix: speaker_management_link
Change-Id: I397f226fe6cfd34d782275586dd795f1e2bebde0
1 parent e821c4f commit a020884

7 files changed

+46
-6
lines changed

app/Jobs/Emails/EmailUtils.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php namespace App\Jobs\Emails;
2+
/*
3+
* Copyright 2024 OpenStack Foundation
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
**/
14+
15+
16+
use App\Models\Foundation\Summit\SelectionPlan;
17+
use Illuminate\Support\Facades\Config;
18+
use models\summit\Summit;
19+
20+
final class EmailUtils
21+
{
22+
/**
23+
* @param Summit $summit
24+
* @param SelectionPlan|null $selectionPlan
25+
* @return string
26+
*/
27+
public static function getSpeakerManagementLink(Summit $summit = null,?SelectionPlan $selectionPlan = null ):string{
28+
$speaker_management_base_url = Config::get('cfp.base_url');
29+
if(is_null($summit)) return $speaker_management_base_url;
30+
return is_null($selectionPlan)?
31+
sprintf("%s/app/%s", $speaker_management_base_url, $summit->getRawSlug()):
32+
sprintf("%s/app/%s/all-plans/%s", $speaker_management_base_url, $summit->getRawSlug(), $selectionPlan->getId());
33+
}
34+
}

app/Jobs/Emails/PresentationSubmissions/ImportEventSpeakerEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractSummitEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use Illuminate\Support\Facades\Config;
1718
use models\summit\Presentation;
@@ -72,7 +73,7 @@ public function __construct(Presentation $presentation, PresentationSpeaker $spe
7273
$payload[IMailTemplatesConstants::presentation_edit_link] = $presentation->getEditLink();
7374
$payload[IMailTemplatesConstants::until_date] =is_null($selection_plan) ? '' : $selection_plan->getSubmissionEndDate()->format('d F, Y');
7475
$payload[IMailTemplatesConstants::selection_process_link] = sprintf("%s/app/%s/selection_process", $speaker_management_base_url, $summit->getRawSlug());
75-
$payload[IMailTemplatesConstants::speaker_management_link] = sprintf("%s/app/%s", $speaker_management_base_url, $summit->getRawSlug());
76+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink($summit);
7677
$payload[IMailTemplatesConstants::bio_edit_link] = sprintf("%s/app/%s/profile", $speaker_management_base_url, $summit->getRawSlug());
7778
if(!empty($setPasswordLink)){
7879
$payload[IMailTemplatesConstants::bio_edit_link] = $setPasswordLink;

app/Jobs/Emails/PresentationSubmissions/PresentationCreatorNotificationEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractSummitEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use Illuminate\Support\Facades\Config;
1718
use models\summit\Presentation;
@@ -65,7 +66,7 @@ public function __construct(Presentation $presentation)
6566
$payload[IMailTemplatesConstants::until_date] = !is_null($submissionEndDateLocal) ? $submissionEndDateLocal->format('F d, Y') : "";
6667

6768
$payload[IMailTemplatesConstants::selection_process_link] = sprintf("%s/app/%s/%s/selection_process", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
68-
$payload[IMailTemplatesConstants::speaker_management_link] = sprintf("%s/app/%s/%s", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
69+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink($summit, $selection_plan);
6970
$payload[IMailTemplatesConstants::bio_edit_link] = sprintf("%s/app/%s/profile", $speaker_management_base_url, $summit->getRawSlug());
7071
$payload[IMailTemplatesConstants::reset_password_link] = sprintf("%s/auth/password/reset", $idp_base_url);
7172
$payload[IMailTemplatesConstants::support_email] = $support_email;

app/Jobs/Emails/PresentationSubmissions/PresentationModeratorNotificationEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractSummitEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use Illuminate\Support\Facades\Config;
1718
use models\summit\Presentation;
@@ -74,7 +75,7 @@ public function __construct(PresentationSpeaker $moderator, Presentation $presen
7475
$payload[IMailTemplatesConstants::until_date] = !is_null($submissionEndDateLocal) ? $submissionEndDateLocal->format('F d, Y') : "";
7576

7677
$payload[IMailTemplatesConstants::selection_process_link] = sprintf("%s/app/%s/%s/selection_process", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
77-
$payload[IMailTemplatesConstants::speaker_management_link] = sprintf("%s/app/%s/%s", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
78+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink($summit, $selection_plan);
7879
$payload[IMailTemplatesConstants::bio_edit_link] = sprintf("%s/app/%s/profile", $speaker_management_base_url, $summit->getRawSlug());
7980
$payload[IMailTemplatesConstants::reset_password_link] = sprintf("%s/auth/password/reset", $idp_base_url);
8081
$payload[IMailTemplatesConstants::support_email] = $support_email;

app/Jobs/Emails/PresentationSubmissions/PresentationSpeakerNotificationEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractSummitEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use Illuminate\Support\Facades\Config;
1718
use Illuminate\Support\Facades\Log;
@@ -76,7 +77,7 @@ public function __construct(PresentationSpeaker $speaker, Presentation $presenta
7677
$payload[IMailTemplatesConstants::until_date] = !is_null($submissionEndDateLocal) ? $submissionEndDateLocal->format('F d, Y') : "";
7778

7879
$payload[IMailTemplatesConstants::selection_process_link] = sprintf("%s/app/%s/%s/selection_process", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
79-
$payload[IMailTemplatesConstants::speaker_management_link] = sprintf("%s/app/%s/%s", $speaker_management_base_url, $summit->getRawSlug(), $selection_plan->getId());
80+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink($summit, $selection_plan);
8081
$payload[IMailTemplatesConstants::bio_edit_link] = sprintf("%s/app/%s/profile", $speaker_management_base_url, $summit->getRawSlug());
8182
$payload[IMailTemplatesConstants::reset_password_link] = sprintf("%s/auth/password/reset", $idp_base_url);
8283
$payload[IMailTemplatesConstants::support_email] = $support_email;

app/Jobs/Emails/PresentationSubmissions/SpeakerEditPermissionApprovedEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use App\Models\Foundation\Summit\Speakers\SpeakerEditPermissionRequest;
1718
use Illuminate\Support\Facades\Config;
@@ -41,7 +42,7 @@ public function __construct(SpeakerEditPermissionRequest $request)
4142
$payload = [];
4243
$payload[IMailTemplatesConstants::requested_by_full_name] = $request->getRequestedBy()->getFullName();
4344
$payload[IMailTemplatesConstants::speaker_full_name] = $request->getSpeaker()->getFullName();
44-
$payload[IMailTemplatesConstants::speaker_management_link] =
45+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink();
4546
$payload[IMailTemplatesConstants::tenant_name] = Config::get("app.tenant_name");
4647
$payload[IMailTemplatesConstants::requested_by_email] = $request->getRequestedBy()->getEmail();
4748
parent::__construct($payload, self::DEFAULT_TEMPLATE, $payload[IMailTemplatesConstants::requested_by_email]);

app/Jobs/Emails/PresentationSubmissions/SpeakerEditPermissionRejectedEmail.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* limitations under the License.
1313
**/
1414
use App\Jobs\Emails\AbstractEmailJob;
15+
use App\Jobs\Emails\EmailUtils;
1516
use App\Jobs\Emails\IMailTemplatesConstants;
1617
use App\Models\Foundation\Summit\Speakers\SpeakerEditPermissionRequest;
1718
use Illuminate\Support\Facades\Config;
@@ -41,7 +42,7 @@ public function __construct(SpeakerEditPermissionRequest $request)
4142
$payload = [];
4243
$payload[IMailTemplatesConstants::requested_by_full_name] = $request->getRequestedBy()->getFullName();
4344
$payload[IMailTemplatesConstants::speaker_full_name] = $request->getSpeaker()->getFullName();
44-
$payload[IMailTemplatesConstants::speaker_management_link] =
45+
$payload[IMailTemplatesConstants::speaker_management_link] = EmailUtils::getSpeakerManagementLink();
4546
$payload[IMailTemplatesConstants::tenant_name] = Config::get("app.tenant_name");
4647
$payload[IMailTemplatesConstants::requested_by_email] = $request->getRequestedBy()->getEmail();
4748
parent::__construct($payload, self::DEFAULT_TEMPLATE, $payload[IMailTemplatesConstants::requested_by_email]);

0 commit comments

Comments
 (0)