Fix more bad bugs

main.rb

@@ -92,7 +92,7 @@ define_command("Solve", [
         event.respond content: "Correct! You've gained full access for this week.", ephemeral: true
         event.channel.send "<@#{event.user.id}> has given the solution and entered the club."
         # Create "solve" instance
-        Solve.create discord_id: event.user.id, puzzle: current_puzzle.id
+        Solve.create discord_id: event.user.id, puzzle_id: current_puzzle.id
         # TODO: Update "solves" count role
     else
         event.respond content: "Hmm, that's not the answer we're looking for.", ephemeral: true

send_puzzle_job.rb

@@ -13,6 +13,10 @@ class SendPuzzleJob < ActiveJob::Base
 
     # Set the previous puzzle as used
     current_puzzle = Puzzle.current.first
+    if current_puzzle.nil?
+      $study_channel.send "Aborting send puzzle job because there's no current puzzle"
+      self.class.enqueue
+    end
     current_puzzle.state = "used"
     last_public_id = current_puzzle.public_id
     current_puzzle.save
@@ -48,6 +52,7 @@ class SendPuzzleJob < ActiveJob::Base
   end
 
   def self.enqueue
-        self.set(wait: 1.minute).perform_later
+        # Get ready to send the next puzzle at the next UTC sunday
+        self.set(wait_until: Date.today.next_occurring(:sunday).beginning_of_day).perform_later
     end
 end

update_status_job.rb

@@ -25,7 +25,6 @@ class UpdateStatusJob < ActiveJob::Base
     end
 
     def self.enqueue
-        # Get ready to send the next puzzle at the next UTC sunday
-        self.set(wait_until: Date.today.next_occurring(:sunday).beginning_of_day).perform_later
+        self.set(wait: 1.minute).perform_later
     end
 end