Merge branch 'main' into patch-2

Author: SkyfallWasTaken

app/controllers/admin/shop_items_controller.rb

@@ -60,6 +60,7 @@ def set_shop_item_types
 
     def available_shop_item_types
       [
+        "ShopItem::Accessory",
         "ShopItem::HCBGrant",
         "ShopItem::HCBPreauthGrant",
         "ShopItem::HQMailItem",
@@ -112,7 +113,9 @@ def shop_item_params
         :hcb_merchant_lock,
         :hcb_preauthorization_instructions,
         :agh_contents,
-        :image
+        :image,
+        :buyable_by_self,
+        attached_shop_item_ids: []
       )
     end
   end

app/controllers/admin/shop_orders_controller.rb

@@ -15,7 +15,7 @@ def index
     end
 
     # Base query
-    orders = ShopOrder.includes(:shop_item, :user)
+    orders = ShopOrder.includes(:shop_item, :user, :accessory_orders)
 
     # Apply view-specific scopes
     case @view

app/controllers/shop_controller.rb

@@ -14,13 +14,16 @@ def index
               .select { |item| item.enabled_in_region?(@user_region) }
               .first
     end
-    @shop_items = ShopItem.all.includes(:image_attachment)
+    @shop_items = ShopItem.buyable_standalone.includes(:image_attachment)
     @shop_items = @shop_items.where.not(type: "ShopItem::FreeStickers") if user_ordered_free_stickers?
     @user_balance = current_user.balance
   end
 
   def my_orders
-    @orders = current_user.shop_orders.includes(shop_item: { image_attachment: :blob }).order(id: :desc)
+    @orders = current_user.shop_orders
+                          .where(parent_order_id: nil)
+                          .includes(:accessory_orders, shop_item: { image_attachment: :blob })
+                          .order(id: :desc)
   end
 
   def cancel_order
@@ -35,6 +38,7 @@ def cancel_order
 
   def order
     @shop_item = ShopItem.find(params[:shop_item_id])
+    @accessories = @shop_item.available_accessories.includes(:image_attachment)
   end
 
   def update_region
@@ -43,7 +47,7 @@ def update_region
       current_user.update!(region: region)
 
       @user_region = region
-      @shop_items = ShopItem.all.includes(:image_attachment)
+      @shop_items = ShopItem.buyable_standalone.includes(:image_attachment)
       @shop_items = @shop_items.where.not(type: "ShopItem::FreeStickers") if user_ordered_free_stickers?
       @user_balance = current_user.balance
       @featured_item = unless user_ordered_free_stickers?
@@ -65,12 +69,20 @@ def update_region
   def create_order
     @shop_item = ShopItem.find(params[:shop_item_id])
     quantity = params[:quantity].to_i
+    accessory_ids = Array(params[:accessory_ids]).map(&:to_i).reject(&:zero?)
 
     if quantity <= 0
         redirect_to shop_order_path(shop_item_id: @shop_item.id), alert: "Quantity must be greater than 0"
         return
     end
 
+    # Validate accessories belong to this item
+    @accessories = if accessory_ids.any?
+      @shop_item.available_accessories.where(id: accessory_ids)
+    else
+      []
+    end
+
     # Create the order
     # This is a simplified version. In a real app, you'd want to:
     # 1. Check stock
@@ -81,12 +93,29 @@ def create_order
     @order = current_user.shop_orders.new(
       shop_item: @shop_item,
       quantity: quantity,
-      frozen_address: selected_address
+      frozen_address: selected_address,
+      accessory_ids: @accessories.pluck(:id)
     )
 
     @order.aasm_state = "pending" if @order.respond_to?(:aasm_state=)
 
-    if @order.save
+    begin
+      ActiveRecord::Base.transaction do
+        @order.save!
+
+        # Create orders for each accessory
+        @accessories.each do |accessory|
+          accessory_order = current_user.shop_orders.new(
+            shop_item: accessory,
+            quantity: 1,
+            frozen_address: selected_address,
+            parent_order_id: @order.id
+          )
+          accessory_order.aasm_state = "pending" if accessory_order.respond_to?(:aasm_state=)
+          accessory_order.save!
+        end
+      end
+
       if @shop_item.is_a?(ShopItem::FreeStickers)
         begin
           @shop_item.fulfill!(@order)
@@ -99,8 +128,8 @@ def create_order
         end
       end
       redirect_to shop_my_orders_path, notice: "Order placed successfully!"
-    else
-      redirect_to shop_order_path(shop_item_id: @shop_item.id), alert: "Failed to place order: #{@order.errors.full_messages.join(', ')}"
+    rescue ActiveRecord::RecordInvalid => e
+      redirect_to shop_order_path(shop_item_id: @shop_item.id), alert: "Failed to place order: #{e.record.errors.full_messages.join(', ')}"
     end
   end
 

app/models/post/devlog.rb

@@ -7,6 +7,7 @@
 #  duration_seconds                :integer
 #  hackatime_projects_key_snapshot :text
 #  hackatime_pulled_at             :datetime
+#  scrapbook_url                   :string
 #  created_at                      :datetime         not null
 #  updated_at                      :datetime         not null
 #

app/models/shop_item.rb

@@ -4,6 +4,8 @@
 #
 #  id                                :bigint           not null, primary key
 #  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
 #  description                       :string
 #  enabled                           :boolean
 #  enabled_au                        :boolean
@@ -67,6 +69,7 @@ class ShopItem < ApplicationRecord
   scope :shown_in_carousel, -> { where(show_in_carousel: true) }
   scope :manually_fulfilled, -> { where(type: MANUAL_FULFILLMENT_TYPES) }
   scope :enabled, -> { where(enabled: true) }
+  scope :buyable_standalone, -> { where.not(type: "ShopItem::Accessory").or(where(buyable_by_self: true)) }
 
   belongs_to :seller, class_name: "User", foreign_key: :user_id, optional: true
 
@@ -138,4 +141,12 @@ def remaining_stock
   def out_of_stock?
     limited? && remaining_stock && remaining_stock <= 0
   end
+
+  def available_accessories
+    ShopItem::Accessory.where("? = ANY(attached_shop_item_ids)", id).where(enabled: true)
+  end
+
+  def has_accessories?
+    available_accessories.exists?
+  end
 end

app/models/shop_item/accessory.rb

@@ -0,0 +1,93 @@
+# == Schema Information
+#
+# Table name: shop_items
+#
+#  id                                :bigint           not null, primary key
+#  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
+#  description                       :string
+#  enabled                           :boolean
+#  enabled_au                        :boolean
+#  enabled_ca                        :boolean
+#  enabled_eu                        :boolean
+#  enabled_in                        :boolean
+#  enabled_uk                        :boolean
+#  enabled_us                        :boolean
+#  enabled_xx                        :boolean
+#  hacker_score                      :integer
+#  hcb_category_lock                 :string
+#  hcb_keyword_lock                  :string
+#  hcb_merchant_lock                 :string
+#  hcb_preauthorization_instructions :text
+#  internal_description              :string
+#  limited                           :boolean
+#  max_qty                           :integer
+#  name                              :string
+#  one_per_person_ever               :boolean
+#  payout_percentage                 :integer          default(0)
+#  price_offset_au                   :decimal(, )
+#  price_offset_ca                   :decimal(, )
+#  price_offset_eu                   :decimal(, )
+#  price_offset_in                   :decimal(, )
+#  price_offset_uk                   :decimal(10, 2)
+#  price_offset_us                   :decimal(, )
+#  price_offset_xx                   :decimal(, )
+#  sale_percentage                   :integer
+#  show_in_carousel                  :boolean
+#  site_action                       :integer
+#  special                           :boolean
+#  stock                             :integer
+#  ticket_cost                       :decimal(, )
+#  type                              :string
+#  unlock_on                         :date
+#  usd_cost                          :decimal(, )
+#  created_at                        :datetime         not null
+#  updated_at                        :datetime         not null
+#  user_id                           :bigint
+#
+# Indexes
+#
+#  index_shop_items_on_user_id  (user_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (user_id => users.id)
+#
+class ShopItem::Accessory < ShopItem
+  validate :must_have_attached_items_if_not_buyable_by_self
+
+  def attached_shop_items
+    return ShopItem.none if attached_shop_item_ids.blank?
+
+    ShopItem.where(id: attached_shop_item_ids)
+  end
+
+  def can_be_purchased_standalone?
+    buyable_by_self?
+  end
+
+  def can_attach_to?(shop_item)
+    attached_shop_item_ids.include?(shop_item.id)
+  end
+
+  def total_cost_with(parent_item)
+    return nil unless can_attach_to?(parent_item)
+
+    ticket_cost + parent_item.ticket_cost
+  end
+
+  def standalone_cost
+    return nil unless can_be_purchased_standalone?
+
+    ticket_cost
+  end
+
+  private
+
+  def must_have_attached_items_if_not_buyable_by_self
+    if !buyable_by_self? && attached_shop_item_ids.blank?
+      errors.add(:attached_shop_item_ids, "must have at least one attached item when not buyable by self")
+    end
+  end
+end

app/models/shop_item/free_stickers.rb

@@ -4,6 +4,8 @@
 #
 #  id                                :bigint           not null, primary key
 #  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
 #  description                       :string
 #  enabled                           :boolean
 #  enabled_au                        :boolean

app/models/shop_item/h_c_b_grant.rb

@@ -4,6 +4,8 @@
 #
 #  id                                :bigint           not null, primary key
 #  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
 #  description                       :string
 #  enabled                           :boolean
 #  enabled_au                        :boolean

app/models/shop_item/h_c_b_preauth_grant.rb

@@ -4,6 +4,8 @@
 #
 #  id                                :bigint           not null, primary key
 #  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
 #  description                       :string
 #  enabled                           :boolean
 #  enabled_au                        :boolean

app/models/shop_item/h_q_mail_item.rb

@@ -4,6 +4,8 @@
 #
 #  id                                :bigint           not null, primary key
 #  agh_contents                      :jsonb
+#  attached_shop_item_ids            :bigint           default([]), is an Array
+#  buyable_by_self                   :boolean          default(TRUE)
 #  description                       :string
 #  enabled                           :boolean
 #  enabled_au                        :boolean