Bridge Device to ApplicationPushDevice (#60)

Drop the standalone Device model and consolidate push-token
registration onto ApplicationPushDevice (subclass of
ActionPushNative::Device) so deliver_by :action_push_native actually
fires for tokens registered via POST /api/v1/shopkeeper/devices.

- Drop devices table; rebuild action_push_native_devices with UUID
  primary key + UUID polymorphic owner + bundle_id / last_active_at
  columns + unique (platform, token) index
- Move validations / active scope / last_active_at touching from
  Device onto ApplicationPushDevice
- Shopkeeper has_many :application_push_devices, as: :owner
- DevicesController now manages ApplicationPushDevice; JSONAPI type
  stays "device" via set_type :device on the new serializer
- API contract change (pre-mobile-client): device.platform enum is
  now [apple, google] (matches Action Push Native's APNs/FCM
  convention). PRs #3-5 (iOS/Android substrate clients) will
  register with apple or google.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: dadachi

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+- Drop the standalone `Device` model and consolidate push-token registration onto `ApplicationPushDevice` (subclass of `ActionPushNative::Device`) so `deliver_by :action_push_native` actually fires for tokens registered via `POST /api/v1/shopkeeper/devices`. The custom `devices` table is dropped; `action_push_native_devices` is rebuilt with UUID primary key + UUID polymorphic owner + `bundle_id` / `last_active_at` columns + unique `(platform, token)` index.
+- API contract change (still pre-mobile-client): `device.platform` enum is now `[apple, google]` (matches Action Push Native's APNs/FCM service convention) instead of `[ios, android]`. Mobile substrate clients (PRs #3-5) will register with `apple` or `google`.
+- Renames: `Device` → `ApplicationPushDevice`, `Api::Shopkeeper::DevicePolicy` → `Api::Shopkeeper::ApplicationPushDevicePolicy`, `DeviceSerializer` → `ApplicationPushDeviceSerializer` (JSONAPI `type` stays `device`); `Shopkeeper has_many :devices` → `has_many :application_push_devices, as: :owner`.
+
 ## 2026-05-10
 
 - Add push notifications scaffolding via `noticed` v2 (#58)

app/controllers/api/v1/shopkeeper/devices_controller.rb

@@ -8,18 +8,18 @@ class Api::V1::Shopkeeper::DevicesController < Api::V1::Shopkeeper::BaseControll
   # token to a different shopkeeper (e.g. user signed out + new user
   # signed in on same device) reassigns the device row.
   def create
-    authorize Device
+    authorize ApplicationPushDevice
 
-    device = Device.find_or_initialize_by(
+    device = ApplicationPushDevice.find_or_initialize_by(
       platform: device_params[:platform],
       token: device_params[:token]
     )
-    device.shopkeeper = current_shopkeeper
+    device.owner = current_shopkeeper
     device.bundle_id = device_params[:bundle_id]
     device.last_active_at = Time.current
 
     if device.save
-      render json: DeviceSerializer.new(device).serializable_hash, status: device.previously_new_record? ? :created : :ok
+      render json: ApplicationPushDeviceSerializer.new(device).serializable_hash, status: device.previously_new_record? ? :created : :ok
     else
       render_validation_error(device)
     end
@@ -36,7 +36,7 @@ def destroy
   private
 
   def set_device
-    @device = current_shopkeeper.devices.find(params[:id])
+    @device = current_shopkeeper.application_push_devices.find(params[:id])
   end
 
   def device_params

app/models/application_push_device.rb

@@ -1,4 +1,19 @@
 class ApplicationPushDevice < ActionPushNative::Device
+  # Inherits `enum :platform, {apple: "apple", google: "google"}, validate: true`
+  # from ActionPushNative::Device (apple = APNs, google = FCM).
+
+  validates :token, presence: true, uniqueness: {scope: :platform}
+
+  scope :active, -> { where("last_active_at > ?", 90.days.ago) }
+
+  before_validation :touch_last_active_at, on: :create
+
   # Customize TokenError handling (default: destroy!)
   # rescue_from (ActionPushNative::TokenError) { Rails.logger.error("Device #{id} token is invalid") }
+
+  private
+
+  def touch_last_active_at
+    self.last_active_at ||= Time.current
+  end
 end

app/models/device.rb

@@ -12,7 +12,7 @@ class Shopkeeper < ApplicationRecord
   has_many :created_shops, class_name: "Shop", foreign_key: :created_by_id, inverse_of: :created_by
   has_many :created_item_tags, class_name: "ItemTag", foreign_key: :created_by_id, inverse_of: :created_by, dependent: :nullify
   has_many :completed_item_tags, class_name: "ItemTag", foreign_key: :completed_by_id, inverse_of: :completed_by, dependent: :nullify
-  has_many :devices, dependent: :destroy
+  has_many :application_push_devices, as: :owner, class_name: "ApplicationPushDevice", dependent: :destroy
   has_many :notifications, as: :recipient, dependent: :destroy, class_name: "Noticed::Notification"
 
   attribute :token, :string

app/models/shopkeeper.rb

@@ -0,0 +1,9 @@
+class Api::Shopkeeper::ApplicationPushDevicePolicy < Api::Shopkeeper::BasePolicy
+  def create?
+    true
+  end
+
+  def destroy?
+    record.owner_type == "Shopkeeper" && record.owner_id == accounts_shopkeeper.shopkeeper_id
+  end
+end

app/policies/api/shopkeeper/application_push_device_policy.rb

@@ -1,6 +1,8 @@
-class DeviceSerializer
+class ApplicationPushDeviceSerializer
   include JSONAPI::Serializer
 
+  set_type :device
+
   attributes :token,
     :platform,
     :bundle_id,

app/policies/api/shopkeeper/device_policy.rb

@@ -0,0 +1,42 @@
+class ConsolidateDevicesIntoApplicationPushDevices < ActiveRecord::Migration[8.1]
+  def up
+    drop_table :devices
+
+    drop_table :action_push_native_devices
+
+    create_table :action_push_native_devices, id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+      t.string :name
+      t.string :platform, null: false
+      t.string :token, null: false
+      t.string :bundle_id
+      t.datetime :last_active_at
+      t.references :owner, polymorphic: true, type: :uuid
+      t.timestamps
+      t.index [:platform, :token], unique: true
+    end
+  end
+
+  def down
+    drop_table :action_push_native_devices
+
+    create_table :action_push_native_devices do |t|
+      t.string :name
+      t.string :platform, null: false
+      t.string :token, null: false
+      t.references :owner, polymorphic: true
+      t.timestamps
+    end
+
+    create_table :devices, id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+      t.string :bundle_id
+      t.datetime :last_active_at
+      t.string :platform, null: false
+      t.uuid :shopkeeper_id, null: false
+      t.string :token, null: false
+      t.timestamps
+      t.index [:platform, :token], unique: true
+      t.index [:shopkeeper_id]
+    end
+    add_foreign_key :devices, :shopkeepers
+  end
+end