add observation_report reference to observation documents

app/admin/observation_document.rb

@@ -36,6 +36,7 @@
 
  index do
  column :id
+ column :observation_report
  column :observations
  column :name
  column :document_type
@@ -62,6 +63,9 @@
  end
 
  filter :observations, as: :select, collection: -> { Observation.joins(:observation_documents).distinct.order(:id).pluck(:id) }
+ filter :observation_report,
+ label: -> { I18n.t("activerecord.models.observation_report") }, as: :select,
+ collection: -> { ObservationReport.where(id: ObservationDocument.select(:observation_report_id)).order(:title) }
  filter :name, as: :select
  filter :attachment, as: :select
  filter :user
@@ -72,6 +76,7 @@
  form do |f|
  f.semantic_errors(*f.object.errors.attribute_names)
  f.inputs do
+ f.input :observation_report, input_html: {disabled: true}
  f.input :observations, input_html: {disabled: true}
  f.input :user, input_html: {disabled: true}
  f.input :name
@@ -85,6 +90,7 @@
  show do
  attributes_table do
  row :id
+ row :observation_report
  row :observations
  row :document_type
  row :attachment do |o|

app/models/observation_document.rb

@@ -28,6 +28,7 @@ class ObservationDocument < ApplicationRecord
 
  # TODO: only nils in the database, maybe that should be removed?
  belongs_to :user, inverse_of: :observation_documents, touch: true, optional: true
+ belongs_to :observation_report, inverse_of: :observation_documents, touch: true, optional: true
  has_and_belongs_to_many :observations, inverse_of: :observation_documents
 
  skip_callback :commit, :after, :remove_attachment!

app/models/observation_report.rb

@@ -27,6 +27,7 @@ class ObservationReport < ApplicationRecord
  has_many :observation_report_observers, dependent: :destroy
  has_many :observers, through: :observation_report_observers, after_add: :self_touch, after_remove: :self_touch
  has_many :observations, dependent: :destroy
+ has_many :observation_documents, inverse_of: :observation_report, dependent: :destroy
 
  validates :attachment, presence: true
  validates :observers, presence: true

db/migrate/20240105172847_add_observation_report_to_observation_document.rb

@@ -0,0 +1,18 @@
+class AddObservationReportToObservationDocument < ActiveRecord::Migration[7.0]
+ def change
+ add_reference :observation_documents, :observation_report, foreign_key: true, index: true
+
+ reversible do |dir|
+ dir.up do
+ execute(
+ <<~SQL
+ UPDATE observation_documents SET observation_report_id = o.observation_report_id
+ FROM observations o
+ INNER JOIN observation_documents_observations odo ON odo.observation_id = o.id
+ WHERE odo.observation_document_id = observation_documents.id
+ SQL
+ )
+ end
+ end
+ end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_12_22_171303) do
+ActiveRecord::Schema[7.0].define(version: 2024_01_05_172847) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "address_standardizer"
  enable_extension "address_standardizer_data_us"
@@ -392,8 +392,10 @@
  t.integer "user_id"
  t.datetime "deleted_at", precision: nil
  t.integer "document_type", default: 0, null: false
+ t.bigint "observation_report_id"
  t.index ["deleted_at"], name: "index_observation_documents_on_deleted_at"
  t.index ["name"], name: "index_observation_documents_on_name"
+ t.index ["observation_report_id"], name: "index_observation_documents_on_observation_report_id"
  t.index ["user_id"], name: "index_observation_documents_on_user_id"
  end
 
@@ -1125,6 +1127,7 @@
  add_foreign_key "notifications", "notification_groups", on_delete: :nullify
  add_foreign_key "notifications", "operator_documents", on_delete: :cascade
  add_foreign_key "notifications", "users", on_delete: :cascade
+ add_foreign_key "observation_documents", "observation_reports"
  add_foreign_key "observation_documents", "users"
  add_foreign_key "observation_documents_observations", "observation_documents", on_delete: :cascade
  add_foreign_key "observation_documents_observations", "observations", on_delete: :cascade