Form submission refactor

app/controllers/organizations/adoptable_pets_controller.rb

@@ -30,14 +30,14 @@ def index
     def show
       @adoptable_pet_info = CustomPage.first&.adoptable_pet_info
 
-      if current_user&.latest_form_submission
+      if current_user
         @adoption_application =
           AdopterApplication.find_by(
             pet_id: @pet.id,
-            form_submission_id: current_user.latest_form_submission.id
+            person_id: current_user.person.id
           ) ||
           @pet.adopter_applications.build(
-            form_submission: current_user.latest_form_submission
+            person: current_user.person
           )
       end
     end

app/controllers/organizations/staff/adoption_application_reviews_controller.rb

@@ -10,7 +10,7 @@ def index
       context: {organization: Current.organization}
 
     @q = authorized_scope(
-      Pet.includes(adopter_applications: [form_submission: [:person]])
+      Pet.includes(adopter_applications: [:person])
       .where.not(adopter_applications: {id: nil}).references(:person)
     ).ransack(params[:q])
     @pets_with_applications = @q.result.includes(:adopter_applications)
@@ -41,13 +41,6 @@ def update
     end
   end
 
-  def show
-    authorize! AdopterApplication,
-      context: {organization: Current.organization}
-
-    @form_answers = @application.person.latest_form_submission.form_answers
-  end
-
   private
 
   def application_params

app/controllers/organizations/staff/form_answers_controller.rb

@@ -0,0 +1,24 @@
+module Organizations
+  module Staff
+    class FormAnswersController < Organizations::BaseController
+      before_action :context_authorize!, only: %i[index]
+      before_action :set_form_submission
+
+      def index
+        @form_answers = @form_submission.form_answers.order(created_at: :desc)
+      end
+
+      private
+
+      def set_form_submission
+        @form_submission = FormSubmission.find_by(id: params[:form_submission_id])
+      end
+
+      def context_authorize!
+        authorize! FormAnswer,
+          context: {organization: Current.organization},
+          with: Organizations::FormSubmissionPolicy
+      end
+    end
+  end
+end

app/controllers/organizations/staff/form_submissions_controller.rb

@@ -0,0 +1,25 @@
+module Organizations
+  module Staff
+    class FormSubmissionsController < Organizations::BaseController
+      layout "dashboard"
+
+      before_action :context_authorize!, only: %i[index]
+      before_action :set_person
+
+      def index
+        @form_submissions = @person.form_submissions.order(created_at: :desc)
+      end
+
+      private
+
+      def set_person
+        @person = Person.find_by(id: params[:person_id])
+      end
+
+      def context_authorize!
+        authorize! FormSubmission,
+          context: {organization: Current.organization}
+      end
+    end
+  end
+end

app/controllers/registrations_controller.rb

@@ -16,7 +16,6 @@ def create
     super do |resource|
       if resource.persisted?
         resource.add_role(:adopter, Current.organization)
-        resource.person.form_submissions.create
       end
     end
   end

app/models/adopter_application.rb

@@ -2,38 +2,33 @@
 #
 # Table name: adopter_applications
 #
-#  id                 :bigint           not null, primary key
-#  notes              :text
-#  profile_show       :boolean          default(TRUE)
-#  status             :integer          default("awaiting_review")
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  form_submission_id :bigint           not null
-#  organization_id    :bigint           not null
-#  pet_id             :bigint           not null
+#  id              :bigint           not null, primary key
+#  notes           :text
+#  profile_show    :boolean          default(TRUE)
+#  status          :integer          default("awaiting_review")
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  organization_id :bigint           not null
+#  person_id       :bigint           not null
+#  pet_id          :bigint           not null
 #
 # Indexes
 #
-#  index_adopter_applications_on_form_submission_id             (form_submission_id)
-#  index_adopter_applications_on_organization_id                (organization_id)
-#  index_adopter_applications_on_pet_id                         (pet_id)
-#  index_adopter_applications_on_pet_id_and_form_submission_id  (pet_id,form_submission_id) UNIQUE
+#  index_adopter_applications_on_organization_id  (organization_id)
+#  index_adopter_applications_on_person_id        (person_id)
+#  index_adopter_applications_on_pet_id           (pet_id)
 #
 # Foreign Keys
 #
-#  fk_rails_...  (form_submission_id => form_submissions.id)
+#  fk_rails_...  (person_id => people.id)
 #  fk_rails_...  (pet_id => pets.id)
 #
 class AdopterApplication < ApplicationRecord
   acts_as_tenant(:organization)
   belongs_to :pet, touch: true
-  belongs_to :form_submission
+  belongs_to :person
 
-  has_one :person, through: :form_submission
-
-  validates :pet_id, uniqueness: {scope: :form_submission_id}
-
-  broadcasts_refreshes
+  validates :pet_id, uniqueness: {scope: :person_id}
 
   enum :status, [:awaiting_review,
     :under_review,
@@ -59,7 +54,7 @@ def self.retire_applications(pet_id:)
   end
 
   def applicant_name
-    form_submission.person.full_name.to_s
+    person.full_name.to_s
   end
 
   def withdraw

app/models/concerns/authorizable.rb

@@ -54,6 +54,7 @@ def staff?(organization)
       manage_tasks
       view_organization_dashboard
       view_people
+      view_form_submissions
       manage_faqs
     ]
   ).freeze

app/models/form_submission.rb

@@ -30,7 +30,6 @@ class FormSubmission < ApplicationRecord
   acts_as_tenant(:organization)
   belongs_to :person
 
-  has_many :adopter_applications
   has_many :form_answers, dependent: :destroy
 
   delegate :user, to: :person

app/models/match.rb

@@ -115,7 +115,7 @@ def belongs_to_same_organization_as_pet
   end
 
   def adopter_application
-    AdopterApplication.includes(:form_submission).find_by(pet:, form_submission: {person:})
+    AdopterApplication.find_by(pet: pet, person: person)
   end
 
   ransacker :status do

app/models/organization.rb

@@ -25,18 +25,18 @@ class Organization < ApplicationRecord
   # Rolify resource
   resourcify
 
-  has_many :users
-  has_many :pets
-  has_many :default_pet_tasks
+  has_many :users, dependent: :destroy
+  has_many :pets, dependent: :destroy
+  has_many :default_pet_tasks, dependent: :destroy
   has_many :forms, class_name: "CustomForm::Form", dependent: :destroy
-  has_many :faqs
+  has_many :faqs, dependent: :destroy
 
   has_many :form_answers, dependent: :destroy
-  has_many :people
+  has_many :people, dependent: :destroy
   has_one :form_submission, dependent: :destroy
   has_one :custom_page, dependent: :destroy
 
-  has_many :locations, as: :locatable
+  has_many :locations, as: :locatable, dependent: :destroy
   accepts_nested_attributes_for :locations
 
   validates :phone_number, phone: {possible: true, allow_blank: true}

app/models/person.rb

@@ -29,10 +29,10 @@ class Person < ApplicationRecord
   has_one :latest_form_submission, -> { order(created_at: :desc) }, class_name: "FormSubmission"
   has_many :form_submissions, dependent: :destroy
   has_many :form_answers, through: :form_submissions
-  has_many :adopter_applications, through: :form_submissions
+  has_many :adopter_applications, dependent: :destroy
   has_many :likes, dependent: :destroy
   has_many :liked_pets, through: :likes, source: :pet
-  has_one :location, as: :locatable
+  has_one :location, as: :locatable, dependent: :destroy
   accepts_nested_attributes_for :location,
     reject_if: ->(attributes) { attributes["city_town"].blank? }
   has_many :matches # , dependent: :destroy

app/policies/adopter_application_policy.rb

@@ -1,13 +1,9 @@
 class AdopterApplicationPolicy < ApplicationPolicy
   authorize :pet, optional: true
-
-  pre_check :verify_form_submission!, except: %i[index?]
   pre_check :verify_pet_appliable!, only: %i[create?]
 
   relation_scope do |relation|
-    return relation.none unless user.latest_form_submission
-
-    relation.where(form_submission_id: user.latest_form_submission.id)
+    relation.where(person_id: user.person.id)
   end
 
   def update?
@@ -34,10 +30,6 @@ def already_applied?
     end
   end
 
-  def verify_form_submission!
-    deny! unless user.latest_form_submission.present?
-  end
-
   def verify_pet_appliable!
     deny! if pet.application_paused
     deny! if already_applied?

app/policies/organizations/form_submission_policy.rb

@@ -0,0 +1,12 @@
+module Organizations
+  class FormSubmissionPolicy < ApplicationPolicy
+    pre_check :verify_organization!
+    pre_check :verify_active_staff!
+
+    alias_rule :index?, to: :manage?
+
+    def manage?
+      permission?(:view_form_submissions)
+    end
+  end
+end

app/views/organizations/adoptable_pets/show.html.erb

@@ -137,13 +137,13 @@
                 <h4 class="mb-4 mt-3"><%= t('.in_love') %></h4>
                 <%= form_with model: [:adopter_fosterer, @adoption_application] do |form| %>
                   <%= form.hidden_field :pet_id, value: @adoption_application.pet_id %>
-                  <%= form.hidden_field :form_submission_id, value: @adoption_application.form_submission_id %>
+                  <%= form.hidden_field :person_id, value: @adoption_application.person_id %>
                   <%= form.submit t(".apply_to_adopt"),
                     class: "btn btn-primary",
                     data: {turbo: false}
                   %>
                 <% end %>
-              <% elsif AdopterApplication.exists?(form_submission: current_user.latest_form_submission, pet: @pet) %>
+              <% elsif AdopterApplication.exists?(person: current_user.person, pet: @pet) %>
                 <div class='d-flex align-items-center mt-3'>
                   <h4 class="me-2 mb-0">
                     <%= "#{t('organizations.adoptable_pets.show.application_status')} #{@adoption_application.human_enum_name(:status) || t('.status.default')}" %>

app/views/organizations/adopter_fosterer/adopter_applications/_application_cards.html.erb

@@ -1,5 +1,3 @@
-<%= turbo_refreshes_with method: :morph, scroll: :preserve  %>
-
 <% pet = application.pet %>
 <div class="card card-hover mx-1 my-4 col-sm-5" style='"overflow: hidden'>
   <%= link_to image_tag(pet.images.attached? ? pet.images.first : 'coming_soon.jpg', class: 'card-img-top pet-card'), adoptable_pet_path(pet) %>

app/views/organizations/adopter_fosterer/adopter_applications/_applications_table.html.erb

@@ -1,5 +1,3 @@
-<%= turbo_refreshes_with method: :morph, scroll: :preserve  %>
-
 <!-- table -->
 <div class="card">
   <table class="table mb-0 text-nowrap table-hover table-centered">
@@ -15,7 +13,6 @@
     <% if applications.present? %>
 
       <% applications.each do |app| %>
-        <%= turbo_stream_from app %>
         <% pet = app.pet %>
         <tr>
           <td>
@@ -57,7 +54,7 @@
           <%= t("dashboard.applications.no_applications")%>
         </td>
       </tr>
-    <%end%>
+    <% end %>
     </tbody>
   </table>
 </div>

app/views/organizations/staff/form_answers/index.html.erb

@@ -0,0 +1,18 @@
+<%= turbo_frame_tag :form_answers do %>
+  <h4>Form Answers (<%= @form_submission.created_at.strftime("%Y-%m-%d") %>)</h4>
+
+  <% @form_answers.each do |form_answer| %>
+    <div class="justify-content-md-between mb-2 gx-3">
+      <div class="card">
+        <div id="<%= dom_id form_answer %>"class="card-body d-flex flex-sm-row flex-column justify-content-between border-bottom">
+          <div class="d-flex align-items-center">
+            <div>
+              <strong class="fs-4" >Q: <%= form_answer.question_snapshot %></strong>
+              <p class="mb-0">A: <%= form_answer.value %> </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% end %>

app/views/organizations/staff/form_submissions/_form_submissions_table.html.erb

@@ -0,0 +1,26 @@
+<div class="card">
+  <!-- table -->
+  <div class="table-responsive overflow-y-hidden">
+    <table class="table mb-2 text-nowrap table-hover table-centered">
+      <thead>
+      <tr>
+        <th scope="col">Submitted</th>
+        <th scope="col">Action</th>
+      </tr>
+      </thead>
+
+      <tbody>
+        <% form_submissions.each do |form_submission| %>
+          <tr>
+            <td>
+             <p class="mb-0"><%= form_submission.created_at.strftime("%Y-%m-%d") %></p>
+            </td>
+            <td>
+              <%= link_to "View Submission", staff_form_submission_form_answers_path(form_submission), data: { turbo_frame: "form_answers" } %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>