Merge pull request #991 from alphagov/update-support-tickets-endpoint…

…-part1 Update support tickets endpoint part1
alphagov · Jul 22, 2024 · 9be3c3c · 9be3c3c
2 parents f2d98ef + 029d633
commit 9be3c3c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 37 deletions.
diff --git a/app/models/support_ticket.rb b/app/models/support_ticket.rb
@@ -6,29 +6,20 @@ class SupportTicket
   def initialize(attributes)
     @subject = attributes.fetch(:subject, nil)
     @tags = attributes.fetch(:tags, nil)
-    @user_agent = attributes.fetch(:user_agent, nil)
     @description = attributes.fetch(:description, nil)
   end
 
   def attributes
     {
       "subject" => subject,
       "tags" => tags,
-      "body" => ticket_body,
+      "comment" => {
+        "body" => description,
+      },
     }
   end
 
 private
 
-  attr_reader :subject, :tags, :user_agent, :description
-
-  def ticket_body
-    <<-TICKET_BODY.strip_heredoc
-      [User agent]
-      #{user_agent}
-
-      [Details]
-      #{description}
-    TICKET_BODY
-  end
+  attr_reader :subject, :tags, :description
 end
diff --git a/spec/models/support_ticket_spec.rb b/spec/models/support_ticket_spec.rb
@@ -21,20 +21,15 @@
     support_ticket = described_class.new(
       subject: "Feedback for app",
       tags: %w[app_name],
-      user_agent: "Safari",
       description: "Ticket details go here.",
     )
 
     expect(support_ticket.attributes).to eq(
       "subject" => "Feedback for app",
       "tags" => %w[app_name],
-      "body" => <<-TICKET_BODY.strip_heredoc,
-                  [User agent]
-                  Safari
-
-                  [Details]
-                  Ticket details go here.
-      TICKET_BODY
+      "comment" => {
+        "body" => "Ticket details go here.",
+      },
     )
   end
 
@@ -48,13 +43,9 @@
     expect(support_ticket.attributes).to eq(
       "subject" => "Feedback for app",
       "tags" => %w[app_name],
-      "body" => <<-TICKET_BODY.strip_heredoc,
-                  [User agent]
-
-
-                  [Details]
-                  Ticket details go here.
-      TICKET_BODY
+      "comment" => {
+        "body" => "Ticket details go here.",
+      },
     )
   end
 end
diff --git a/spec/requests/support_tickets_spec.rb b/spec/requests/support_tickets_spec.rb
@@ -8,7 +8,6 @@
          params: {
            subject: "Feedback for app",
            tags: %w[app_name],
-           user_agent: "Safari",
            description: "Ticket details go here.",
          }
 
@@ -20,20 +19,15 @@
     zendesk_request = expect_zendesk_to_receive_ticket(
       "subject" => "Feedback for app",
       "tags" => %w[app_name],
-      "body" => <<-TICKET_BODY.strip_heredoc,
-                 [User agent]
-                 Safari
-
-                 [Details]
-                 Ticket details go here.
-      TICKET_BODY
+      "comment" => {
+        "body" => "Ticket details go here.",
+      },
     )
 
     post "/support-tickets",
          params: {
            subject: "Feedback for app",
            tags: %w[app_name],
-           user_agent: "Safari",
            description: "Ticket details go here.",
          }