model_driven_api 3.7.4 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1053d8f7e666ab9eb65f47714e9a02881028b261b10e4667b24ca8a4883eb45
-  data.tar.gz: d106be5cfe8eaff72ef75a9dfe910014af157f1726540197f97bc7d37b07993a
+  metadata.gz: 1f0f44e2c1015c731953af0fd3f2e05128e5e8d2493775a7788bd8ecab306f49
+  data.tar.gz: 2fd0bb9b281db660563a58890d7c287e5589043e32e5d5b1b30a828b6103f563
 SHA512:
-  metadata.gz: d970bb7e8bb28e5c04e03e35d2528b916d121741ee570c3fdd838f86b365f9a584147f5da9f7240e8e9444fe755632a09c452c1e3e25163746647f4d0d9c0f8b
-  data.tar.gz: 49d4d7cf759bc034dd48d43e006e277f356c0512e876843329bbf67856f82fbd19e26aa5b50633585c2548523123a007451fcd36364d379709350a314988356c
+  metadata.gz: 5498cd511a63b1a8ac368015b4e10786518a80d030aa9b9c93656a1870bda7c677076559e3b1061fec1a557dcab9faecc77a064b4b250f52598b1249dade435c
+  data.tar.gz: d3d2be5de0a1a2cc35a7db37b9cee0d8eaf8dbcb594e7b557bccda62354df909ba4258b70e9dd59f03ded31b73631a288e1acbdb1d0bd07c106847867cab7f8d

data/app/models/endpoints/push_subscriber.rb

@@ -57,30 +57,45 @@ class Endpoints::PushSubscriber < NonCrudEndpoints
 
   self.desc 'PushSubscriber', :send_push, {
     post: {
-      summary: 'Send a Web Push notification to a specific subscriber',
+      summary: 'Send Web Push to one subscriber (push_subscriber_id) or many (push_subscriber_ids array, async).',
       parameters: [],
       responses: {
-        '201' => { description: 'Message created and dispatched' },
+        '201' => { description: 'Single: message JSON. Bulk: { created: [...], failed: [...] }' },
         '422' => { description: 'Validation error' },
-        '404' => { description: 'Subscriber not found' }
+        '404' => { description: 'Subscriber not found (single mode only)' }
       }
     }
   }
 
   def send_push(params)
-    subscriber = PushSubscriber.active.find_by(id: params[:push_subscriber_id])
-    return [{ error: 'Subscriber not found' }, 404] unless subscriber
-    message = subscriber.push_messages.build(
-      title: params[:title],
-      body: params[:body],
-      url: params[:url],
-      icon: params[:icon]
-    )
-    unless message.save
-      return [{ error: message.errors.full_messages.join(', ') }, 422]
+    return [{ error: 'title is required' }, 422] if params[:title].blank?
+    return [{ error: 'body is required' }, 422] if params[:body].blank?
+
+    if params[:push_subscriber_ids].present?
+      send_push_bulk(params)
+    else
+      send_push_single(params)
     end
-    ThecoreBackendCommons::PushNotificationService.dispatch(subscriber, message)
-    [message, 201]
+  rescue => e
+    [{ error: e.message }, 500]
+  end
+
+  self.desc 'PushSubscriber', :broadcast_push, {
+    post: {
+      summary: 'Send Web Push to all active subscribers.',
+      parameters: [],
+      responses: {
+        '201' => { description: '{ enqueued: N } — number of jobs enqueued' },
+        '422' => { description: 'Validation error (title or body missing)' }
+      }
+    }
+  }
+
+  def broadcast_push(params)
+    return [{ error: 'title is required' }, 422] if params[:title].blank?
+    return [{ error: 'body is required' }, 422] if params[:body].blank?
+
+    broadcast_push_all(params)
   rescue => e
     [{ error: e.message }, 500]
   end
@@ -103,8 +118,89 @@ class Endpoints::PushSubscriber < NonCrudEndpoints
     now = Time.current
     message.update!(received_at: now) if params[:received] && message.received_at.nil?
     message.update!(read_at: now) if params[:read] && message.read_at.nil?
-    [message, 200]
+    [message.as_json(PushMessage.json_attrs), 200]
   rescue ActiveRecord::RecordInvalid => e
     [{ error: e.message }, 422]
   end
+
+  private
+
+  def send_push_single(params) # rubocop:disable Metrics/MethodLength
+    subscriber = PushSubscriber.active.find_by(id: params[:push_subscriber_id])
+    return [{ error: 'Subscriber not found' }, 404] unless subscriber
+
+    message = subscriber.push_messages.build(
+      title: params[:title],
+      body: params[:body],
+      url: params[:url],
+      icon: params[:icon]
+    )
+    return [{ error: message.errors.full_messages.join(', ') }, 422] unless message.save
+
+    ThecoreBackendCommons::PushNotificationService.dispatch(subscriber, message)
+    [message.as_json(PushMessage.json_attrs), 201]
+  end
+
+  def broadcast_push_all(params) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    active_ids = PushSubscriber.active.pluck(:id)
+    return [{ enqueued: 0 }, 201] if active_ids.empty?
+
+    now = Time.current
+    records = active_ids.map do |sub_id|
+      {
+        push_subscriber_id: sub_id,
+        title: params[:title],
+        body: params[:body],
+        url: params[:url].presence,
+        icon: params[:icon].presence,
+        message_type: params[:message_type].presence || 'communication',
+        sender_user_id: params[:current_user_id].presence,
+        created_at: now,
+        updated_at: now
+      }
+    end
+
+    returning_cols = %w[id push_subscriber_id title body url icon
+                        message_type sent_at received_at read_at
+                        created_at updated_at sender_user_id]
+    result = PushMessage.insert_all(records, returning: returning_cols)
+
+    created = result.to_a
+    created.each { |r| PushDispatchJob.perform_later(r['id']) }
+
+    [{ enqueued: created.length }, 201]
+  end
+
+  def send_push_bulk(params) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    ids = Array(params[:push_subscriber_ids]).map(&:to_i).uniq
+    valid_ids = PushSubscriber.active.where(id: ids).pluck(:id)
+    failed = ids - valid_ids
+
+    return [{ created: [], failed: failed }, 201] if valid_ids.empty?
+
+    now = Time.current
+    records = valid_ids.map do |sub_id|
+      {
+        push_subscriber_id: sub_id,
+        title: params[:title],
+        body: params[:body],
+        url: params[:url].presence,
+        icon: params[:icon].presence,
+        message_type: params[:message_type].presence || 'communication',
+        sender_user_id: params[:sender_user_id].presence,
+        created_at: now,
+        updated_at: now
+      }
+    end
+
+    returning_cols = %w[id push_subscriber_id title body url icon
+                        message_type sent_at received_at read_at
+                        created_at updated_at sender_user_id]
+    result = PushMessage.insert_all(records, returning: returning_cols)
+
+    created = result.to_a
+    created.each { |r| PushDispatchJob.perform_later(r['id']) }
+
+    [{ created: created, failed: failed }, 201]
+  end
 end

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.7.4".freeze
+  VERSION = "3.8.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.8.0
 platform: ruby
 authors:
 - Gabriele Tassoni