cybersecurity/BreakEscape
1
0
Fork 0
mirror of https://github.com/cliffe/BreakEscape.git synced 2026-02-20 13:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Enhance inventory management by preventing duplicate items and adding error handling

Browse Source
This commit is contained in:
Z. Cliffe Schreuders
2026-02-13 16:44:31 +00:00
parent b27e603668
commit 1b7c112fbe
2 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/controllers/break_escape/games_controller.rb
View File

@@ -416,27 +416,38 @@ module BreakEscape
Rails.logger.info "[BreakEscape] inventory endpoint: action=#{action_type}, item=#{item.inspect}"
case action_type
when 'add'
# Validate item exists and is collectible
validation_error = validate_item_collectible(item)
if validation_error
Rails.logger.warn "[BreakEscape] inventory validation failed: #{validation_error}"
return render json: { success: false, message: validation_error },
status: :unprocessable_entity
begin
case action_type
when 'add'
# Validate item exists and is collectible
validation_error = validate_item_collectible(item)
if validation_error
Rails.logger.warn "[BreakEscape] inventory validation failed: #{validation_error}"
return render json: { success: false, message: validation_error },
status: :unprocessable_entity
end
Rails.logger.info "[BreakEscape] Adding item to inventory: #{item['type']} / #{item['name']}"
@game.add_inventory_item!(item.to_unsafe_h)
Rails.logger.info "[BreakEscape] Item added successfully. Current inventory size: #{@game.player_state['inventory']&.length}"
render json: { success: true, inventory: @game.player_state['inventory'] }
when 'remove'
@game.remove_inventory_item!(item['id'])
render json: { success: true, inventory: @game.player_state['inventory'] }
else
render json: { success: false, message: 'Invalid action' }, status: :bad_request
end
Rails.logger.info "[BreakEscape] Adding item to inventory: #{item['type']} / #{item['name']}"
@game.add_inventory_item!(item.to_unsafe_h)
Rails.logger.info "[BreakEscape] Item added successfully. Current inventory: #{@game.player_state['inventory'].inspect}"
render json: { success: true, inventory: @game.player_state['inventory'] }
when 'remove'
@game.remove_inventory_item!(item['id'])
render json: { success: true, inventory: @game.player_state['inventory'] }
else
render json: { success: false, message: 'Invalid action' }, status: :bad_request
rescue ActiveRecord::RecordInvalid => e
Rails.logger.error "[BreakEscape] Inventory save failed: #{e.message}"
render json: { success: false, message: "Failed to save inventory: #{e.message}" },
status: :unprocessable_entity
rescue => e
Rails.logger.error "[BreakEscape] Inventory error: #{e.class} - #{e.message}"
Rails.logger.error e.backtrace.join("\n")
render json: { success: false, message: "Inventory error: #{e.message}" },
status: :internal_server_error
end
end

21
app/models/break_escape/game.rb
View File

@@ -49,8 +49,25 @@ module BreakEscape
# Inventory management
def add_inventory_item!(item)
player_state['inventory'] ||= []
player_state['inventory'] << item
save!
# Check if item already exists in inventory (by id or combination of type and name)
item_exists = player_state['inventory'].any? do |existing_item|
# Match by ID if both have IDs
if item['id'].present? && existing_item['id'].present?
existing_item['id'] == item['id']
else
# Match by type and name as fallback
existing_item['type'] == item['type'] &&
existing_item['name'] == item['name']
end
end
unless item_exists
player_state['inventory'] << item
save!
else
Rails.logger.info "[BreakEscape] Item already in inventory, skipping: #{item['type']} / #{item['name']}"
end
end
def remove_inventory_item!(item_id)