spree_cm_commissioner 1.8.6 → 1.8.7.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd5a0a2e3fc958b2a2e6bf0fd4dcd5773be9b512038dd183613b9586162c725
-  data.tar.gz: 3d37e405da973e87aa03bd9177dd3474d720106e8f44ac9524156623aa586d4a
+  metadata.gz: c5c82306658e75ae6622d3a57418ed2c33fa59431a139f6df65261ab4c66cc66
+  data.tar.gz: ad149426344cd2aed27ebbf8734e1200006db9cb849f2fb68e72ad3f5fb40afb
 SHA512:
-  metadata.gz: f16265bfb68e1ed87973e1b5afc987d99362e627f7a0072f56e10445712c2516b841a3a8285ee8f20961cbcf3eddfcfbacbd7829156b834875126b16834684fe
-  data.tar.gz: 7bde1b69e06d5e56ab2b505784f44e75ecf930ca381f19a758c851dfc7da721b9e24895da8b51553ff0ac613f5de1b0a6a24f27066917e768728bfdc062e27f1
+  metadata.gz: 601ff2d02e0a2054ec59ab126e4c9fc078f23f4e275e24bf9180ed5048d9a3bcbacd4b27a3f94a74e2efe69552fad35365bacacac050a9feeade522fd56eb50a
+  data.tar.gz: 23a7212be5f02cdfb1d9b9e5b3be810c2d37e8e3eb33ea98feb2b6a6ca537a2d8f5dd6157e7c8f7e54146f8234e9e7d58fea670d47dd6282a87f1d47b0f3adb5

data/Gemfile.lock

@@ -34,12 +34,13 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.6)
+    spree_cm_commissioner (1.8.7.pre.beta1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
       aws-sdk-ecs
       aws-sdk-s3
+      blazer (~> 3.0.0)
       byebug
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
@@ -215,6 +216,12 @@ GEM
     base64 (0.1.1)
     bcrypt (3.1.19)
     bigdecimal (3.1.8)
+    blazer (3.0.4)
+      activerecord (>= 6.1)
+      chartkick (>= 5)
+      csv
+      railties (>= 6.1)
+      safely_block (>= 0.4)
     bootstrap (4.6.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.16.1, < 2)
@@ -238,6 +245,7 @@ GEM
     capybara-select-2 (0.5.1)
     carmen (1.1.3)
       activesupport (>= 3.0.0)
+    chartkick (5.1.4)
     chunky_png (1.4.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
@@ -253,6 +261,7 @@ GEM
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
+    csv (3.3.3)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -698,6 +707,7 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    safely_block (0.4.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)

data/app/controllers/blazer/base_controller_decorator.rb

@@ -1,10 +1,15 @@
+# https://stackoverflow.com/questions/77318060/blazer-raised-activerecordconnectionnotestablished
 module Blazer
   module BaseControllerDecorator
     def self.prepended(base)
+      base.around_action :set_writing_role
       base.before_action :restrict_organizer_access
     end
 
-    private
+    # Annonymous block: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Naming/BlockForwarding
+    def set_writing_role(&block)
+      ActiveRecord::Base.connected_to(role: :writing, &block)
+    end
 
     def restrict_organizer_access
       return unless spree_current_user.organizer? && !spree_current_user.admin?
@@ -15,4 +20,4 @@ module Blazer
   end
 end
 
-Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) if defined?(Blazer::BaseController)
+Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) unless Blazer::BaseController.ancestors.include?(Blazer::BaseControllerDecorator)

data/config/routes.rb

@@ -1,5 +1,10 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
+
+  authenticate :spree_user, -> (user) { user.admin? || user.organizer? } do
+    mount Blazer::Engine, at: 'admin/bi_reports'
+  end
+
   namespace :admin do
     post '/invalidate_api_caches', to: 'base#invalidate_api_caches'
 

data/db/migrate/20250403040036_install_blazer.rb

@@ -0,0 +1,47 @@
+class InstallBlazer < ActiveRecord::Migration[7.0]
+  def change
+    create_table :blazer_queries do |t|
+      t.references :creator
+      t.string :name
+      t.text :description
+      t.text :statement
+      t.string :data_source
+      t.string :status
+      t.timestamps null: false
+    end
+
+    create_table :blazer_audits do |t|
+      t.references :user
+      t.references :query
+      t.text :statement
+      t.string :data_source
+      t.datetime :created_at
+    end
+
+    create_table :blazer_dashboards do |t|
+      t.references :creator
+      t.string :name
+      t.timestamps null: false
+    end
+
+    create_table :blazer_dashboard_queries do |t|
+      t.references :dashboard
+      t.references :query
+      t.integer :position
+      t.timestamps null: false
+    end
+
+    create_table :blazer_checks do |t|
+      t.references :creator
+      t.references :query
+      t.string :state
+      t.string :schedule
+      t.text :emails
+      t.text :slack_channels
+      t.string :check_type
+      t.text :message
+      t.datetime :last_run_at
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/{20250327094626_create_spree_cm_commissioner_taxon_blazer_query.rb → 20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb}

@@ -7,4 +7,3 @@ class CreateSpreeCmCommissionerTaxonBlazerQuery < ActiveRecord::Migration[7.0]
     end
   end
 end
-

data/lib/generators/spree_cm_commissioner/install/install_generator.rb

@@ -12,10 +12,10 @@ module SpreeCmCommissioner
 
       def add_migrations
         gems = %i[
+          blazer
           spree_multi_vendor
           spree_cm_commissioner
         ]
-
         gems.each do |gem|
           run "bundle exec rake railties:install:migrations FROM=#{gem}"
         end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.6'.freeze
+  VERSION = '1.8.7-beta1'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -3,6 +3,7 @@ require 'spree_api_v1'
 require 'spree_backend'
 require 'spree_auth_devise'
 require 'spree_multi_vendor'
+require 'blazer'
 require 'spree_extension'
 
 require 'spree_cm_commissioner/engine'

data/spree_cm_commissioner.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_backend', spree_opts
   s.add_dependency 'spree_multi_vendor', '>= 2.4.1'
   s.add_dependency 'spree_extension'
-
   s.add_dependency 'activerecord-multi-tenant'
   s.add_dependency 'phonelib'
   s.add_dependency 'aws-sdk-ecs'
@@ -56,5 +55,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'counter_culture', '~> 3.2'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
+  s.add_dependency 'blazer', '~> 3.0.0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7.pre.beta1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -478,6 +478,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: blazer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Add (optional) extension description here
 email: you@example.com
 executables: []
@@ -2296,10 +2310,11 @@ files:
 - db/migrate/20250314013434_add_available_on_to_spree_taxons.rb
 - db/migrate/20250321041406_create_trip_connections.rb
 - db/migrate/20250327074327_add_hide_video_banner_to_spree_taxon.rb
-- db/migrate/20250327094626_create_spree_cm_commissioner_taxon_blazer_query.rb
 - db/migrate/20250328072717_add_description_to_spree_roles.rb
 - db/migrate/20250328072841_add_vendor_id_to_spree_roles.rb
 - db/migrate/20250328072947_remove_unique_constraint_from_name_in_spree_roles.rb
+- db/migrate/20250403040036_install_blazer.rb
+- db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2438,9 +2453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1