From c03e7446e3d5e1323414039555d11a76abce2efe Mon Sep 17 00:00:00 2001
From: Emi Matchu <emi@matchu.dev>
Date: Sun, 3 Nov 2024 11:41:18 -0800
Subject: [PATCH] Refactor out biology assets in modeling code a bit

---
 app/models/pet.rb | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/models/pet.rb b/app/models/pet.rb
index 6aa6ef93..c2ee7e51 100644
--- a/app/models/pet.rb
+++ b/app/models/pet.rb
@@ -100,22 +100,9 @@ class Pet < ApplicationRecord
 
     def pet_state
       @pet_state ||= begin
-        # Choose the right biology, depending on if there's an alt style.
-        pet_state_biology = @custom_pet[:alt_style].present? ?
-          @custom_pet[:original_biology] :
-          @custom_pet[:biology_by_zone]
-        raise UnexpectedDataFormat if pet_state_biology.empty?
-
-        # Then, set up the biology assets.
-        body_id = @custom_pet[:body_id].to_i
-        swf_assets = pet_state_biology.values.map do |biology_data|
-          SwfAsset.from_biology_data(body_id, biology_data)
-        end
-        swf_asset_ids = swf_assets.map(&:remote_id).sort.join(",")
-
-        # Then, set up the pet state, using these biology assets.
+        swf_asset_ids = biology_assets.map(&:remote_id).sort.join(",")
         pet_type.pet_states.find_or_initialize_by(swf_asset_ids:).tap do |pet_state|
-          pet_state.swf_assets = swf_assets
+          pet_state.swf_assets = biology_assets
         end
       end
     end
@@ -144,6 +131,20 @@ class Pet < ApplicationRecord
         pet_type, @object_info_registry, @object_asset_registry
       )
     end
+
+    private
+
+    def biology_assets
+      @biology_assets ||= begin
+        biology = @custom_pet[:alt_style].present? ?
+          @custom_pet[:original_biology] :
+          @custom_pet[:biology_by_zone]
+        raise UnexpectedDataFormat if biology.empty?
+
+        body_id = @custom_pet[:body_id].to_i
+        biology.values.map { |b| SwfAsset.from_biology_data(body_id, b) }
+      end
+    end
   end
 end