fix for local time issue and spec

Author: reemi1510

app/controllers/admin/notifications_controller.rb

@@ -3,7 +3,7 @@
 class Admin::NotificationsController < AdminController
   def index
     markdown_parser = Redcarpet::Markdown.new(CustomMarkdownRenderer)
-    @published_notification = Notification.published.first
+    @published_notification = Notification.currently_active.first
     if @published_notification
       @published_notification_message = markdown_parser.render(@published_notification[:notification_message])
     end
@@ -62,6 +62,14 @@ def create_notifications
                      user: current_user['email'],
                      published: true,
                      published_at: Time.zone.now,
-                     stop_datetime: notification_params[:stop_datetime])
+                     stop_datetime: parsed_stop_datetime)
+  end
+
+  def parsed_stop_datetime
+    return nil if notification_params[:stop_datetime].blank?
+
+    Time.use_zone('Europe/London') do
+      Time.zone.parse(notification_params[:stop_datetime])
+    end
   end
 end

app/views/admin/notifications/new.html.haml

@@ -27,9 +27,10 @@
                 = @notification.errors[:stop_datetime].join(', ')
 
             - current_date = @notification.stop_datetime || @published_notification&.stop_datetime
+            - current_date_london = current_date&.in_time_zone('Europe/London')
             = form.datetime_local_field :stop_datetime, 
               class: "govuk-input", 
-              value: current_date&.strftime("%Y-%m-%dT%H:%M")
+              value: current_date_london&.strftime("%Y-%m-%dT%H:%M")
           %button.govuk-button.govuk-button--secondary{ type: "button", onclick: "document.getElementById('notification_stop_datetime').value = ''", class: "govuk-!-margin-top-1" }
             Clear date
 

spec/requests/admin/notifications_spec.rb

@@ -9,6 +9,33 @@
     get '/auth/google_oauth2/callback'
   end
 
+  describe '#create' do
+    around do |example|
+      travel_to(Time.utc(2026, 4, 20, 12, 0, 0)) { example.run }
+    end
+
+    it 'stores stop_datetime as Europ/London local time converted to UTC' do
+      london_input = '2026-04-20T14:15:00' # 2:15 PM London time on April 20, 2026
+
+      expect do
+        post admin_notifications_path, params: {
+          notification: {
+            summary: 'Test Notification',
+            notification_message: 'This is a test notification.',
+            stop_datetime: london_input
+          }
+        }
+      end.to change(Notification, :count).by(1)
+
+      notification = Notification.order(published_at: :desc).first
+
+      expected_time = ActiveSupport::TimeZone['Europe/London'].parse(london_input)
+
+      expect(notification.stop_datetime).to eq(expected_time)
+      expect(notification.stop_datetime.utc).to eq(expected_time.utc)
+    end
+  end
+
   describe '#preview' do
     it 'renders the Markdown content as HTML' do
       markdown_content = '**Bold Text**'