Offline participation form: ask for missing/remaining pieces

app/models/completion.rb

@@ -34,16 +34,17 @@ class Completion < ApplicationRecord
   belongs_to :puzzle
   belongs_to :message, optional: true
 
-  before_save :add_time_seconds
+  before_save :add_time_seconds, if: -> { display_time_from_start.present? }
   before_save :nullify_display_time
 
   validates :display_time_from_start, presence: true, format: { with: /\A(((\d\d|\d):\d\d|\d\d|\d):\d\d|\d\d|\d)\z/ }, if: -> { remaining_pieces == nil }
   validates :contestant_id, uniqueness: { scope: :puzzle }, if: -> { contest.puzzles.size == 1 }
   validates :puzzle_id, uniqueness: { scope: :contestant }, if: -> { contest.puzzles.size > 1 }
-  validate :remaining_pieces_is_correct
+  validates :remaining_pieces, numericality: { only_integer: true }, if: -> { remaining_pieces.present? }
+  validate :remaining_pieces_is_correct, if: -> { remaining_pieces.present? }
 
   def remaining_pieces_is_correct
-    if self.remaining_pieces && self.remaining_pieces > self.puzzle.pieces
+    if self.remaining_pieces > self.puzzle.pieces
       errors.add(:remaining_pieces, "Cannot be greater than the number of pieces for this puzzle")
     end
   end

app/models/offline.rb

@@ -2,15 +2,17 @@
 #
 # Table name: offlines
 #
-#  id            :integer          not null, primary key
-#  completed     :boolean
-#  end_time      :datetime
-#  name          :string           not null
-#  start_time    :datetime         not null
-#  created_at    :datetime         not null
-#  updated_at    :datetime         not null
-#  contest_id    :integer          not null
-#  contestant_id :integer
+#  id               :integer          not null, primary key
+#  completed        :boolean
+#  end_time         :datetime
+#  missing_pieces   :integer
+#  name             :string           not null
+#  remaining_pieces :integer
+#  start_time       :datetime         not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  contest_id       :integer          not null
+#  contestant_id    :integer
 #
 # Indexes
 #
@@ -36,7 +38,27 @@ class Offline < ApplicationRecord
   validate :end_image_is_present
   validate :start_image_is_present
 
+  validates :missing_pieces, numericality: { only_integer: true }, if: -> { missing_pieces.present? }
+  validates :remaining_pieces, numericality: { only_integer: true }, if: -> { remaining_pieces.present? }
+  validate :missing_pieces_is_correct, if: -> { missing_pieces.present? }
+  validate :remaining_pieces_is_correct, if: -> { remaining_pieces.present? }
+
+  def missing_pieces_is_correct
+    if self.contest.puzzles.length > 0 && self.missing_pieces > self.contest.puzzles[0].pieces
+      errors.add(:remaining_pieces, "Cannot be greater than the number of pieces for this puzzle")
+    end
+  end
+
+  def remaining_pieces_is_correct
+    if self.contest.puzzles.length > 0 && self.remaining_pieces > self.contest.puzzles[0].pieces
+      errors.add(:remaining_pieces, "Cannot be greater than the number of pieces for this puzzle")
+    end
+  end
+
   def end_image_is_present
+    logger = Logger.new(STDOUT)
+    logger.info(self.missing_pieces)
+    logger.info(self.missing_pieces.present?)
     if self.completed && self.images.length < 2
       errors.add(:end_image, I18n.t("activerecord.errors.models.offline.attributes.end_image.blank"))
     end