Add identity validation and tidy some things up.

Author: plural

app/controllers/api/v3/public/validate_deck_controller.rb

@@ -33,7 +33,6 @@ def index
             deck['validations'] << v
           end
 
-          Rails.logger.info 'Deck is %s' % deck.inspect
           v = DeckValidator.new(deck)
 
           out[:attributes][:is_valid] = v.is_valid?

lib/deck_validator.rb

@@ -260,8 +260,6 @@ def all_ids_exist?
       @errors << '`identity_card_id` `%s` does not exist.' % @deck['identity_card_id']
     end
 
-    # TODO: basic deckbuilding should verify that none of the included cards are ids.
-
     # side_id is valid
     if not ['corp', 'runner'].include?(@deck['side_id'])
       @errors << '`side_id` `%s` does not exist.' % @deck['side_id']
@@ -314,6 +312,13 @@ def check_basic_deckbuilding_rules
       end
     end
 
+    # Identity cards may not be included as cards in decks.
+    @deck['cards'].each do |card_id, quantity|
+      if ['corp_identity', 'runner_identity'].include?(@cards[card_id].card_type_id)
+        local_errors << 'Decks may not include multiple identities.  Identity card `%s` is not allowed.' % card_id
+      end
+    end
+
     @identity = @cards[@deck['identity_card_id']]
 
     # Check deck size minimums

lib/validation request.json

@@ -38,58 +38,10 @@ standard_02_trieste_model_bioroids:
   card_id: trieste_model_bioroids
   card_pool_id: standard_02
 
-#standard_02_ikawah_project:
-#  card_id: ikawah_project
-#  card_pool_id: standard_02
-#
-#standard_02_project_vitruvius:
-#   card_id: project_vitruvius
-#   card_pool_id: standard_02
-
-# standard_02_regolith_mining_license:
-#   card_id: regolith_mining_license
-#   card_pool_id: standard_02
-
-# standard_02_spin_doctor:
-#   card_id: spin_doctor
-#   card_pool_id: standard_02
-
-# standard_02_biotic_labor:
-#   card_id: biotic_labor
-#   card_pool_id: standard_02
-
 standard_02_punitive_counterstrike:
   card_id: punitive_counterstrike
   card_pool_id: standard_02
 
-# standard_02_eli_1_0:
-#   card_id: eli_1_0
-#   card_pool_id: standard_02
-
-# standard_02_hagen:
-#   card_id: hagen
-#   card_pool_id: standard_02
-
-# standard_02_hakarl_1_0:
-#   card_id: hakarl_1_0
-#   card_pool_id: standard_02
-
-# standard_02_enigma:
-#   card_id: enigma
-#   card_pool_id: standard_02
-
-# standard_02_tollbooth:
-#   card_id: tollbooth
-#   card_pool_id: standard_02
-
-# standard_02_ansel_1_0:
-#   card_id: ansel_1_0
-#   card_pool_id: standard_02
-
-# standard_02_rototurret:
-#   card_id: rototurret
-#   card_pool_id: standard_02
-
 standard_02_tyr:
   card_id: tyr
   card_pool_id: standard_02
@@ -166,8 +118,8 @@ eternal_01_ark_lockdown:
   card_id: ark_lockdown
   card_pool_id: eternal_01
 
-eternal_01_geist:
-  card_id: geist
+eternal_01_armand_geist_walker_tech_lord:
+  card_id: armand_geist_walker_tech_lord
   card_pool_id: eternal_01
 
 eternal_01_artificial_cryptocrash:

lib/validation response.json

@@ -148,7 +148,7 @@ ark_lockdown:
 armand_geist_walker_tech_lord:
   card_type_id: "runner_identity"
   faction_id: criminal
-  id: "geist"
+  id: "armand_geist_walker_tech_lord"
   influence_limit: 15
   is_unique: false
   minimum_deck_size: 45

test/fixtures/card_pools_cards.yml

@@ -9,4 +9,3 @@ standard_restricted_trieste_model_bioroids:
   card_id: trieste_model_bioroids
   created_at: <%= Time.utc(2022, 12, 8, 12, 0).to_fs(:db) %>
   updated_at: <%= Time.utc(2022, 12, 8, 12, 0).to_fs(:db) %>
-

test/fixtures/cards.yml

@@ -32,7 +32,7 @@ def setup
       ]
     }
     @imaginary_side = {
-      'identity_card_id' => 'geist',
+      'identity_card_id' => 'armand_geist_walker_tech_lord',
       'side_id' => 'super_mega_corp',
       'cards' => { 'hedge_fund' => 3 },
       'validations' => [
@@ -54,7 +54,7 @@ def setup
       ]
     }
     @wrong_side_geist = {
-      'identity_card_id' => 'geist',
+      'identity_card_id' => 'armand_geist_walker_tech_lord',
       'side_id' => 'corp',
       'cards' => { 'hedge_fund' => 3 },
       'validations' => [
@@ -478,6 +478,29 @@ def test_is_valid_is_idempotent
     end
   end
 
+  def test_corp_identities_are_not_valid_cards_for_basic_deckbuilding
+    deck = swap_card(@good_ampere.deep_dup, 'ark_lockdown', 'asa_group_security_through_vigilance')
+
+    v = DeckValidator.new(deck)
+    assert !v.is_valid?
+    assert_equal 0, v.errors.size
+    assert_equal v.validations.size, deck['validations'].size
+    assert !v.validations[0].is_valid?
+    assert_includes v.validations[0].errors, 'Decks may not include multiple identities.  Identity card `asa_group_security_through_vigilance` is not allowed.'
+  end
+
+  def test_runner_identities_are_not_valid_cards_for_basic_deckbuilding
+    deck = @good_nova.deep_dup
+    deck['cards']['armand_geist_walker_tech_lord'] = 3
+
+    v = DeckValidator.new(deck)
+    assert !v.is_valid?
+    assert_equal 0, v.errors.size
+    assert_equal v.validations.size, deck['validations'].size
+    assert !v.validations[0].is_valid?
+    assert_includes v.validations[0].errors, 'Decks may not include multiple identities.  Identity card `armand_geist_walker_tech_lord` is not allowed.'
+  end
+
   def test_too_much_program_influence_professor
     v = DeckValidator.new(@too_much_program_influence_professor)
     assert !v.is_valid?
@@ -566,7 +589,7 @@ def test_mismatched_side_runner_id
     assert !v.is_valid?
     assert_equal v.validations.size, @wrong_side_geist['validations'].size
     assert !v.validations[0].is_valid?, 'Deck with mismatched id and specified side fails'
-    assert_includes v.validations[0].errors, "Identity `geist` has side `runner` which does not match given side `corp`"
+    assert_includes v.validations[0].errors, "Identity `armand_geist_walker_tech_lord` has side `runner` which does not match given side `corp`"
   end
 
   def test_not_enough_agenda_points