Skip to content

Repository navigation

Keep disabled subscriptions out of confirmation emails #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −20
Draft

Keep disabled subscriptions out of confirmation emails #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2487c5f
Initial plan
Copilot Nov 13, 2026
383abc7
Exclude disabled locations from confirmations
Copilot Nov 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions admin/Pages/CheckSubscription.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,22 @@
{
var isEnglish = "en".Equals(Model.SelectedRequestLang, StringComparison.OrdinalIgnoreCase);

<div class="alert alert-success" role="alert">
<p class="mb-0"><strong>User @Model.SelectedRequest?.email is subscribed!</strong></p>
<div class="alert @(Model.HasActiveLocations ? "alert-success" : "alert-warning")" role="alert">
@if (Model.HasActiveLocations)
{
<p class="mb-0"><strong>User @Model.SelectedRequest?.email is subscribed!</strong></p>
}
else
{
<p class="mb-0"><strong>User @Model.SelectedRequest?.email has no active subscriptions.</strong></p>
<p class="mb-0">All matching locations are disabled.</p>
<p class="mb-0">No confirmation email is available.</p>
}
<p class="mb-0">Found @Model.FoundLocations.Count location(s)</p>
</div>

<div class="card mt-3">
<div class="card-header bg-success text-white">
<div class="card-header @(Model.HasActiveLocations ? "bg-success text-white" : "bg-warning text-dark")">
<strong>Subscription Details</strong>
</div>
<div class="card-body">
Expand All @@ -82,6 +91,10 @@
{
<li class="list-group-item">
<strong>@location.city</strong> <span class="text-muted ms-2">@location.country</span>
@if (location.disabled)
{
<span class="badge text-bg-secondary ms-2">Disabled</span>
}
<br />
<small class="text-muted">
Channel: @(string.IsNullOrEmpty(location.channel) ? "N/A" : location.channel)
Expand All @@ -92,20 +105,23 @@
</div>
</div>

<div class="card mt-3 text-bg-light">
<div class="card-header">
Email Template to send to user
</div>
<div class="p-3 rounded mt-2 email-template">
<p><strong>To:</strong> <span class="email-selectable">@Model.SelectedRequest?.email</span></p>
<hr />
<p><strong>@(isEnglish ? "Subject" : "Objet"):</strong> <span class="email-selectable">@Model.EmailSubject</span></p>
<hr />
<div class="email-selectable">
@Html.Raw(Model.EmailHtmlBodyContent)
@if (Model.HasActiveLocations)
{
<div class="card mt-3 text-bg-light">
<div class="card-header">
Email Template to send to user
</div>
<div class="p-3 rounded mt-2 email-template">
<p><strong>To:</strong> <span class="email-selectable">@Model.SelectedRequest?.email</span></p>
<hr />
<p><strong>@(isEnglish ? "Subject" : "Objet"):</strong> <span class="email-selectable">@Model.EmailSubject</span></p>
<hr />
<div class="email-selectable">
@Html.Raw(Model.EmailHtmlBodyContent)
</div>
</div>
</div>
</div>
}

@if (Model.MailSent)
{
Expand All @@ -120,7 +136,7 @@
</div>
}

@if (!Model.MailSent || !string.IsNullOrEmpty(Model.MailError))
@if (Model.HasActiveLocations && (!Model.MailSent || !string.IsNullOrEmpty(Model.MailError)))
{
<div class="mt-3">
<form method="post">
Expand Down
21 changes: 17 additions & 4 deletions admin/Pages/CheckSubscription.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,27 @@ public class CheckSubscriptionModel(

private (string subject, string htmlBody, string textBody) GetEmailTemplate() =>
_emailTemplate ??= mailTemplates.For(SelectedRequestLang).SubscriptionConfirmation(
FoundLocations,
ActiveLocations,
ContactEmail,
addLinkToApp: "app".Equals(SelectedRequestSource, StringComparison.OrdinalIgnoreCase),
includeBodyTag: false);

public string EmailSubject => ShowResults && FoundLocations.Count > 0
public string EmailSubject => ShowResults && HasActiveLocations
? GetEmailTemplate().subject
: string.Empty;

public string EmailHtmlBodyContent => ShowResults && FoundLocations.Count > 0
public string EmailHtmlBodyContent => ShowResults && HasActiveLocations
? GetEmailTemplate().htmlBody
: string.Empty;

public IList<CheckSubscription> CheckSubscriptionRequests { get; private set; } = [];

public IList<Location> FoundLocations { get; private set; } = [];

public IList<Location> ActiveLocations => FoundLocations.Where(location => !location.disabled).ToList();

public bool HasActiveLocations => FoundLocations.Any(location => !location.disabled);

public string? SearchError { get; private set; }

public bool ShowResults { get; private set; }
Expand Down Expand Up @@ -134,8 +138,17 @@ public async Task<IActionResult> OnPostSendMailAsync()
FoundLocations = await locationService.FindValidLocationsByUserAsync(SelectedRequest.email, HttpContext.RequestAborted);
ShowResults = true;

if (!HasActiveLocations)
{
if (FoundLocations.Count == 0)
{
SearchError = $"No active locations found for {SelectedRequest.email}. User is not subscribed to any service.";
}
return Page();
}

var (subject, htmlBody, textBody) = mailTemplates.For(SelectedRequestLang).SubscriptionConfirmation(
FoundLocations,
ActiveLocations,
ContactEmail,
addLinkToApp: "app".Equals(SelectedRequestSource, StringComparison.OrdinalIgnoreCase));

Expand Down