Merge pull request #511 from slovensko-digital/GO-151/fix_datetimes

GO-151 Fix datetimes fetched from FS API
slovensko-digital · Nov 19, 2024 · f1b3bdf · f1b3bdf
2 parents cee4643 + 42944ec
commit f1b3bdf
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 3 deletions.
diff --git a/app/models/fs/message.rb b/app/models/fs/message.rb
@@ -66,7 +66,7 @@ def self.create_inbox_message(raw_message)
       title: raw_message['message_type_name'],
       sender_name: FS_SUBJECT_NAME,
       recipient_name: raw_message['subject'],
-      delivered_at: Time.parse(raw_message['created_at']).getlocal,
+      delivered_at: Time.zone.parse(raw_message['created_at']),
       replyable: false,
       collapsed: collapsed?,
       outbox: false,
@@ -78,7 +78,7 @@ def self.create_inbox_message(raw_message)
         "fs_submission_status": raw_message['submission_status'],
         "fs_message_type": raw_message.dig('message_container', 'message_type'),
         "fs_submission_type_id": raw_message['submission_type_id'], # TODO kde pouzit? asi napr. pri vytvarani nazvu suboru pri exporte
-        "fs_submission_created_at": Time.parse(raw_message['submission_created_at']).getlocal,
+        "fs_submission_created_at": Time.zone.parse(raw_message['submission_created_at']),
         "fs_period": raw_message['period'],
         "fs_dismissal_reason": raw_message['dismissal_reason'],
         "fs_other_attributes": raw_message['other_attributes'],
@@ -93,7 +93,7 @@ def self.create_outbox_message(raw_message, associated_message_draft: nil)
       title: raw_message['submission_type_name'],
       sender_name: raw_message['subject'],
       recipient_name: FS_SUBJECT_NAME,
-      delivered_at: Time.parse(raw_message['created_at']).getlocal,
+      delivered_at: Time.zone.parse(raw_message['created_at']),
       replyable: false,
       collapsed: collapsed?,
       outbox: true,

diff --git a/test/models/fs/message_test.rb b/test/models/fs/message_test.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "active_support/all"
+
+class Fs::MessageTest < ActiveSupport::TestCase
+  test "#create_inbox_messages creates new message with delivered_at and fs_submission_created_at values in same format" do
+    raw_message = {
+      "created_at" => "2024-06-05T10:27:03.105Z",
+      "message_id" => "12345689/2024",
+      "submission_type_id" => "3079",
+      "submission_type_name" => "Podanie pre FS  (Správa daní) – späťvzatie žiadosti",
+      "message_type_id" => "DRSR_POPP_v02",
+      "message_type_name" => "Informácia o podaní",
+      "sent_message_id" => "12345689/2024",
+      "seen" => true,
+      "is_ekr2" => true,
+      "status" => "Vybavená",
+      "submission_status" => "Prijaté a potvrdené",
+      "dic" => "1122222333",
+      "subject" => "xy",
+      "submitting_subject" => "xy",
+      "submission_created_at" => "2024-06-05T10:27:01.433Z",
+      "period" => nil,
+      "dismissal_reason" => nil,
+      "message_container" =>
+        {
+          "message_id" => SecureRandom.uuid,
+          "sender_id" => "FSSR",
+          "recipient_id" => "1122222333",
+          "message_type" => "ED.DeliveryReport",
+          "subject" => "x",
+          "objects" => [
+            {
+              "class" => "FORM",
+              "description" => "DeliveryReport",
+              "encoding" => "Base64",
+              "id" => SecureRandom.uuid,
+              "signed" => true,
+              "mime_type" => "application/vnd.etsi.asic-e+zip",
+              "name" => "DeliveryReport",
+              "content" =>
+                "content xy"
+            }
+          ]
+        }
+    }
+
+    message = Fs::Message.create_inbox_message(raw_message)
+
+    assert_equal '2024-06-05 12:27:03 +0200', message.delivered_at.to_s
+    assert_equal '2024-06-05T12:27:01.433+02:00', message.metadata['fs_submission_created_at']
+  end
+end