- <% @active_with_active_id_card_setup.order(:name).each_with_index do |emp, index| %>
+ <% @with_active_id_card_setup.order(:name).each do |emp| %>
<%= link_to emp.name, employer_path(emp.slug), class: "text-atmosphere hover:text-platinum" %>
@@ -101,7 +123,7 @@
Deactivated:
- <% @deactivated.each_with_index do |emp, index| %>
+ <% @deactivated.each do |emp| %>
<%= link_to emp.name, employer_path(emp.slug), class: "text-platinum hover:text-bluemana" %>
diff --git a/app/views/employers/new.html.erb b/app/views/employers/new.html.erb
index 6c75634..3412795 100644
--- a/app/views/employers/new.html.erb
+++ b/app/views/employers/new.html.erb
@@ -19,14 +19,12 @@
<%= f.text_field :name, label: { text: "Employer Name" }, data: { logo_upload_target: "employer" }, class: "w-full" %>
-
- <%= f.text_field :group_number, label: { text: "Group/Medical Number" }, class: "w-full" %>
-
-
-
<%= f.text_field :effective_date, label: { text: "Effective Date" }, class: "w-full" %>
+
+ <%= f.text_field :group_number, label: { text: "Group/Medical Number" }, class: "w-full" %>
+
diff --git a/bin/cron-entrypoint b/bin/cron-entrypoint
new file mode 100644
index 0000000..636f87b
--- /dev/null
+++ b/bin/cron-entrypoint
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+printenv >> /etc/environment
+
+echo "updating cron..."
+bundle exec whenever --update-crontab --set environment=development
+
+# Start cron in foreground
+echo "starting cron..."
+cron
+# bundle exec whenever --update-crontab
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"
diff --git a/bin/development-entrypoint b/bin/development-entrypoint
new file mode 100644
index 0000000..b119093
--- /dev/null
+++ b/bin/development-entrypoint
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /usr/src/app/tmp/pids/server.pid
+
+rm -rf /usr/local/bundle/cache/*.gem
+
+echo "bundle install..."
+bundle check || bundle install --jobs 4
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"
diff --git a/compose.yaml b/compose.yaml
index 895c7bd..8c31183 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -15,15 +15,13 @@ services:
- HISTFILE=/usr/src/app/log/.bash_history
- RAILS_ENV=development
- TAILWIND_POLLING=true
- - PUID=1000
- - PGID=100
+ # - PUID=1000
+ # - PGID=100
tty: true
stdin_open: true
# depends_on:
# db:
# condition: service_healthy
- # redis:
- # condition: service_started
# db:
# build:
# context: .
@@ -38,11 +36,21 @@ services:
# timeout: 3s
# retries: 10
# start_period: 10s
- # redis:
- # image: redis
+ # cron:
+ # build:
+ # context: ./
+ # dockerfile: development3.Dockerfile
+ # command: ./bin/cron-entrypoint
# volumes:
- # - redis_data:/data
-
+ # - .:/usr/src/app
+ # - bundle:/usr/local/bundle
+ # environment:
+ # - RAILS_ENV=development
+ # - PUID=1000
+ # - PGID=1001
+ # depends_on:
+ # - web
+ # - db
volumes:
# redis_data:
bundle:
diff --git a/config/schedule.rb b/config/schedule.rb
index 3320295..9151c1c 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -2,8 +2,7 @@ set :output, "log/cron_log.log"
set :environment, ENV['RAILS_ENV'] || 'development'
every 1.minute do
- runner "Rails.logger.info 'Cron test ran at: ' + Time.now.to_s"
- command "echo 'Cron test ran at: ' $(date) >> log/cron_log.log"
+ rake "employer_automation:employer_initialize_test"
end
every 1.day, at: ['6:00 am', '6:00 pm'] do
diff --git a/db/migrate/20251202140122_create_employers.rb b/db/migrate/20251202140122_create_employers.rb
index 8ca7245..6e05906 100644
--- a/db/migrate/20251202140122_create_employers.rb
+++ b/db/migrate/20251202140122_create_employers.rb
@@ -9,6 +9,7 @@ class CreateEmployers < ActiveRecord::Migration[7.2]
t.string :group_number
t.string :effective_date
t.boolean :active, default: false
+ t.boolean :initialized, default: false
t.timestamps
end
diff --git a/db/migrate/20251204041154_create_id_card_setups.rb b/db/migrate/20251204041154_create_id_card_setups.rb
index b0b69b1..c2303f5 100644
--- a/db/migrate/20251204041154_create_id_card_setups.rb
+++ b/db/migrate/20251204041154_create_id_card_setups.rb
@@ -7,9 +7,10 @@ class CreateIdCardSetups < ActiveRecord::Migration[7.2]
t.string :card_color
t.string :rx_group_number
t.string :pl_plan_key
- t.boolean :active, default: false
t.boolean :has_divisions, default: false
t.boolean :has_dental, default: false
+ t.boolean :active, default: false
+ t.boolean :initialized, default: false
t.belongs_to :employer, null: false, foreign_key: true
t.belongs_to :employer_logo, null: true, foreign_key: { to_table: :id_card_employer_logos }
t.belongs_to :network_logo, null: true, foreign_key: { to_table: :id_card_network_logos }
diff --git a/db/schema.rb b/db/schema.rb
index afa3a56..d376124 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -20,6 +20,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_08_210447) do
t.string "group_number"
t.string "effective_date"
t.boolean "active", default: false
+ t.boolean "initialized", default: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
@@ -239,9 +240,10 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_08_210447) do
t.string "card_color"
t.string "rx_group_number"
t.string "pl_plan_key"
- t.boolean "active", default: false
t.boolean "has_divisions", default: false
t.boolean "has_dental", default: false
+ t.boolean "active", default: false
+ t.boolean "initialized", default: false
t.bigint "employer_id", null: false
t.bigint "employer_logo_id"
t.bigint "network_logo_id"
diff --git a/db/seeds.rb b/db/seeds.rb
index 5885744..50ddb04 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -15,6 +15,7 @@
"seed_tasks:determine_network_fields",
"seed_tasks:determine_employer_fields",
+ "seed_tasks:build_plans",
"seed_tasks:build_members"
]
diff --git a/development3.Dockerfile b/development3.Dockerfile
index f5f03b4..758a2dd 100644
--- a/development3.Dockerfile
+++ b/development3.Dockerfile
@@ -13,6 +13,8 @@ RUN --mount=type=cache,target=/var/cache/apt \
build-essential \
less \
git \
+ cron \
+ dos2unix \
tdsodbc \
freetds-dev \
libvips \
@@ -27,34 +29,16 @@ WORKDIR /usr/src/app
RUN gem install foreman
-# RUN chmod +x /usr/src/app/bin/jobs
+# COPY bin/development-entrypoint.sh /bin/development-entrypoint.sh
+# RUN chown root:root bin/development-entrypoint.sh && chmod +x bin/development-entrypoint.sh
-# Copy runtime Ruby dependencies and the precompiled assets from the builder stage
-# COPY --from=builder /usr/local/bundle /usr/local/bundle
-# COPY --from=builder /usr/src/app /usr/src/app
-# COPY --from=watchman_builder /usr/local/bin/watchman /usr/local/bin/watchman
-# COPY --from=watchman_builder /usr/local/bin/watchman-wait /usr/local/bin/watchman-wait
+ENTRYPOINT ["./bin/development-entrypoint"]
-# RUN mkdir -p /usr/local/var/run/watchman \
-# && touch /usr/local/var/run/watchman/.not-empty \
-# && chmod 2777 /usr/local/var/run/watchman
+ENTRYPOINT ["./bin/cron-entrypoint"]
-# COPY . .
-
-# 1. Add bin/jobs script to container
-COPY bin/jobs /usr/src/bin/jobs
-
-# 2. Make the script executable
-RUN chmod +x /usr/src/bin/jobs
-
-# 3. Set it as the entrypoint
-# ENTRYPOINT ["/usr/src/bin/jobs"]
-
-# The entrypoint script is a good practice for handling Rails server startup
-ENTRYPOINT ["./bin/docker-entrypoint-development"]
# Expose the application port
EXPOSE 3002
# Set the default command to run the Rails server
-CMD ["./bin/dev", "bin/jobs start"]
+CMD ["./bin/dev", "./bin/jobs start"]
diff --git a/lib/tasks/employer_automation.rake b/lib/tasks/employer_automation.rake
index 90d11d5..29a5741 100644
--- a/lib/tasks/employer_automation.rake
+++ b/lib/tasks/employer_automation.rake
@@ -3,9 +3,10 @@ namespace :employer_automation do
desc "Employer Initialization Automation"
# rake employer_automation:employer_initialize
task employer_initialize: :environment do
+ puts "Running Employer Init Automation"
Employer.missing_keychain_initialization.map(&:sync_with_vhcs)
Employer.missing_plans_initialization.map(&:sync_plans_with_vhcs)
- Employer.missing_initial_members.map(&:sync_members_with_vhcs)
+ Employer.missing_members_initialization.map(&:sync_members_with_vhcs)
end
desc "Employer Initialization Automation Test"
@@ -26,8 +27,8 @@ namespace :employer_automation do
# rake employer_automation:employer_maintenance
task employer_maintenance: :environment do
Employer.automation_ready.map(&:sync_with_vhcs)
- Employer.active.map(&:sync_plans_with_vhcs)
- Employer.active.map(&:sync_members_with_vhcs)
+ Employer.with_active_id_card_setup.map(&:sync_plans_with_vhcs)
+ Employer.with_active_id_card_setup.map(&:sync_members_with_vhcs)
end
end
diff --git a/lib/tasks/seed_tasks.rake b/lib/tasks/seed_tasks.rake
index 393e0a3..192acce 100644
--- a/lib/tasks/seed_tasks.rake
+++ b/lib/tasks/seed_tasks.rake
@@ -184,35 +184,44 @@ namespace :seed_tasks do
plan_headers = VhcsRecord.connection.select_all(sql_query)
plan_headers.each do |plan_header|
- employer = UpdateEmployerJob.perform_now(employer_plan_header: plan_header, full_sync: true)
+ UpdateEmployerJob.new.perform(employer_plan_header: plan_header, full_sync: true)
+ end
+
+ end
+
+ desc "Build Initial Plans"
+ # rake seed_tasks:build_plans
+ task build_plans: :environment do
+ puts "Importing Plans"
+
+ Employer.all.each do |employer|
puts "-- #{employer.name}"
UpdateEmployerPlansJob.new.perform(employer.pl_plan_key)
# employer_plans = employer.id_card_setup.plans
- vhcs_plans = Vhcs::PbProduct.where(company_pb_entity_key: employer.company_pb_entity_key, is_active: 255)
- vhcs_plans.each do |vp|
- # plan = employer_plans.find_by(pb_product_key: vp.pb_product_key)
- # if plan.present?
- # plan_titles = employer_plans.pluck(:title)
- # plan_title_matcher = JaroWinkler.new(vp.short_description)
- # closest_title = plan_titles.max_by { |title| plan_title_matcher.match(title) }
- # plan = employer_plans.find_by(title: closest_title)
- # plan.update(pb_product_key: vp.pb_product_key)
- # end
- plan = employer.id_card_setup.plans.find_by(pb_product_key: vp.pb_product_key)
+
+ employer.id_card_setup.plans.each do |plan|
puts "---- #{plan.title}"
- # plan.update(
- # title: vp.short_description,
- # pl_plan_key: employer.pl_plan_key
- # )
vhcs_plan_benefits = Vhcs::HlEgglestonCardBenefit.where(plan_id: plan.pb_product_key)
- vhcs_plan_benefits.each do |vb|
- benefit = plan.plan_benefits.find_by(sequence: vb.sequence)
- benefit.update(benefit: vb.benefit)
+ vhcs_plan_benefits.each do |vpb|
+ if vpb.benefit.present?
+ benefit = plan.plan_benefits.find_by(sequence: vpb.sequence)
+ benefit.update(benefit: vpb.benefit)
+ end
end
end
- if vhcs_plans.empty?
- employer.active = false
- end
+ # vhcs_plans = Vhcs::PbProduct.where(company_pb_entity_key: employer.company_pb_entity_key, is_active: 255)
+ # vhcs_plans.each do |vp|
+ # plan = employer.id_card_setup.plans.find_by(pb_product_key: vp.pb_product_key)
+ # puts "---- #{plan.title}"
+ # vhcs_plan_benefits = Vhcs::HlEgglestonCardBenefit.where(plan_id: plan.pb_product_key)
+ # vhcs_plan_benefits.each do |vb|
+ # benefit = plan.plan_benefits.find_by(sequence: vb.sequence)
+ # benefit.update(benefit: vb.benefit)
+ # end
+ # end
+ # if vhcs_plans.empty?
+ # employer.active = false
+ # end
employer.save
end
@@ -223,8 +232,7 @@ namespace :seed_tasks do
task build_members: :environment do
puts "Importing Members"
Employer.all.map(&:sync_members_with_vhcs)
- Employer.left_outer_joins(:members)
- .where(members: { id: nil })
+ Employer.where.missing(:members)
.update_all(active: false)
end