Merge branch 'main' into add-cards-and-format-id-to-snapshot-resource

Author: plural

app/resources/api/v3/public/format_resource.rb

@@ -9,8 +9,9 @@ class Api::V3::Public::FormatResource < JSONAPI::Resource
 
         paginator :none
 
-        has_many :snapshots
         has_many :card_pools
+        has_many :restrictions
+        has_many :snapshots
       end
     end
   end

app/resources/api/v3/public/snapshot_resource.rb

@@ -3,16 +3,25 @@ module V3
     module Public
       class Api::V3::Public::SnapshotResource < JSONAPI::Resource
         immutable
-        
-        attributes :format_id, :active, :date_start, :updated_at
+
+        attributes :format_id, :active, :card_cycle_ids, :card_set_ids, :date_start, :updated_at
         key_type :string
 
         paginator :none
 
         belongs_to :format
         has_one :card_pool
         has_one :restriction
+
         has_many :cards
+
+        def card_cycle_ids
+          @model.card_pool.card_pool_card_cycles.pluck(:card_cycle_id)
+        end
+
+        def card_set_ids
+          @model.card_pool.card_pool_card_sets.pluck(:card_set_id)
+        end
       end
     end
   end

lib/tasks/cards.rake

@@ -310,8 +310,8 @@ namespace :cards do
 
     # Collect each card pool's cycles
     card_pools.each do |p|
-      next if p['cycles'].nil?
-      p['cycles'].each do |s|
+      next if p['card_cycle_ids'].nil?
+      p['card_cycle_ids'].each do |s|
         card_pool_id_to_cycle_id << [p['id'], s]
       end
     end
@@ -353,8 +353,8 @@ namespace :cards do
 
     # Collect each card pool's sets
     card_pools.each do |p|
-      next if p['packs'].nil?
-      p['packs'].each do |s|
+      next if p['card_set_ids'].nil?
+      p['card_set_ids'].each do |s|
         card_pool_id_to_set_id << [p['id'], s]
       end
     end