#399

backend/app/models/post.rb

@@ -2,6 +2,13 @@ class Post < ApplicationRecord
   require 'mini_magick'
   require 'stringio'
 
+  ORIGINAL_CREATED_INVALID_MESSAGE = 'オリジナルの作成日時の形式が不正です．'.freeze
+  ORIGINAL_CREATED_MINUTE_PRECISION_MESSAGE =
+      'オリジナルの作成日時は分単位で入力してください．'.freeze
+  ORIGINAL_CREATED_ORDER_MESSAGE = 'オリジナルの作成日時の順番がをかしぃです．'.freeze
+  ORIGINAL_CREATED_MINIMUM_RANGE_MESSAGE =
+      'オリジナルの作成日時の範囲は1分以上必要です．'.freeze
+
   def self.resized_thumbnail_attachment(upload)
     upload.rewind
     image = MiniMagick::Image.read(upload.read)
@@ -143,16 +150,17 @@ class Post < ApplicationRecord
   private
 
   def validate_original_created_range
-    f = original_created_from
-    b = original_created_before
-    return if f.blank? || b.blank?
+    f = parse_original_created_value(:original_created_from)
+    b = parse_original_created_value(:original_created_before)
+    return if f.nil? || b.nil?
 
-    f = Time.zone.parse(f) if String === f
-    b = Time.zone.parse(b) if String === b
-    return if !(f) || !(b)
+    if b <= f
+      errors.add :original_created_at, ORIGINAL_CREATED_ORDER_MESSAGE
+      return
+    end
 
-    if f >= b
-      errors.add :original_created_at, 'オリジナルの作成日時の順番がをかしぃです．'
+    if b - f < 1.minute
+      errors.add :original_created_at, ORIGINAL_CREATED_MINIMUM_RANGE_MESSAGE
     end
   end
 
@@ -175,4 +183,49 @@ class Post < ApplicationRecord
 
     self.url = PostUrlNormaliser.normalise(url) || url.strip
   end
+
+  def parse_original_created_value field
+    raw_value = public_send("#{ field }_before_type_cast")
+    value = public_send(field)
+    return nil if raw_value.blank? && value.blank?
+
+    time =
+        case raw_value
+        when String
+          parse_original_created_string(raw_value)
+        when Time, ActiveSupport::TimeWithZone
+          raw_value.in_time_zone
+        else
+          value&.in_time_zone
+        end
+    if time.nil?
+      errors.add field, ORIGINAL_CREATED_INVALID_MESSAGE
+      return nil
+    end
+    unless minute_precision_time?(time)
+      errors.add field, ORIGINAL_CREATED_MINUTE_PRECISION_MESSAGE
+    end
+    time
+  end
+
+  def parse_original_created_string raw_value
+    value = raw_value.to_s.strip
+    return nil if value.blank?
+
+    if value.match?(/\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}\z/)
+      return Time.zone.local(value[0, 4].to_i,
+                             value[5, 2].to_i,
+                             value[8, 2].to_i,
+                             value[11, 2].to_i,
+                             value[14, 2].to_i)
+    end
+
+    Time.iso8601(value).in_time_zone
+  rescue ArgumentError, TypeError
+    nil
+  end
+
+  def minute_precision_time? value
+    value.sec.zero? && value.nsec.zero?
+  end
 end

backend/app/services/post_import_previewer.rb

@@ -250,8 +250,7 @@ class PostImportPreviewer
   def sanitise_metadata_time value
     return nil unless value.is_a?(String)
 
-    time = Time.iso8601(value)
-    time.nsec.zero? ? time.iso8601 : time.iso8601(9)
+    Time.iso8601(value).in_time_zone.change(sec: 0, nsec: 0).iso8601
   rescue ArgumentError, TypeError
     nil
   end

backend/app/services/post_metadata_fetcher.rb

@@ -81,26 +81,16 @@ class PostMetadataFetcher
     day = match[3].to_i
     hour = match[4].to_i
     minute = match[5]&.to_i || 0
-    second = match[6]&.to_i || 0
-    fraction = match[7]
     offset = match[8]
-    whole_second = second + fractional_seconds(fraction)
-    from =
+    timestamp =
         if offset.present?
-          Time.new(year, month, day, hour, minute, whole_second, parse_offset(offset)).in_time_zone
+          Time.new(year, month, day, hour, minute, 0, parse_offset(offset)).in_time_zone
         else
-          Time.zone.local(year, month, day, hour, minute, whole_second)
-        end
-    before =
-        if fraction.present?
-          from + (10**(-fraction.length))
-        elsif match[6].present?
-          from + 1.second
-        elsif match[5].present?
-          from + 1.minute
-        else
-          from + 1.hour
+          Time.zone.local(year, month, day, hour, minute)
         end
+
+    from = timestamp.change(sec: 0, nsec: 0)
+    before = from + 1.minute
     [from, before]
   end
 
@@ -110,12 +100,6 @@ class PostMetadataFetcher
     value.match?(/\A[+-]\d{2}:\d{2}\z/) ? value : "#{ value[0, 3] }:#{ value[3, 2] }"
   end
 
-  def self.fractional_seconds value
-    return 0 if value.blank?
-
-    Rational(value.to_i, 10**value.length)
-  end
-
   def self.serialise_time value
     return nil if value.nil?
 
@@ -126,6 +110,5 @@ class PostMetadataFetcher
                        :original_created_range,
                        :parse_timestamp_range,
                        :parse_offset,
-                       :fractional_seconds,
                        :serialise_time
 end