add quest_id and lobby/background image sizes for raids

- add quest_id column to raids table
- add lobby and background image downloads using quest_id
- lobby uses quest_id with "1" appended
- background uses quest_id for treasureraid directory
This commit is contained in:
Justin Edmund 2026-01-06 03:52:30 -08:00
parent deb73e2536
commit 2dacfae17e
6 changed files with 72 additions and 6 deletions

View file

@ -13,7 +13,7 @@ module Api
} }
end end
fields :slug, :level, :element, :enemy_id, :summon_id fields :slug, :level, :element, :enemy_id, :summon_id, :quest_id
association :group, blueprint: RaidGroupBlueprint, view: :flat association :group, blueprint: RaidGroupBlueprint, view: :flat
end end

View file

@ -75,6 +75,9 @@ module Api
if size == 'thumbnail' && @raid.summon_id.blank? if size == 'thumbnail' && @raid.summon_id.blank?
return render json: { error: 'Raid has no summon_id configured' }, status: :unprocessable_entity return render json: { error: 'Raid has no summon_id configured' }, status: :unprocessable_entity
end end
if %w[lobby background].include?(size) && @raid.quest_id.blank?
return render json: { error: 'Raid has no quest_id configured' }, status: :unprocessable_entity
end
begin begin
downloader = Granblue::Downloaders::RaidDownloader.new( downloader = Granblue::Downloaders::RaidDownloader.new(
@ -151,7 +154,7 @@ module Api
end end
def raid_params def raid_params
params.require(:raid).permit(:name_en, :name_jp, :level, :element, :slug, :group_id, :enemy_id, :summon_id) params.require(:raid).permit(:name_en, :name_jp, :level, :element, :slug, :group_id, :enemy_id, :summon_id, :quest_id)
end end
def apply_filters(scope) def apply_filters(scope)

View file

@ -63,6 +63,11 @@ class RaidImageDownloadService
manifest['thumbnail'] = ["#{@raid.summon_id}_high.png"] manifest['thumbnail'] = ["#{@raid.summon_id}_high.png"]
end end
if @raid.quest_id
manifest['lobby'] = ["#{@raid.quest_id}1.png"]
manifest['background'] = ["#{@raid.quest_id}_raid_image_new.png"]
end
manifest manifest
end end

View file

@ -0,0 +1,5 @@
class AddQuestIdToRaids < ActiveRecord::Migration[8.0]
def change
add_column :raids, :quest_id, :bigint
end
end

View file

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_01_06_104115) do ActiveRecord::Schema[8.0].define(version: 2026_01_06_114730) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "btree_gin" enable_extension "btree_gin"
enable_extension "pg_catalog.plpgsql" enable_extension "pg_catalog.plpgsql"
@ -757,6 +757,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_01_06_104115) do
t.uuid "group_id" t.uuid "group_id"
t.integer "enemy_id" t.integer "enemy_id"
t.bigint "summon_id" t.bigint "summon_id"
t.bigint "quest_id"
end end
create_table "skill_effects", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| create_table "skill_effects", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|

View file

@ -3,21 +3,25 @@
module Granblue module Granblue
module Downloaders module Downloaders
# Downloads raid image assets from the game server. # Downloads raid image assets from the game server.
# Raids have two different image types from different sources: # Raids have four different image types from different sources:
# - Icon: from enemy directory using enemy_id # - Icon: from enemy directory using enemy_id
# - Thumbnail: from summon directory using summon_id # - Thumbnail: from summon directory using summon_id
# - Lobby: from quest/lobby directory using quest_id (with "1" appended)
# - Background: from quest/treasureraid directory using quest_id
# #
# @example Download images for a specific raid # @example Download images for a specific raid
# downloader = RaidDownloader.new(raid, storage: :both) # downloader = RaidDownloader.new(raid, storage: :both)
# downloader.download # downloader.download
# #
# @note Unlike other downloaders, RaidDownloader takes a Raid model instance # @note Unlike other downloaders, RaidDownloader takes a Raid model instance
# since it needs both enemy_id and summon_id # since it needs enemy_id, summon_id, and quest_id
class RaidDownloader < BaseDownloader class RaidDownloader < BaseDownloader
SIZES = %w[icon thumbnail].freeze SIZES = %w[icon thumbnail lobby background].freeze
ICON_BASE_URL = 'https://prd-game-a-granbluefantasy.akamaized.net/assets_en/img/sp/assets/enemy' ICON_BASE_URL = 'https://prd-game-a-granbluefantasy.akamaized.net/assets_en/img/sp/assets/enemy'
THUMBNAIL_BASE_URL = 'https://prd-game-a1-granbluefantasy.akamaized.net/assets_en/img/sp/assets/summon' THUMBNAIL_BASE_URL = 'https://prd-game-a1-granbluefantasy.akamaized.net/assets_en/img/sp/assets/summon'
LOBBY_BASE_URL = 'https://prd-game-a1-granbluefantasy.akamaized.net/assets_en/img/sp/quest/assets/lobby'
BACKGROUND_BASE_URL = 'https://prd-game-a-granbluefantasy.akamaized.net/assets_en/img/sp/quest/assets/treasureraid'
# Initialize with a Raid model instead of just an ID # Initialize with a Raid model instead of just an ID
# @param raid [Raid] Raid model instance # @param raid [Raid] Raid model instance
@ -52,6 +56,10 @@ module Granblue
download_icon(last: index == sizes.size - 1) download_icon(last: index == sizes.size - 1)
when 'thumbnail' when 'thumbnail'
download_thumbnail(last: index == sizes.size - 1) download_thumbnail(last: index == sizes.size - 1)
when 'lobby'
download_lobby(last: index == sizes.size - 1)
when 'background'
download_background(last: index == sizes.size - 1)
end end
end end
end end
@ -94,6 +102,42 @@ module Granblue
log_info "\t404 returned\t#{url}" log_info "\t404 returned\t#{url}"
end end
# Download the lobby image (from quest/lobby directory)
def download_lobby(last: false)
return unless @raid.quest_id
path = download_path('lobby')
url = build_lobby_url
filename = "#{@raid.quest_id}1.png"
s3_key = build_s3_key('lobby', filename)
download_uri = "#{path}/#{filename}"
return unless should_download?(download_uri, s3_key)
log_download('lobby', url, last: last)
process_image_download(url, download_uri, s3_key)
rescue OpenURI::HTTPError
log_info "\t404 returned\t#{url}"
end
# Download the background image (from quest/treasureraid directory)
def download_background(last: false)
return unless @raid.quest_id
path = download_path('background')
url = build_background_url
filename = "raid_image_new.png"
s3_key = build_s3_key('background', "#{@raid.quest_id}_raid_image_new.png")
download_uri = "#{path}/#{@raid.quest_id}_#{filename}"
return unless should_download?(download_uri, s3_key)
log_download('background', url, last: last)
process_image_download(url, download_uri, s3_key)
rescue OpenURI::HTTPError
log_info "\t404 returned\t#{url}"
end
def log_download(size, url, last: false) def log_download(size, url, last: false)
if last if last
log_info "\t#{size}: #{url}..." log_info "\t#{size}: #{url}..."
@ -121,6 +165,14 @@ module Granblue
"#{THUMBNAIL_BASE_URL}/qm/#{@raid.summon_id}_high.png" "#{THUMBNAIL_BASE_URL}/qm/#{@raid.summon_id}_high.png"
end end
def build_lobby_url
"#{LOBBY_BASE_URL}/#{@raid.quest_id}1.png"
end
def build_background_url
"#{BACKGROUND_BASE_URL}/#{@raid.quest_id}/raid_image_new.png"
end
def object_type def object_type
'raid' 'raid'
end end