Merge pull request rails#50240 from joshuay03/preserve-timezone-in-active-job-time-with-zone-serializer

[Fix rails#50230] Preserve serialized timezone when deserializing with `ActiveJob::Serializers::TimeWithZoneSerializer`

Author: byroot

activejob/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Preserve the serialized timezone when deserializing `ActiveSupport::TimeWithZone` arguments.
+
+    *Joshua Young*
+
 *   Remove deprecated `:exponentially_longer` value for the `:wait` in `retry_on`.
 
     *Rafael Mendonça França*

activejob/lib/active_job/serializers/time_with_zone_serializer.rb

@@ -2,9 +2,18 @@
 
 module ActiveJob
   module Serializers
-    class TimeWithZoneSerializer < TimeObjectSerializer # :nodoc:
+    class TimeWithZoneSerializer < ObjectSerializer # :nodoc:
+      NANO_PRECISION = 9
+
+      def serialize(time_with_zone)
+        super(
+          "value" => time_with_zone.iso8601(NANO_PRECISION),
+          "time_zone" => time_with_zone.time_zone.tzinfo.name
+        )
+      end
+
       def deserialize(hash)
-        Time.iso8601(hash["value"]).in_time_zone
+        Time.iso8601(hash["value"]).in_time_zone(hash["time_zone"] || Time.zone)
       end
 
       private

activejob/test/serializers/time_with_zone_serializer_test.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "helper"
+
+class TimeWithZoneSerializerTest < ActiveSupport::TestCase
+  test "#deserialize preserves serialized time zone" do
+    time_zone_before = Time.zone
+
+    Time.zone = "America/Los_Angeles"
+    time_with_zone = Time.parse("08:00").in_time_zone
+
+    assert_equal "America/Los_Angeles", time_with_zone.time_zone.tzinfo.name
+
+    serialized = ActiveJob::Serializers::TimeWithZoneSerializer.serialize(time_with_zone)
+    Time.zone = "Europe/London"
+    deserialized = ActiveJob::Serializers::TimeWithZoneSerializer.deserialize(serialized)
+
+    assert_equal "America/Los_Angeles", deserialized.time_zone.tzinfo.name
+    assert_equal time_with_zone, deserialized
+  ensure
+    Time.zone = time_zone_before
+  end
+end