diff --git a/app/views/wisp/field_status.html.erb b/app/views/wisp/field_status.html.erb
index 9102556..efb320b 100644
--- a/app/views/wisp/field_status.html.erb
+++ b/app/views/wisp/field_status.html.erb
@@ -427,7 +427,7 @@
<% @title = "Field Status" %>
Potential evapotranspiration (ET) and rainfall are automatically imported from <%= link_to "AgWeather", "https://agweather.cals.wisc.edu" %> up through the prior day. These values, as well as any irrigation events, may be adjusted in the table below for this field, or in the <%= link_to "Shared Data Entry", action: "weather" %> page for groups of fields. Also note that periodically entering accurate values for % Moisture and % Cover will have a major influence on the accuracy of the field water balance.
Potential evapotranspiration (ET) and rainfall (optionally) are imported from <%= link_to "AgWeather", "https://agweather.cals.wisc.edu" %> up through the prior day. These values, as well as any irrigation events, may be adjusted in the table below for this field, or in the <%= link_to "Shared Data Entry", action: "weather" %> page for groups of fields. Also note that periodically entering ground-truthed values for soil moisture and canopy cover will have a major influence on the accuracy of the field water balance.
diff --git a/bin/spring b/bin/spring
index a81373a..81e2b83 100644
--- a/bin/spring
+++ b/bin/spring
@@ -6,7 +6,7 @@
if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
require "bundler"
- Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
+ Bundler.definition.requested_specs.find { |spec| spec.name == "spring" }&.tap do |spring|
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
gem "spring", spring.version
require "spring/binstub"
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index e5571fa..48c93b0 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -2,7 +2,7 @@
class Rack::Attack
# Throttle requests per second per IP
- throttle('req/ip', limit: 25, period: 1.second) do |req|
+ throttle("req/ip", limit: 25, period: 1.second) do |req|
req.ip
end
@@ -12,7 +12,7 @@ class Rack::Attack
# end
# Throttle POST/PUT/PATCH/DELETE requests more strictly
- throttle('writes/ip', limit: 5, period: 1.second) do |req|
+ throttle("writes/ip", limit: 5, period: 1.second) do |req|
req.ip if %w[POST PUT PATCH DELETE].include?(req.request_method)
end
@@ -24,78 +24,78 @@ class Rack::Attack
# Block suspicious requests for '/etc/password' or wordpress specific paths.
# After 3 blocked requests in 10 minutes, block all requests from that IP for 5 minutes.
- blocklist('fail2ban pentesters') do |req|
+ blocklist("fail2ban pentesters") do |req|
# `filter` returns truthy value if request fails, or if it's from a previously banned IP
# so the request is blocked
Fail2Ban.filter("pentesters-#{req.ip}", maxretry: 3, findtime: 10.minutes, bantime: 5.minutes) do
# The count for the IP is incremented if the return value is truthy
CGI.unescape(req.query_string) =~ %r{/etc/passwd} ||
- req.path.include?('/etc/passwd') ||
- req.path.include?('wp-admin') ||
- req.path.include?('wp-login') ||
- req.path.include?('phpMyAdmin') ||
- req.path.include?('.env') ||
- req.path.include?('config.php') ||
- req.path =~ %r{/\.git/} ||
- req.path.include?('wp-config.php')
+ req.path.include?("/etc/passwd") ||
+ req.path.include?("wp-admin") ||
+ req.path.include?("wp-login") ||
+ req.path.include?("phpMyAdmin") ||
+ req.path.include?(".env") ||
+ req.path.include?("config.php") ||
+ req.path =~ %r{/\.git/} ||
+ req.path.include?("wp-config.php")
end
end
# Lockout IP addresses that are hammering your login page.
# After 20 requests in 1 minute, block all requests from that IP for 1 hour.
- blocklist('allow2ban login scrapers') do |req|
+ blocklist("allow2ban login scrapers") do |req|
# `filter` returns false value if request is to your login page (but still
# increments the count) so request below the limit are not blocked until
# they hit the limit. At that point, filter will return true and block.
Allow2Ban.filter(req.ip, maxretry: 20, findtime: 1.minute, bantime: 1.hour) do
# The count for the IP is incremented if the return value is truthy.
- (req.path == '/login' || req.path == '/wisp/sign_in') && req.post?
+ (req.path == "/login" || req.path == "/wisp/sign_in") && req.post?
end
end
# Protect authentication endpoints
- throttle('auth/ip', limit: 5, period: 20.seconds) do |req|
+ throttle("auth/ip", limit: 5, period: 20.seconds) do |req|
req.ip if req.path =~ %r{/wisp/(sign_in|sign_up|password)} && req.post?
end
# Throttle password reset attempts
- throttle('password_reset/ip', limit: 3, period: 1.hour) do |req|
- req.ip if req.path.include?('password') && req.post?
+ throttle("password_reset/ip", limit: 3, period: 1.hour) do |req|
+ req.ip if req.path.include?("password") && req.post?
end
# Throttle registration attempts
- throttle('registration/ip', limit: 5, period: 1.hour) do |req|
+ throttle("registration/ip", limit: 5, period: 1.hour) do |req|
req.ip if req.path =~ %r{/wisp/sign_up} && req.post?
end
# Protect against form spam on data endpoints
- throttle('post_data/ip', limit: 30, period: 1.minute) do |req|
- req.ip if req.path.include?('post_data') && req.post?
+ throttle("post_data/ip", limit: 30, period: 1.minute) do |req|
+ req.ip if req.path.include?("post_data") && req.post?
end
# Block requests with suspicious user agents
- blocklist('bad user agents') do |req|
+ blocklist("bad user agents") do |req|
ua = req.user_agent.to_s.downcase
- ua.include?('sqlmap') ||
- ua.include?('nmap') ||
- ua.include?('nikto') ||
- ua.include?('masscan') ||
- ua.include?('zap') ||
- ua.empty? ||
- ua == '-'
+ ua.include?("sqlmap") ||
+ ua.include?("nmap") ||
+ ua.include?("nikto") ||
+ ua.include?("masscan") ||
+ ua.include?("zap") ||
+ ua.empty? ||
+ ua == "-"
end
# Block requests trying to access sensitive files
- blocklist('sensitive files') do |req|
+ blocklist("sensitive files") do |req|
req.path =~ %r{\.(log|sql|backup|bak|old|tmp)$} ||
- req.path.include?('database.yml') ||
- req.path.include?('secrets.yml') ||
- req.path.include?('.env')
+ req.path.include?("database.yml") ||
+ req.path.include?("secrets.yml") ||
+ req.path.include?(".env")
end
# Allow all local traffic
- safelist('allow from localhost') do |req|
- ['127.0.0.1', '::1'].include?(req.ip)
+ safelist("allow from localhost") do |req|
+ ["127.0.0.1", "::1"].include?(req.ip)
end
# Allow requests from load balancers or CDNs (adjust IPs as needed)
@@ -107,17 +107,15 @@ class Rack::Attack
# Custom response for throttled requests
self.throttled_responder = lambda do |env|
- [ 429, # status
- { 'Content-Type' => 'application/json' },
- [{ error: 'Rate limit exceeded' }.to_json]
- ]
+ [429, # status
+ {"Content-Type" => "application/json"},
+ [{error: "Rate limit exceeded"}.to_json]]
end
# Custom response for blocked requests
self.blocklisted_responder = lambda do |env|
- [ 403, # status
- { 'Content-Type' => 'application/json' },
- [{ error: 'Forbidden' }.to_json]
- ]
+ [403, # status
+ {"Content-Type" => "application/json"},
+ [{error: "Forbidden"}.to_json]]
end
end
diff --git a/config/routes.rb b/config/routes.rb
index 9801e5c..bfa0bfb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,7 @@
post "set_farm"
post "set_pivot"
post "set_field"
+ post "set_precip_use_agwx"
end
end
@@ -78,5 +79,4 @@
end
mount LetterOpenerWeb::Engine, at: "/letter_opener" if Rails.env.development?
-
end
diff --git a/db/migrate/20260608001844_add_precip_use_agwx_to_groups.rb b/db/migrate/20260608001844_add_precip_use_agwx_to_groups.rb
new file mode 100644
index 0000000..3414d0e
--- /dev/null
+++ b/db/migrate/20260608001844_add_precip_use_agwx_to_groups.rb
@@ -0,0 +1,5 @@
+class AddPrecipUseAgwxToGroups < ActiveRecord::Migration[8.1]
+ def change
+ add_column :groups, :precip_use_agwx, :boolean, default: true, null: false
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 208daa0..82a1e79 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,29 +10,29 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_03_21_164518) do
+ActiveRecord::Schema[8.1].define(version: 2026_06_08_001844) do
# These are extensions that must be enabled in order to support this database
- enable_extension "plpgsql"
+ enable_extension "pg_catalog.plpgsql"
create_table "active_storage_attachments", force: :cascade do |t|
- t.string "name", null: false
- t.string "record_type", null: false
- t.bigint "record_id", null: false
t.bigint "blob_id", null: false
t.datetime "created_at", null: false
+ t.string "name", null: false
+ t.bigint "record_id", null: false
+ t.string "record_type", null: false
t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
end
create_table "active_storage_blobs", force: :cascade do |t|
- t.string "key", null: false
- t.string "filename", null: false
- t.string "content_type"
- t.text "metadata"
- t.string "service_name", null: false
t.bigint "byte_size", null: false
t.string "checksum"
+ t.string "content_type"
t.datetime "created_at", null: false
+ t.string "filename", null: false
+ t.string "key", null: false
+ t.text "metadata"
+ t.string "service_name", null: false
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
@@ -43,186 +43,187 @@
end
create_table "blogs", force: :cascade do |t|
- t.date "date"
t.text "content"
t.datetime "created_at", null: false
+ t.date "date"
t.datetime "updated_at", null: false
end
create_table "crops", force: :cascade do |t|
- t.integer "field_id"
- t.string "name", limit: 255
- t.string "variety", limit: 255
+ t.datetime "created_at", null: false
t.date "emergence_date"
t.date "end_date"
+ t.integer "field_id"
t.date "harvest_or_kill_date"
- t.float "max_root_zone_depth"
+ t.float "initial_soil_moisture"
t.float "max_allowable_depletion_frac"
t.float "max_allowable_depletion_inches"
+ t.float "max_root_zone_depth"
+ t.string "name", limit: 255
t.string "notes", limit: 255
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
- t.float "initial_soil_moisture"
t.integer "plant_id"
+ t.datetime "updated_at", null: false
+ t.string "variety", limit: 255
end
create_table "farms", force: :cascade do |t|
+ t.datetime "created_at", null: false
t.integer "group_id"
- t.integer "year"
t.string "name", limit: 255
t.string "notes", limit: 255
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.integer "year"
end
create_table "field_daily_weather", force: :cascade do |t|
- t.integer "field_id"
- t.date "date"
- t.float "ref_et"
+ t.float "ad"
t.float "adj_et"
- t.float "rain"
- t.float "irrigation"
- t.float "entered_pct_moisture"
- t.float "entered_pct_cover"
- t.float "leaf_area_index"
+ t.float "calculated_pct_cover"
t.float "calculated_pct_moisture"
- t.float "ad"
+ t.datetime "created_at", null: false
+ t.date "date"
t.float "deep_drainage"
+ t.integer "degree_days"
+ t.float "entered_pct_cover"
+ t.float "entered_pct_moisture"
+ t.integer "field_id"
+ t.float "irrigation"
+ t.float "leaf_area_index"
t.string "notes", limit: 255
- t.datetime "created_at", null: false
+ t.float "rain"
+ t.float "ref_et"
t.datetime "updated_at", null: false
- t.float "calculated_pct_cover"
- t.integer "degree_days"
end
create_table "fields", force: :cascade do |t|
- t.string "name", limit: 255
- t.integer "soil_type_id"
t.float "area"
+ t.datetime "created_at", null: false
+ t.integer "et_method"
t.float "field_capacity"
+ t.string "name", limit: 255
+ t.string "notes", limit: 255
t.float "perm_wilting_pt"
t.integer "pivot_id"
- t.integer "ref_et_station_id"
t.integer "rain_station_id"
+ t.integer "ref_et_station_id"
t.integer "soil_moisture_station_id"
- t.string "notes", limit: 255
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.integer "soil_type_id"
t.float "target_ad_pct"
- t.integer "et_method"
+ t.datetime "updated_at", null: false
end
create_table "groups", force: :cascade do |t|
- t.string "description", limit: 255
t.datetime "created_at", null: false
+ t.string "description", limit: 255
+ t.boolean "precip_use_agwx", default: true, null: false
t.datetime "updated_at", null: false
end
create_table "irrigation_events", force: :cascade do |t|
- t.integer "pivot_id"
+ t.datetime "created_at", null: false
t.date "date"
t.float "inches_applied"
+ t.integer "pivot_id"
t.float "run_time"
t.float "total_volume"
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "memberships", force: :cascade do |t|
+ t.datetime "created_at", null: false
t.integer "group_id"
- t.integer "user_id"
t.boolean "is_admin"
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.integer "user_id"
end
create_table "multi_edit_links", force: :cascade do |t|
- t.integer "field_id"
- t.integer "weather_station_id"
t.datetime "created_at", null: false
+ t.integer "field_id"
t.datetime "updated_at", null: false
+ t.integer "weather_station_id"
end
create_table "pivots", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.integer "cropping_year", null: false
+ t.string "equipment", limit: 255
t.integer "farm_id"
- t.string "name", limit: 255
t.float "latitude"
t.float "longitude"
- t.string "equipment", limit: 255
+ t.string "name", limit: 255
+ t.string "notes", limit: 255
t.float "pump_capacity"
t.string "some_energy_rate_metric"
- t.integer "cropping_year", null: false
- t.string "notes", limit: 255
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "plants", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.float "default_max_root_zone_depth"
t.string "name", limit: 255
t.string "type", limit: 255
- t.float "default_max_root_zone_depth"
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "soil_types", force: :cascade do |t|
- t.string "name", limit: 255
+ t.datetime "created_at", null: false
t.string "description", limit: 255
t.float "field_capacity"
+ t.string "name", limit: 255
t.float "perm_wilting_pt"
- t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["name"], name: "index_soil_types_on_name", unique: true
end
create_table "users", force: :cascade do |t|
- t.string "first_name", limit: 255
- t.string "last_name", limit: 255
+ t.boolean "admin", default: false
+ t.datetime "confirmation_sent_at"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
+ t.datetime "current_sign_in_at"
+ t.string "current_sign_in_ip", limit: 255
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
- t.string "reset_password_token", limit: 255
- t.datetime "reset_password_sent_at"
- t.datetime "remember_created_at"
- t.integer "sign_in_count", default: 0
- t.datetime "current_sign_in_at"
+ t.string "first_name", limit: 255
+ t.string "last_name", limit: 255
t.datetime "last_sign_in_at"
- t.string "current_sign_in_ip", limit: 255
t.string "last_sign_in_ip", limit: 255
- t.boolean "admin", default: false
- t.string "confirmation_token"
- t.datetime "confirmed_at"
- t.datetime "confirmation_sent_at"
+ t.datetime "remember_created_at"
+ t.datetime "reset_password_sent_at"
+ t.string "reset_password_token", limit: 255
+ t.integer "sign_in_count", default: 0
t.string "unconfirmed_email"
+ t.datetime "updated_at", null: false
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["reset_password_token"], name: "idx_users_index_users_on_reset_password_token", unique: true
end
create_table "weather_station_data", force: :cascade do |t|
- t.integer "weather_station_id", null: false
+ t.datetime "created_at", null: false
t.date "date", null: false
- t.float "ref_et"
- t.float "rain"
+ t.float "entered_pct_cover"
t.float "entered_pct_moisture"
- t.string "notes", limit: 255
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
t.float "irrigation"
- t.float "entered_pct_cover"
t.float "leaf_area_index"
+ t.string "notes", limit: 255
+ t.float "rain"
+ t.float "ref_et"
+ t.datetime "updated_at", null: false
+ t.integer "weather_station_id", null: false
t.index ["weather_station_id", "date"], name: "index_weather_station_data_on_weather_station_id_and_date", unique: true
end
create_table "weather_stations", force: :cascade do |t|
+ t.datetime "created_at", null: false
t.integer "group_id"
- t.string "name", limit: 255
t.string "location", limit: 255
+ t.string "name", limit: 255
t.string "notes", limit: 255
- t.datetime "created_at", null: false
- t.datetime "updated_at", null: false
t.integer "pivot_id_deleted"
+ t.datetime "updated_at", null: false
end
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"