mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 15:50:36 -05:00
New-AD search covers every installed component
- Besides the aircraft and engine/propeller models (and families), each in-use component is searched as maker + model designator and as component type + designator (e.g. "Champion 4301", "Magneto 4301"), so appliance ADs (magnetos, ELTs, radios, transponders) are found - A match records the component; tracking it makes the AD apply to that component instead of the airframe (ad_alerts.component_id) - Page hint, guide and README updated Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
afaa1ca191
commit
d2f5ce1e92
9 files changed
+91
-20
No files matched your search
@@ -9,7 +9,7 @@ class AdAlertsController < ApplicationController
|
||||
def check
|
||||
found = AdWatch.new(@aircraft).check!
|
||||
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"),
|
||||
notice: found.any? ? "Found #{helpers.pluralize(found.size, 'newly published AD')} to review." : "No new ADs found for #{AdWatch.new(@aircraft).terms.to_sentence}."
|
||||
notice: found.any? ? "Found #{helpers.pluralize(found.size, 'newly published AD')} to review." : "No new ADs found for #{AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence}."
|
||||
rescue AdWatch::Error => e
|
||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: "Couldn't check for new ADs: #{e.message}."
|
||||
end
|
||||
|
||||
@@ -4,6 +4,7 @@ class AdAlert < ApplicationRecord
|
||||
STATUSES = %w[new tracked dismissed].freeze
|
||||
|
||||
belongs_to :aircraft
|
||||
belongs_to :component, optional: true
|
||||
belongs_to :airworthiness_directive, optional: true
|
||||
|
||||
validates :fr_document_number, presence: true, uniqueness: { scope: :aircraft_id }
|
||||
@@ -20,7 +21,13 @@ class AdAlert < ApplicationRecord
|
||||
name: ad_number.presence || fr_document_number, short_description: summary, effective_date: effective_on,
|
||||
document_url: html_url, docket_number: amendment, required_action: abstract.to_s.truncate(2000)
|
||||
)
|
||||
ad.aircraft << aircraft unless ad.aircraft.include?(aircraft)
|
||||
# Matched on an installed component: the AD applies to that component;
|
||||
# otherwise to the airframe.
|
||||
if component && component.aircraft_id == aircraft_id
|
||||
ad.components << component unless ad.components.include?(component)
|
||||
else
|
||||
ad.aircraft << aircraft unless ad.aircraft.include?(aircraft)
|
||||
end
|
||||
update!(status: "tracked", airworthiness_directive: ad)
|
||||
ad
|
||||
end
|
||||
|
||||
+43
-10
@@ -16,12 +16,35 @@ class AdWatch
|
||||
@aircraft = aircraft
|
||||
end
|
||||
|
||||
# Model names to search for: the owner's list, or the aircraft, engine and
|
||||
# propeller models.
|
||||
# A search: what's shown ("Champion Slick 4301"), the words that must all
|
||||
# appear in the AD's text, and the installed component it came from.
|
||||
Term = Data.define(:label, :words, :component_id) do
|
||||
def to_s = label
|
||||
end
|
||||
|
||||
ENGINE_OR_PROP = /engine|propell?er|\bprop\b/i
|
||||
|
||||
# The aircraft model; each engine and propeller model (and its family);
|
||||
# and every other installed component's make and model, so ADs on
|
||||
# appliances (magnetos, ELTs, radios, filters…) are found too.
|
||||
def self.default_terms(aircraft)
|
||||
engines = aircraft.components.in_use.includes(:component_type)
|
||||
.select { _1.component_type&.name.to_s.match?(/engine|propell?er|\bprop\b/i) }.map(&:model).compact_blank.map(&:strip)
|
||||
([ aircraft.model.to_s.strip ] + engines.flat_map { [ _1, model_family(_1) ] }).compact_blank.uniq
|
||||
terms = []
|
||||
terms << Term.new(aircraft.model.strip, [ aircraft.model.strip ], nil) if aircraft.model.present?
|
||||
aircraft.components.in_use.includes(:component_type).order(:id).each do |c|
|
||||
model = c.model.to_s.strip
|
||||
next if model.blank?
|
||||
if c.component_type&.name.to_s.match?(ENGINE_OR_PROP)
|
||||
[ model, model_family(model) ].compact.each { |m| terms << Term.new(m, [ m ], c.id) }
|
||||
else
|
||||
label = [ c.manufacturer.to_s.strip, model ].compact_blank.join(" ")
|
||||
# Maker + model, and type + model: ADs often name the maker differently
|
||||
# (a successor company) but say what the part is ("magneto", "ELT").
|
||||
[ c.manufacturer.to_s.strip.split.first, c.component_type&.name.to_s.strip.split.first ].compact_blank.uniq.each do |lead|
|
||||
terms << Term.new(label, ([ lead ] + designators(model)).uniq, c.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
terms.uniq { _1.words.map(&:downcase) }
|
||||
end
|
||||
|
||||
# The engine family ADs often name instead of the exact model, and that also
|
||||
@@ -32,16 +55,25 @@ class AdWatch
|
||||
family unless family.nil? || family == model.to_s.upcase
|
||||
end
|
||||
|
||||
# The parts of a model name with digits in them ("Slick 4301" -> ["4301"]):
|
||||
# brand words in the model field rarely appear in an AD's text.
|
||||
def self.designators(model)
|
||||
words = model.split
|
||||
with_digits = words.grep(/\d/)
|
||||
with_digits.any? ? with_digits : words
|
||||
end
|
||||
|
||||
# The owner's own list (comma-separated) replaces the defaults.
|
||||
def terms
|
||||
custom = @aircraft.ad_watch_terms.to_s.split(/[,;\n]/).map(&:strip).compact_blank
|
||||
custom.any? ? custom : self.class.default_terms(@aircraft)
|
||||
custom.any? ? custom.map { Term.new(_1, [ _1 ], nil) } : self.class.default_terms(@aircraft)
|
||||
end
|
||||
|
||||
# Returns the new AdAlerts.
|
||||
def check!
|
||||
since = (@aircraft.ad_watch_checked_at || FIRST_LOOKBACK.ago).to_date - 7 # overlap; duplicates are skipped
|
||||
known = AirworthinessDirective.pluck(:name).to_set
|
||||
created = terms.flat_map { |term| search(term, since).filter_map { record(_1, term, known) } }
|
||||
created = terms.flat_map { |term| search(term.words, since).filter_map { record(_1, term, known) } }
|
||||
@aircraft.update_column(:ad_watch_checked_at, Time.current)
|
||||
created
|
||||
end
|
||||
@@ -57,15 +89,16 @@ class AdWatch
|
||||
fr_document_number: doc["document_number"], ad_number: ad_number,
|
||||
amendment: dockets.find { _1.start_with?("Amendment ") }&.delete_prefix("Amendment "),
|
||||
title: doc["title"].to_s.truncate(250), abstract: doc["abstract"], html_url: doc["html_url"],
|
||||
publication_date: doc["publication_date"], effective_on: doc["effective_on"], matched_term: term
|
||||
publication_date: doc["publication_date"], effective_on: doc["effective_on"], matched_term: term.label,
|
||||
component_id: term.component_id
|
||||
)
|
||||
end
|
||||
|
||||
def search(term, since)
|
||||
def search(words, since)
|
||||
query = [
|
||||
[ "per_page", "50" ], [ "order", "newest" ],
|
||||
[ "conditions[agencies][]", "federal-aviation-administration" ], [ "conditions[type][]", "RULE" ],
|
||||
[ "conditions[term]", %("airworthiness directives" "#{term.delete('"')}") ],
|
||||
[ "conditions[term]", ([ "airworthiness directives" ] + words).map { %("#{_1.delete('"')}") }.join(" ") ],
|
||||
[ "conditions[publication_date][gte]", since.iso8601 ]
|
||||
] + FIELDS.map { [ "fields[]", _1 ] }
|
||||
uri = URI(API)
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<div class="card-header">
|
||||
<div>
|
||||
<h2 class="card-title">Newly published ADs that may apply</h2>
|
||||
<p class="text-xs text-slate-500">Searched weekly in the Federal Register for <%= AdWatch.new(@aircraft).terms.to_sentence.presence || "the aircraft, engine and propeller models" %><%= " · last checked #{time_ago_in_words(@aircraft.ad_watch_checked_at)} ago" if @aircraft.ad_watch_checked_at %>.</p>
|
||||
<p class="text-xs text-slate-500">Searched weekly in the Federal Register for <%= AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence.presence || "the aircraft and its installed components" %><%= " · last checked #{time_ago_in_words(@aircraft.ad_watch_checked_at)} ago" if @aircraft.ad_watch_checked_at %>.</p>
|
||||
</div>
|
||||
<% if owner? %><%= button_to "Check now", check_aircraft_ad_alerts_path(@aircraft), class: "btn-secondary btn-sm", data: { turbo_submits_with: "Checking…" } %><% end %>
|
||||
</div>
|
||||
@@ -85,10 +85,10 @@
|
||||
<%= form_with url: terms_aircraft_ad_alerts_path(@aircraft), method: :patch, class: "flex flex-wrap items-end gap-2 border-t border-slate-100 px-4 py-3" do %>
|
||||
<div class="min-w-0 flex-1">
|
||||
<%= label_tag :ad_watch_terms, "Search terms", class: "label" %>
|
||||
<%= text_field_tag :ad_watch_terms, @aircraft.ad_watch_terms, class: "input", placeholder: AdWatch.default_terms(@aircraft).join(", ").presence || "e.g. 172N, O-320, 1C160" %>
|
||||
<%= text_field_tag :ad_watch_terms, @aircraft.ad_watch_terms, class: "input", placeholder: AdWatch.default_terms(@aircraft).map(&:label).uniq.join(", ").presence || "e.g. 172N, O-320, 1C160" %>
|
||||
</div>
|
||||
<%= submit_tag "Save", class: "btn-secondary" %>
|
||||
<p class="hint w-full">Comma-separated model names. Left blank, the aircraft, engine and propeller models are used. Matches are only possibly applicable: check each AD's applicability (and serial number ranges) before tracking it.</p>
|
||||
<p class="hint w-full">Comma-separated model names. Left blank, the aircraft model, engine and propeller models (and their families) and every installed component’s make and model are used; a match on a component makes the tracked AD apply to that component. Matches are only possibly applicable: check each AD's applicability (and serial number ranges) before tracking it.</p>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</section>
|
||||
|
||||
Reference in new issue
Block a user