plan_my_stuff 0.3.0 → 0.4.0

data/app/controllers/plan_my_stuff/webhooks/github_controller.rb

@@ -0,0 +1,284 @@
+# frozen_string_literal: true
+
+require 'openssl'
+
+module PlanMyStuff
+  module Webhooks
+    class GithubController < ActionController::API
+      before_action :verify_signature!
+
+      # POST /webhooks/github
+      def create
+        event = request.headers['X-GitHub-Event']
+
+        case event
+        when 'pull_request'
+          handle_pull_request
+        when 'issues'
+          handle_issues
+        when 'projects_v2_item'
+          handle_projects_v2_item
+        end
+
+        head(:ok)
+      end
+
+      private
+
+        # Validates HMAC-SHA256 signature from the X-Hub-Signature-256 header.
+        #
+        # @return [void]
+        #
+        def verify_signature!
+          body = request.body.read
+          request.body.rewind
+
+          signature = request.headers['X-Hub-Signature-256'].to_s.gsub('sha256=', '')
+          if signature.blank?
+            head(:unauthorized)
+
+            return
+          end
+
+          digest = OpenSSL::Digest.new('sha256')
+          secret = PlanMyStuff.configuration.webhook_secret
+          hmac = OpenSSL::HMAC.hexdigest(digest, secret, body)
+
+          return if ActiveSupport::SecurityUtils.secure_compare(hmac, signature)
+
+          head(:unauthorized)
+        end
+
+        # @return [ActionController::Parameters]
+        def payload_params
+          @payload_params ||=
+            begin
+              body = request.body.read
+              request.body.rewind
+              ActionController::Parameters.new(JSON.parse(body))
+            end
+        end
+
+        # @return [ActionController::Parameters]
+        def pull_request_params
+          payload_params.fetch(:pull_request)
+        end
+
+        # @return [ActionController::Parameters]
+        def issue_params
+          payload_params.fetch(:issue)
+        end
+
+        # @return [void]
+        def handle_issues
+          action = payload_params.fetch(:action)
+
+          case action
+          when 'assigned'
+            handle_issue_assigned
+          when 'unassigned'
+            handle_issue_unassigned
+          end
+        end
+
+        # Adds the issue to the pipeline project at "Submitted" the first
+        # time it is assigned. Re-assigns and additional assignees are
+        # ignored -- if the issue is already in the pipeline we do not
+        # touch its status.
+        #
+        # @return [void]
+        #
+        def handle_issue_assigned
+          issue_number = issue_params.fetch(:number)
+          assignee_login = payload_params.dig(:assignee, :login)
+
+          return if assignee_login.blank?
+
+          existing = PlanMyStuff::Pipeline::IssueLinker.find_project_item(issue_number)
+          if existing.present?
+            Rails.logger.info("[PlanMyStuff] Issue ##{issue_number} already in pipeline project, skipping submit!")
+
+            return
+          end
+
+          repo = payload_params.dig(:repository, :full_name)
+          issue = PlanMyStuff::Issue.find(issue_number, repo: repo)
+          PlanMyStuff::Pipeline.submit!(issue, assignee: assignee_login)
+        end
+
+        # Removes the issue from the pipeline project when the LAST
+        # assignee is removed. If any assignees remain, the webhook is
+        # a no-op (only one of N was removed). If the issue isn't in
+        # the pipeline at all, also a no-op (logged at info).
+        #
+        # @return [void]
+        #
+        def handle_issue_unassigned
+          remaining_assignees = Array.wrap(issue_params[:assignees])
+          return if remaining_assignees.any?
+
+          issue_number = issue_params.fetch(:number)
+          project_item = PlanMyStuff::Pipeline::IssueLinker.find_project_item(issue_number)
+
+          if project_item.nil?
+            Rails.logger.info(
+              "[PlanMyStuff] Issue ##{issue_number} not in pipeline project, skipping remove!",
+            )
+
+            return
+          end
+
+          PlanMyStuff::Pipeline.remove!(project_item)
+        end
+
+        # Handles GitHub's +projects_v2_item+ webhook event. Mirrors a dev
+        # dragging an item from "Submitted" to "Started" on the project
+        # board into a +Pipeline.take!+ call so the
+        # +plan_my_stuff.pipeline.started+ event fires.
+        #
+        # Only acts on +action: 'edited'+ where the Status single-select
+        # field changed on the pipeline project. No-ops when the new
+        # status is anything other than "Started", when the +from+ status
+        # is already "Started" (loop guard from +move_to!+ triggering
+        # another webhook), or when the item cannot be located on the
+        # pipeline project.
+        #
+        # @return [void]
+        #
+        def handle_projects_v2_item
+          return unless payload_params[:action] == 'edited'
+
+          item_project_node_id = payload_params.dig(:projects_v2_item, :project_node_id)
+          return if item_project_node_id.blank?
+
+          pipeline_number = PlanMyStuff::Pipeline.resolve_pipeline_project_number
+          project = PlanMyStuff::Project.find(pipeline_number)
+          return unless project.id == item_project_node_id
+
+          field_value = payload_params.dig(:changes, :field_value)
+          return if field_value.blank?
+
+          return unless field_value[:field_name] == 'Status'
+
+          started_name = PlanMyStuff::Pipeline.resolve_status_name(
+            PlanMyStuff::Pipeline::Status::STARTED,
+          )
+
+          to_name = field_value.dig(:to, :name)
+          from_name = field_value.dig(:from, :name)
+
+          # Moved from 'Started'
+          return if from_name == started_name
+
+          # Moved to something other than 'Started'
+          return unless to_name == started_name
+
+          item_node_id = payload_params.dig(:projects_v2_item, :node_id)
+          return if item_node_id.blank?
+
+          project_item = project.items.find { |item| item.id == item_node_id }
+
+          if project_item.nil?
+            Rails.logger.info(
+              "[PlanMyStuff] projects_v2_item #{item_node_id} not found in pipeline project, skipping take!",
+            )
+
+            return
+          end
+
+          PlanMyStuff::Pipeline.take!(project_item)
+        end
+
+        # @return [void]
+        def handle_pull_request
+          action = payload_params.fetch(:action)
+
+          # Only PRs targeting +main+ drive pipeline transitions on
+          # open/draft/reopen. PRs into +production+ are deploy PRs
+          # (often auto-created as drafts) and must not bump items
+          # back to "Started". The +closed+ branch handles its own
+          # base-ref routing.
+          if %w[opened ready_for_review reopened converted_to_draft].include?(action)
+            base_ref = pull_request_params.dig(:base, :ref)
+            return unless base_ref == PlanMyStuff.configuration.main_branch
+          end
+
+          case action
+          when 'opened'
+            pull_request_params[:draft] ? handle_converted_to_draft : handle_ready_for_review
+          when 'ready_for_review', 'reopened'
+            handle_ready_for_review
+          when 'converted_to_draft'
+            handle_converted_to_draft
+          when 'closed'
+            handle_closed
+          end
+        end
+
+        # @return [void]
+        def handle_ready_for_review
+          each_linked_item do |item|
+            PlanMyStuff::Pipeline.mark_in_review!(item)
+          end
+        end
+
+        # @return [void]
+        def handle_converted_to_draft
+          each_linked_item do |item|
+            PlanMyStuff::Pipeline.take!(item)
+          end
+        end
+
+        # @return [void]
+        def handle_closed
+          return unless pull_request_params[:merged]
+
+          base_ref = pull_request_params.dig(:base, :ref)
+          config = PlanMyStuff.configuration
+
+          if base_ref == config.main_branch
+            each_linked_item do |item|
+              PlanMyStuff::Pipeline.mark_ready_for_release!(item)
+            end
+          elsif base_ref == config.production_branch
+            PlanMyStuff::Pipeline.start_deployment!(commit_sha: pull_request_params[:merge_commit_sha])
+          end
+        end
+
+        # @yield [PlanMyStuff::ProjectItem]
+        def each_linked_item
+          messages = fetch_commit_messages
+          numbers = PlanMyStuff::Pipeline::IssueLinker.extract_issue_numbers(
+            pull_request_params,
+            commit_messages: messages,
+          )
+
+          numbers.each do |issue_number|
+            item = PlanMyStuff::Pipeline::IssueLinker.find_project_item(issue_number)
+
+            if item
+              yield(item)
+            else
+              Rails.logger.info("[PlanMyStuff] Issue ##{issue_number} not found in pipeline project, skipping")
+            end
+          end
+        end
+
+        # Fetches commit messages for the current PR via the GitHub API.
+        #
+        # @return [Array<String>] commit messages (empty on failure)
+        #
+        def fetch_commit_messages
+          repo = payload_params.dig(:repository, :full_name)
+          pr_number = pull_request_params[:number]
+
+          # TODO? Add a PR class
+          commits = PlanMyStuff.client.rest(:pull_request_commits, repo, pr_number)
+          commits.map { |c| c[:commit][:message] }
+        rescue PlanMyStuff::APIError => e
+          Rails.logger.warn("[PlanMyStuff] Failed to fetch PR commits: #{e.message}")
+          []
+        end
+    end
+  end
+end

data/app/jobs/plan_my_stuff/application_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module PlanMyStuff
+  # Base class for all PMS gem jobs. Subclasses +::ActiveJob::Base+ so
+  # the gem doesn't depend on the consuming app having an
+  # +ApplicationJob+ constant.
+  class ApplicationJob < ::ActiveJob::Base
+  end
+end

data/app/jobs/plan_my_stuff/reminders_sweep_job.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module PlanMyStuff
+  # Daily-cadence sweep job for reminder dispatch + inactivity auto-close.
+  # Consuming apps enqueue it once; the job self-requeues after each
+  # perform so the schedule persists without requiring a cron/whenever
+  # setup. Queue-adapter-agnostic: runs through ActiveJob's
+  # +set(wait_until:).perform_later+ so any backend works.
+  class RemindersSweepJob < PlanMyStuff::ApplicationJob
+    queue_as :default
+
+    # Only try once per enqueue. Without this, Delayed-style adapters
+    # retry up to 25 times on error and our +around_perform+ +ensure+
+    # re-enqueues a follow-up run on every attempt, causing geometric
+    # duplicate pile-up. With +attempts: 1+, exactly one perform per
+    # +perform_later+; if it fails, the follow-up scheduled in +ensure+
+    # takes over tomorrow.
+    retry_on StandardError, attempts: 1
+
+    around_perform :requeue_for_next_run
+
+    class << self
+      # Next sweep time. Default: 6:30am Eastern tomorrow (today if the
+      # current time is before 6:30am ET). Apps wanting a different
+      # cadence override this on a subclass.
+      #
+      # @return [Time] UTC
+      #
+      def next_run
+        now = Time.current.in_time_zone('Eastern Time (US & Canada)')
+        target = now.change(hour: 6, min: 30, sec: 0)
+        target += 1.day if target <= now
+        target.utc
+      end
+
+      # Schedules a sweep for +next_run+. Used by the after-perform
+      # self-requeue and the +plan_my_stuff:reminders:sweep+ rake task so
+      # both kick off runs on the same cadence (instead of "now").
+      #
+      # @param repo [Symbol, String]
+      #
+      # @return [ActiveJob::Base]
+      #
+      def requeue(repo)
+        set(wait_until: next_run).perform_later(repo)
+      end
+    end
+
+    # @param repo [Symbol, String]
+    #
+    # @return [void]
+    #
+    def perform(repo)
+      @repo_arg = repo
+      PlanMyStuff::Reminders::Sweep.new(repo: repo).call
+      PlanMyStuff::Archive::Sweep.new(repo: repo).call
+    end
+
+    private
+
+      # Runs inside +around_perform+. Re-enqueues the next run in an
+      # +ensure+ so a perform error still schedules the next one. Skips
+      # requeue when perform never captured a repo arg (deserialization
+      # error or direct +.perform+ call with missing kwargs).
+      #
+      # @return [void]
+      #
+      def requeue_for_next_run
+        yield
+      ensure
+        enqueue_next_run
+      end
+
+      # @return [void]
+      def enqueue_next_run
+        return if @repo_arg.nil?
+
+        self.class.requeue(@repo_arg)
+      end
+  end
+end

data/app/views/plan_my_stuff/comments/partials/_form.html.erb

@@ -24,6 +24,13 @@
         )
       %>
     </div>
+
+    <% unless persisted %>
+      <div>
+        <%= form.check_box(:waiting_on_reply) %>
+        <%= form.label(:waiting_on_reply, 'Waiting on reply') %>
+      </div>
+    <% end %>
   <% end %>
 
   <div>

data/app/views/plan_my_stuff/issues/partials/_approvals.html.erb

@@ -0,0 +1,87 @@
+<%
+  approvers = issue.approvers
+  pending_count = issue.pending_approvals.size
+  current_user_id = current_user_id_local
+%>
+
+<% if issue.approvals_required? || support_user %>
+  <section aria-label="Manager approvals">
+    <h3>Approvals</h3>
+
+    <% if issue.approvals_required? %>
+      <% if issue.fully_approved? %>
+        <p><strong>Fully approved</strong></p>
+      <% else %>
+        <p><strong><%= pending_count %> of <%= approvers.size %> approval(s) pending</strong></p>
+      <% end %>
+
+      <ul>
+        <% approvers.each do |approval| %>
+          <li>
+            <%= PlanMyStuff::UserResolver.display_name(approval.user) %> &mdash;
+            <% if approval.approved? %>
+              approved
+              <% if approval.approved_at %>
+                at <%= approval.approved_at.iso8601 %>
+              <% end %>
+            <% else %>
+              pending
+            <% end %>
+
+            <% if approval.pending? && approval.user_id == current_user_id %>
+              <%=
+                button_to(
+                  'Approve',
+                  plan_my_stuff.issue_approval_path(issue.number, approval.user_id, repo: issue.repo.full_name),
+                  method: :patch,
+                  params: { approval: { status: 'approved' } },
+                  form: { style: 'display:inline' },
+                )
+              %>
+            <% end %>
+
+            <% if approval.approved? && (approval.user_id == current_user_id || support_user) %>
+              <%=
+                button_to(
+                  'Revoke',
+                  plan_my_stuff.issue_approval_path(issue.number, approval.user_id, repo: issue.repo.full_name),
+                  method: :patch,
+                  params: { approval: { status: 'pending' } },
+                  form: { style: 'display:inline' },
+                )
+              %>
+            <% end %>
+
+            <% if support_user %>
+              <%=
+                button_to(
+                  'Remove',
+                  plan_my_stuff.issue_approval_path(issue.number, approval.user_id, repo: issue.repo.full_name),
+                  method: :delete,
+                  form: { style: 'display:inline' },
+                )
+              %>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% else %>
+      <p><em>No approvers required</em></p>
+    <% end %>
+
+    <% if support_user %>
+      <%=
+        form_with(
+          scope: :approval,
+          url: plan_my_stuff.issue_approvals_path(issue.number, repo: issue.repo.full_name),
+          method: :post,
+          local: true,
+        ) do |form|
+      %>
+        <%= form.label(:user_ids, 'Add approver IDs (comma-separated)') %>
+        <%= form.text_field(:user_ids) %>
+        <%= form.submit('Add Approvers') %>
+      <% end %>
+    <% end %>
+  </section>
+<% end %>

data/app/views/plan_my_stuff/issues/partials/_labels.html.erb

@@ -5,7 +5,7 @@
       <%=
         button_to(
           'x',
-          plan_my_stuff.issue_remove_label_path(issue.number, label),
+          plan_my_stuff.issue_label_path(issue.number, label),
           method: :delete,
           form: { style: 'display:inline' }
         )
@@ -16,7 +16,7 @@
   <em>No labels</em>
 <% end %>
 
-<%= form_with(url: plan_my_stuff.issue_add_label_path(issue.number), method: :post, local: true) do |form| %>
+<%= form_with(url: plan_my_stuff.issue_labels_path(issue.number), method: :post, local: true) do |form| %>
   <%= form.label(:label_name, 'Add label') %>
   <%= form.text_field(:label_name) %>
   <%= form.submit('Add') %>

data/app/views/plan_my_stuff/issues/partials/_links.html.erb

@@ -0,0 +1,70 @@
+<%
+  # read_only sections have no add form; remove_only sections allow X but
+  # no add (blocking is created from the blocked side; duplicate_of is
+  # created via mark_duplicate! and cleared by reopening on GitHub).
+  sections = [
+    { type: 'parent',       label: 'Parent',       single: true,  add_form: true,  removable: true,  targets: [issue.parent].compact },
+    { type: 'sub_ticket',   label: 'Sub-tickets',  single: false, add_form: true,  removable: true,  targets: issue.sub_tickets },
+    { type: 'blocked_by',   label: 'Blocked by',   single: false, add_form: true,  removable: true,  targets: issue.blocked_by },
+    { type: 'blocking',     label: 'Blocking',     single: false, add_form: false, removable: false, targets: issue.blocking },
+    { type: 'related',      label: 'Related',      single: false, add_form: true,  removable: true,  targets: issue.related },
+    { type: 'duplicate_of', label: 'Duplicate of', single: true,  add_form: false, removable: false, targets: [issue.duplicate_of].compact },
+  ]
+  visible_sections = support_user ? sections : sections.select { |s| s[:type] == 'related' }
+%>
+
+<section aria-label="Ticket links">
+  <h3>Links</h3>
+  <% visible_sections.each do |section| %>
+    <div>
+      <h4><%= section[:label] %></h4>
+      <% if section[:targets].any? %>
+        <ul>
+          <% section[:targets].each do |target| %>
+            <li>
+              <%=
+                link_to(
+                  "#{target.repo.full_name}##{target.number} - #{target.title}",
+                  plan_my_stuff.issue_path(target.number, repo: target.repo.full_name),
+                )
+              %>
+              <% if section[:removable] %>
+                <%
+                  link_id = "#{section[:type]}:#{target.repo.full_name}:#{target.number}"
+                %>
+                <%=
+                  button_to(
+                    'Remove',
+                    plan_my_stuff.issue_link_path(issue.number, link_id, repo: issue.repo.full_name),
+                    method: :delete,
+                    form: { style: 'display:inline' },
+                  )
+                %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      <% else %>
+        <p><em>None</em></p>
+      <% end %>
+
+      <% if section[:add_form] && (!section[:single] || section[:targets].empty?) %>
+        <%=
+          form_with(
+            scope: :link,
+            url: plan_my_stuff.issue_links_path(issue.number, repo: issue.repo.full_name),
+            method: :post,
+            local: true,
+          ) do |form|
+        %>
+          <%= form.hidden_field(:type, value: section[:type]) %>
+          <%= form.label(:issue_number, 'Issue #') %>
+          <%= form.number_field(:issue_number) %>
+          <%= form.label(:repo, 'Repo (optional)') %>
+          <%= form.text_field(:repo, placeholder: issue.repo.full_name) %>
+          <%= form.submit("Add #{section[:label].downcase}") %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</section>

data/app/views/plan_my_stuff/issues/partials/_viewers.html.erb

@@ -9,7 +9,7 @@
         <%=
           button_to(
             'Remove',
-            plan_my_stuff.remove_viewer_issue_path(issue.number, viewer_id: viewer_id, repo: issue.repo.full_name),
+            plan_my_stuff.issue_viewer_path(issue.number, viewer_id, repo: issue.repo.full_name),
             method: :delete
           )
         %>
@@ -20,7 +20,7 @@
   <p>No viewers added.</p>
 <% end %>
 
-<%= form_with(url: plan_my_stuff.add_viewers_issue_path(issue.number, repo: issue.repo.full_name), method: :post) do |form| %>
+<%= form_with(url: plan_my_stuff.issue_viewers_path(issue.number, repo: issue.repo.full_name), method: :post) do |form| %>
   <div>
     <%= form.label(:viewer_ids, 'Add viewer IDs (comma-separated)') %>
     <%= form.text_field(:viewer_ids) %>

data/app/views/plan_my_stuff/issues/show.html.erb

@@ -2,10 +2,26 @@
 
 <p>
   <%= link_to('Edit', plan_my_stuff.edit_issue_path(@issue.number, repo: @issue.repo.full_name)) %>
+  <% if @support_user && @issue.html_url.present? %>
+    <%= link_to('View on GitHub', @issue.html_url, target: '_blank', rel: 'noopener') %>
+  <% end %>
   <% if @issue.state == 'open' %>
-    <%= button_to('Close Issue', plan_my_stuff.close_issue_path(@issue.number, repo: @issue.repo.full_name), method: :patch) %>
+    <%= button_to('Close Issue', plan_my_stuff.issue_closure_path(@issue.number, repo: @issue.repo.full_name), method: :post) %>
   <% else %>
-    <%= button_to('Reopen Issue', plan_my_stuff.reopen_issue_path(@issue.number, repo: @issue.repo.full_name), method: :patch) %>
+    <%= button_to('Reopen Issue', plan_my_stuff.issue_closure_path(@issue.number, repo: @issue.repo.full_name), method: :delete) %>
+  <% end %>
+  <% if @support_user && @issue.state == 'open' %>
+    <% if @issue.metadata.waiting_on_user_at.present? %>
+      <%= button_to('Mark replied', plan_my_stuff.issue_waiting_path(@issue.number, repo: @issue.repo.full_name), method: :delete) %>
+    <% else %>
+      <%= button_to('Mark waiting', plan_my_stuff.issue_waiting_path(@issue.number, repo: @issue.repo.full_name), method: :post) %>
+    <% end %>
+  <% end %>
+  <% if @support_user && @pipeline_enabled && (@pipeline_item.nil? || @pipeline_item.status == PlanMyStuff::Pipeline.resolve_status_name(PlanMyStuff::Pipeline::Status::SUBMITTED)) %>
+    <%= button_to('Take', plan_my_stuff.issue_take_path(@issue.number, repo: @issue.repo.full_name), method: :post) %>
+  <% end %>
+  <% if @support_user %>
+    <%= link_to('Start Testing Project', plan_my_stuff.new_testing_project_path(subject_url: @issue.html_url)) %>
   <% end %>
 </p>
 
@@ -27,6 +43,28 @@
 
 <hr>
 
+<%=
+  render({
+    partial: 'plan_my_stuff/issues/partials/links',
+    locals: { issue: @issue, support_user: @support_user },
+  })
+%>
+
+<hr>
+
+<%=
+  render({
+    partial: 'plan_my_stuff/issues/partials/approvals',
+    locals: {
+      issue: @issue,
+      support_user: @support_user,
+      current_user_id_local: @current_user_id,
+    },
+  })
+%>
+
+<hr>
+
 <h2>Comments (<%= @comments.size %>)</h2>
 
 <% if @comments.any? %>
@@ -38,6 +76,11 @@
           <%= link_to('Edit', plan_my_stuff.edit_issue_comment_path(@issue.number, comment.id, repo: @issue.repo.full_name)) %>
         </p>
       <% end %>
+      <% if @support_user && comment.html_url.present? %>
+        <p>
+          <%= link_to('View on GitHub', comment.html_url, target: '_blank', rel: 'noopener') %>
+        </p>
+      <% end %>
     </div>
   <% end %>
 <% else %>
@@ -51,7 +94,7 @@
     partial: 'plan_my_stuff/comments/partials/form',
     locals: {
       issue: @issue,
-      comment: PlanMyStuff::Comment.new,
+      comment: PlanMyStuff::Comment.new(visibility: :public),
       support_user: @support_user,
     },
   })

data/app/views/plan_my_stuff/projects/index.html.erb

@@ -1,10 +1,21 @@
 <h1>Projects</h1>
 
+<p>
+  <%= link_to('All', plan_my_stuff.projects_path(filter: 'all')) %>
+  <%= link_to('Regular', plan_my_stuff.projects_path(filter: 'regular')) %>
+  <%= link_to('Testing', plan_my_stuff.projects_path(filter: 'testing')) %>
+</p>
+
 <% if @projects.any? %>
   <ul>
     <% @projects.each do |project| %>
       <li>
-        <%= link_to(project.title, plan_my_stuff.project_path(project.number)) %>
+        <% if project.is_a?(PlanMyStuff::TestingProject) %>
+          <%= link_to(project.title, plan_my_stuff.testing_project_path(project.number)) %>
+          <span>[Testing]</span>
+        <% else %>
+          <%= link_to(project.title, plan_my_stuff.project_path(project.number)) %>
+        <% end %>
       </li>
     <% end %>
   </ul>
@@ -13,3 +24,6 @@
 <% end %>
 
 <p><%= link_to('New Project', plan_my_stuff.new_project_path) %></p>
+<% if @support_user %>
+  <p><%= link_to('New Testing Project', plan_my_stuff.new_testing_project_path) %></p>
+<% end %>