diff --git a/Gemfile.lock b/Gemfile.lock
index 3d70e0096..ebfeed2b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,8 +107,8 @@ GEM
aws-sdk-ses (~> 1, >= 1.50.0)
aws-sdk-sesv2 (~> 1, >= 1.34.0)
aws-eventstream (1.3.2)
- aws-partitions (1.1087.0)
- aws-sdk-core (3.222.1)
+ aws-partitions (1.1090.0)
+ aws-sdk-core (3.222.2)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
@@ -157,7 +157,7 @@ GEM
brakeman (7.0.2)
racc
builder (3.3.0)
- bullet (8.0.3)
+ bullet (8.0.5)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundler-audit (0.9.2)
@@ -186,7 +186,7 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.5)
- connection_pool (2.5.0)
+ connection_pool (2.5.1)
crass (1.0.6)
csv (3.3.4)
database_cleaner (2.1.0)
@@ -237,7 +237,7 @@ GEM
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
ffi (1.17.2-x86_64-linux-musl)
- fog-aws (3.30.0)
+ fog-aws (3.31.0)
base64 (~> 0.2.0)
fog-core (~> 2.6)
fog-json (~> 1.1)
@@ -327,7 +327,7 @@ GEM
mime-types (3.6.2)
logger
mime-types-data (~> 3.2015)
- mime-types-data (3.2025.0408)
+ mime-types-data (3.2025.0415)
mini_magick (5.2.0)
benchmark
logger
@@ -340,7 +340,7 @@ GEM
bigdecimal (~> 3.1)
net-http (0.6.0)
uri
- net-imap (0.5.6)
+ net-imap (0.5.7)
date
net-protocol
net-pop (0.1.2)
@@ -351,24 +351,24 @@ GEM
net-protocol
newrelic_rpm (9.18.0)
nio4r (2.7.4)
- nokogiri (1.18.7)
+ nokogiri (1.18.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- nokogiri (1.18.7-aarch64-linux-gnu)
+ nokogiri (1.18.8-aarch64-linux-gnu)
racc (~> 1.4)
- nokogiri (1.18.7-aarch64-linux-musl)
+ nokogiri (1.18.8-aarch64-linux-musl)
racc (~> 1.4)
- nokogiri (1.18.7-arm-linux-gnu)
+ nokogiri (1.18.8-arm-linux-gnu)
racc (~> 1.4)
- nokogiri (1.18.7-arm-linux-musl)
+ nokogiri (1.18.8-arm-linux-musl)
racc (~> 1.4)
- nokogiri (1.18.7-arm64-darwin)
+ nokogiri (1.18.8-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.18.7-x86_64-darwin)
+ nokogiri (1.18.8-x86_64-darwin)
racc (~> 1.4)
- nokogiri (1.18.7-x86_64-linux-gnu)
+ nokogiri (1.18.8-x86_64-linux-gnu)
racc (~> 1.4)
- nokogiri (1.18.7-x86_64-linux-musl)
+ nokogiri (1.18.8-x86_64-linux-musl)
racc (~> 1.4)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
@@ -510,7 +510,7 @@ GEM
rspec-support (3.13.2)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (1.75.2)
+ rubocop (1.75.3)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
@@ -530,7 +530,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
- rubocop-rspec (3.5.0)
+ rubocop-rspec (3.6.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
ruby-graphviz (1.2.5)
@@ -570,8 +570,9 @@ GEM
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
- sprockets (4.2.1)
+ sprockets (4.2.2)
concurrent-ruby (~> 1.0)
+ logger
rack (>= 2.2.4, < 4)
sprockets-rails (3.5.2)
actionpack (>= 6.1)
@@ -580,7 +581,7 @@ GEM
ssrf_filter (1.2.0)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
- stringio (3.1.6)
+ stringio (3.1.7)
thor (1.3.2)
thread_safe (0.3.6)
tilt (2.6.0)
@@ -596,7 +597,7 @@ GEM
uniform_notifier (1.16.0)
uri (1.0.3)
useragent (0.16.11)
- version_gem (1.1.6)
+ version_gem (1.1.7)
virtus (2.0.0)
axiom-types (~> 0.1)
coercible (~> 1.0)
diff --git a/app/controllers/admin/barriers_controller.rb b/app/controllers/admin/barriers_controller.rb
deleted file mode 100644
index e03beebf3..000000000
--- a/app/controllers/admin/barriers_controller.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
- class BarriersController < AdminController
- before_action :ensure_admin
- before_action :set_barrier, only: %i[show edit update destroy]
-
- def index
- @barriers = Barrier.all
- end
-
- def show; end
-
- def new
- @barrier = Barrier.new
- end
-
- def edit; end
-
- def create
- @barrier = Barrier.new(barrier_params)
-
- if @barrier.save
- redirect_to admin_barrier_path(@barrier), notice: 'Barrier was successfully created.'
- else
- render :new
- end
- end
-
- def update
- if @barrier.update(barrier_params)
- redirect_to admin_barrier_path(@barrier), notice: 'Barrier was successfully updated.'
- else
- render :edit
- end
- end
-
- def destroy
- @barrier.destroy
- redirect_to admin_barriers_url, notice: 'Barrier was successfully destroyed.'
- end
-
- private
-
- def set_barrier
- @barrier = Barrier.find(params[:id])
- end
-
- def barrier_params
- params.require(:barrier).permit(:name, :description)
- end
- end
-end
diff --git a/app/controllers/admin/service_stage_barriers_controller.rb b/app/controllers/admin/service_stage_barriers_controller.rb
deleted file mode 100644
index 37d143f35..000000000
--- a/app/controllers/admin/service_stage_barriers_controller.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
- class ServiceStageBarriersController < AdminController
- before_action :ensure_admin
- before_action :set_service_stage_barrier, only: %i[show edit update destroy]
-
- def index
- @service_stage_barriers = ServiceStageBarrier.all
- end
-
- def show; end
-
- def new
- @service_stage_barrier = ServiceStageBarrier.new
- end
-
- def edit; end
-
- def create
- @service_stage_barrier = ServiceStageBarrier.new(service_stage_barrier_params)
-
- if @service_stage_barrier.save
- redirect_to @service_stage_barrier, notice: 'Service stage barrier was successfully created.'
- else
- render :new
- end
- end
-
- def update
- if @service_stage_barrier.update(service_stage_barrier_params)
- redirect_to @service_stage_barrier, notice: 'Service stage barrier was successfully updated.'
- else
- render :edit
- end
- end
-
- def destroy
- @service_stage_barrier.destroy
- redirect_to service_stage_barriers_url, notice: 'Service stage barrier was successfully destroyed.'
- end
-
- private
-
- def set_service_stage_barrier
- @service_stage_barrier = ServiceStageBarrier.find(params[:id])
- end
-
- def service_stage_barrier_params
- params.require(:service_stage_barrier).permit(:service_stage_id, :barrier_id)
- end
- end
-end
diff --git a/app/models/barrier.rb b/app/models/barrier.rb
deleted file mode 100644
index ab874c685..000000000
--- a/app/models/barrier.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class Barrier < ApplicationRecord
- has_many :service_stage_barriers
- has_many :service_stages, through: :service_stage_barriers
-end
diff --git a/app/models/service_stage.rb b/app/models/service_stage.rb
index e9003f73e..6ba3b3e64 100644
--- a/app/models/service_stage.rb
+++ b/app/models/service_stage.rb
@@ -3,8 +3,6 @@
class ServiceStage < ApplicationRecord
belongs_to :service, counter_cache: true
belongs_to :persona, optional: true
- has_many :service_stage_barriers
- has_many :barriers, through: :service_stage_barriers
validates :name, presence: true
diff --git a/app/models/service_stage_barrier.rb b/app/models/service_stage_barrier.rb
deleted file mode 100644
index 4744548e9..000000000
--- a/app/models/service_stage_barrier.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-class ServiceStageBarrier < ApplicationRecord
- belongs_to :service_stage
- belongs_to :barrier
-end
diff --git a/app/serializers/barrier_serializer.rb b/app/serializers/barrier_serializer.rb
deleted file mode 100644
index d8d30986e..000000000
--- a/app/serializers/barrier_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class BarrierSerializer < ActiveModel::Serializer
- attributes :id, :name, :description
-end
diff --git a/app/serializers/service_stage_barrier_serializer.rb b/app/serializers/service_stage_barrier_serializer.rb
deleted file mode 100644
index a0f9a25c1..000000000
--- a/app/serializers/service_stage_barrier_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class ServiceStageBarrierSerializer < ActiveModel::Serializer
- attributes :id, :service_stage_id, :barrier_id
-end
diff --git a/app/views/admin/barriers/_form.html.erb b/app/views/admin/barriers/_form.html.erb
deleted file mode 100644
index 86491b0f2..000000000
--- a/app/views/admin/barriers/_form.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%= form_with(model: barrier, url: (barrier.persisted? ? admin_barrier_path(barrier) : admin_barriers_path), local: true) do |form| %>
- <%- if barrier.errors.any? %>
-
-
<%= pluralize(barrier.errors.count, "error") %> prohibited this barrier from being saved:
-
-
- <% barrier.errors.full_messages.each do |message| %>
- - <%= message %>
- <% end %>
-
-
- <%= form.label :name, class: "usa-label" %>
- <%= form.text_field :name, class: "usa-input" %>
-
-
-
- <%= form.label :description, class: "usa-label" %>
- <%= form.text_area :description, class: "usa-textarea" %>
-
-
-
- <%= form.submit class: "usa-button" %>
-
-<% end %>
diff --git a/app/views/admin/barriers/edit.html.erb b/app/views/admin/barriers/edit.html.erb
deleted file mode 100644
index 38b3c4b06..000000000
--- a/app/views/admin/barriers/edit.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<% content_for :navigation_title do %>
- Editing Barrier
-<% end %>
-
- <%= link_to admin_barrier_path(@barrier) do %>
-
- Back to Barrier
- <% end %>
-
-
-<%= render 'form', barrier: @barrier %>
-
-
- <%= link_to admin_barrier_path(@barrier), method: :delete, data: { confirm: 'Are you sure?' },
- class: "usa-button usa-button--secondary" do %>
-
-
- Delete
-
- <% end %>
-
diff --git a/app/views/admin/barriers/index.html.erb b/app/views/admin/barriers/index.html.erb
deleted file mode 100644
index 99ce43c05..000000000
--- a/app/views/admin/barriers/index.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% content_for :navigation_title do %>
- Barriers
- <%= link_to new_admin_barrier_path, class: "usa-button usa-button-inverted float-right" do %>
-
- New Barrier
- <% end %>
-<% end %>
-
- <%= link_to admin_forms_path do %>
-
- Back to Forms
- <% end %>
-
-
-
-
-
- | Name |
- Description |
-
-
-
-
- <% @barriers.each do |barrier| %>
-
- | <%= link_to barrier.name, admin_barrier_path(barrier) %> |
- <%= barrier.description %> |
-
- <% end %>
-
-
diff --git a/app/views/admin/barriers/new.html.erb b/app/views/admin/barriers/new.html.erb
deleted file mode 100644
index b28b69f66..000000000
--- a/app/views/admin/barriers/new.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% content_for :navigation_title do %>
- New Barrier
-<% end %>
-
- <%= link_to admin_barriers_path do %>
-
- Back to Barriers
- <% end %>
-
-
-<%= render 'form', barrier: @barrier %>
diff --git a/app/views/admin/barriers/show.html.erb b/app/views/admin/barriers/show.html.erb
deleted file mode 100644
index a911f20a1..000000000
--- a/app/views/admin/barriers/show.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% content_for :navigation_title do %>
- Viewing Barrier: <%= @barrier.name %>
- <%= link_to edit_admin_barrier_path(@barrier), class: "usa-button usa-button-inverted float-right" do %>
-
- Edit
- <% end %>
-<% end %>
-
- <%= link_to admin_barriers_path do %>
-
- Back to Barriers
- <% end %>
-
-
-
- Name:
- <%= @barrier.name %>
-
-
-
- Description:
- <%= @barrier.description %>
-
diff --git a/app/views/admin/service_stage_barriers/_form.html.erb b/app/views/admin/service_stage_barriers/_form.html.erb
deleted file mode 100644
index 1d6329107..000000000
--- a/app/views/admin/service_stage_barriers/_form.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%= form_with(model: service_stage_barrier, local: true) do |form| %>
- <%- if service_stage_barrier.errors.any? %>
-
-
<%= pluralize(service_stage_barrier.errors.count, "error") %> prohibited this service_stage_barrier from being saved:
-
-
- <% service_stage_barrier.errors.full_messages.each do |message| %>
- - <%= message %>
- <% end %>
-
-
- <%= form.label :service_stage_id %>
- <%= form.select :service_stage_id, options_for_select(ServiceStage.all.map {|ss| [ss.name, ss.id] }) %>
-
-
-
- <%= form.label :barrier_id %>
- <%= form.select :barrier_id, options_for_select(Barrier.all.map {|b| [b.name, b.id] }) %>
-
-
-
- <%= form.submit %>
-
-<% end %>
diff --git a/app/views/admin/service_stage_barriers/edit.html.erb b/app/views/admin/service_stage_barriers/edit.html.erb
deleted file mode 100644
index 9a382f55a..000000000
--- a/app/views/admin/service_stage_barriers/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-Editing Service Stage Barrier
-
-<%= render 'form', service_stage_barrier: @service_stage_barrier %>
-
-<%= link_to 'Show', @service_stage_barrier %> |
-<%= link_to 'Back', service_stage_barriers_path %>
diff --git a/app/views/admin/service_stage_barriers/index.html.erb b/app/views/admin/service_stage_barriers/index.html.erb
deleted file mode 100644
index 9bf8a5ab7..000000000
--- a/app/views/admin/service_stage_barriers/index.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= notice %>
-
-Service Stage Barriers
-
-
-
-
- | Service stage |
- Barrier |
- |
-
-
-
-
- <% @service_stage_barriers.each do |service_stage_barrier| %>
-
- | <%= service_stage_barrier.service_stage_id %> |
- <%= service_stage_barrier.barrier_id %> |
- <%= link_to 'Show', service_stage_barrier %> |
- <%= link_to 'Edit', edit_service_stage_barrier_path(service_stage_barrier) %> |
- <%= link_to 'Destroy', service_stage_barrier, method: :delete, data: { confirm: 'Are you sure?' } %> |
-
- <% end %>
-
-
-
-
-
-<%= link_to 'New Service Stage Barrier', new_service_stage_barrier_path %>
diff --git a/app/views/admin/service_stage_barriers/new.html.erb b/app/views/admin/service_stage_barriers/new.html.erb
deleted file mode 100644
index ba3336867..000000000
--- a/app/views/admin/service_stage_barriers/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-New Service Stage Barrier
-
-<%= render 'form', service_stage_barrier: @service_stage_barrier %>
-
-<%= link_to 'Back', service_stage_barriers_path %>
diff --git a/app/views/admin/service_stage_barriers/show.html.erb b/app/views/admin/service_stage_barriers/show.html.erb
deleted file mode 100644
index 4ff766d30..000000000
--- a/app/views/admin/service_stage_barriers/show.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<%= notice %>
-
-
- Service:
- <%= link_to @service_stage_barrier.service_stage.service.name, service_path(@service_stage_barrier.service_stage.service) %>
-
-
-
- Service stage:
- <%= link_to @service_stage_barrier.service_stage.name, service_stage_path(@service_stage_barrier.service_stage_id) %>
-
-
-
- Barrier:
- <%= link_to @service_stage_barrier.barrier.name, barrier_path(@service_stage_barrier.barrier_id) %>
-
-
-<%= link_to 'Edit', edit_service_stage_barrier_path(@service_stage_barrier) %> |
-<%= link_to 'Back', service_stage_barriers_path %>
diff --git a/app/views/admin/service_stages/_form.html.erb b/app/views/admin/service_stages/_form.html.erb
index ea6aca1a9..b222e5118 100644
--- a/app/views/admin/service_stages/_form.html.erb
+++ b/app/views/admin/service_stages/_form.html.erb
@@ -60,13 +60,6 @@
{ class: "usa-select" } %>
-
- <%= form.label :barrier_id, class: "usa-label" %>
- <%= form.select :barrier_id, options_for_select(Barrier.all.map { |s| [s.name, s.id] }), {}, { class: "usa-select" } %>
-
- <%= link_to 'Add a Barrier', new_admin_barrier_path, class: "usa-button usa-button--outline" %>
-
-
<%= form.submit class: "usa-button" %>
diff --git a/app/views/admin/site/index.html.erb b/app/views/admin/site/index.html.erb
index 7baaecb45..b5b50fb9c 100644
--- a/app/views/admin/site/index.html.erb
+++ b/app/views/admin/site/index.html.erb
@@ -82,11 +82,6 @@
Offerings
<% end %>
-
- <%= link_to admin_barriers_path do %>
- Barriers
- <% end %>
-
diff --git a/config/routes.rb b/config/routes.rb
index 5498ffeb4..db8b56ac1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -369,8 +369,6 @@
get 'export_csv', to: 'service_stages#export_csv', as: :export_csv
end
end
- resources :barriers
- resources :service_stage_barriers
get 'dashboard', to: 'site#index', as: :dashboard
get 'integrations', to: 'site#integrations', as: :integrations
diff --git a/db/migrate/20250423163606_remove_barriers.rb b/db/migrate/20250423163606_remove_barriers.rb
new file mode 100644
index 000000000..90cd7582b
--- /dev/null
+++ b/db/migrate/20250423163606_remove_barriers.rb
@@ -0,0 +1,6 @@
+class RemoveBarriers < ActiveRecord::Migration[8.0]
+ def change
+ drop_table :barriers
+ drop_table :service_stage_barriers
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1ca396e5a..ede6519c7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 2025_04_02_195517) do
+ActiveRecord::Schema[8.0].define(version: 2025_04_23_163606) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
@@ -42,13 +42,6 @@
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
end
- create_table "barriers", force: :cascade do |t|
- t.string "name"
- t.text "description"
- t.datetime "created_at", precision: nil, null: false
- t.datetime "updated_at", precision: nil, null: false
- end
-
create_table "collections", comment: "Quarterly CX Data Collection", force: :cascade do |t|
t.string "name"
t.date "start_date"
@@ -507,13 +500,6 @@
t.index ["organization_id"], name: "index_service_providers_on_organization_id"
end
- create_table "service_stage_barriers", force: :cascade do |t|
- t.integer "service_stage_id"
- t.integer "barrier_id"
- t.datetime "created_at", precision: nil, null: false
- t.datetime "updated_at", precision: nil, null: false
- end
-
create_table "service_stages", comment: "A step or stage within a Service, as used in a Business Process Model. eg: start, middle, end", force: :cascade do |t|
t.string "name"
t.text "description"
diff --git a/db/seeds.rb b/db/seeds.rb
index ac4ee530a..5ad0b0630 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -301,29 +301,6 @@ def production_suitable_seeds
service: service_1
})
-barrier_1 = Barrier.create({
- name: 'technical'
-})
-barrier_2 = Barrier.create({
- name: 'policy'
-})
-barrier_3 = Barrier.create({
- name: 'location'
-})
-ServiceStageBarrier.create({
- service_stage: stage_before,
- barrier: barrier_1
-})
-ServiceStageBarrier.create({
- service_stage: stage_during,
- barrier: barrier_2
-})
-ServiceStageBarrier.create({
- service_stage: stage_after,
- barrier: barrier_3
-})
-
-
#
# Forms
#
diff --git a/spec/models/barrier_spec.rb b/spec/models/barrier_spec.rb
deleted file mode 100644
index 3b7f90efe..000000000
--- a/spec/models/barrier_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Barrier, type: :model do
- pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/service_stage_barrier_spec.rb b/spec/models/service_stage_barrier_spec.rb
deleted file mode 100644
index d5df66059..000000000
--- a/spec/models/service_stage_barrier_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe ServiceStageBarrier, type: :model do
- pending "add some examples to (or delete) #{__FILE__}"
-end