[Tbt-394] expand csv export (#345)

* move csv_export_ready from billing to plan mailer

* use from method

* small template changes

* remove csv export from billing mailer add specs

Author: nikolaTrichkovski

lib/travis/addons/billing/mailer/billing_mailer.rb

@@ -60,14 +60,6 @@ def subscription_cancellation_requested(receivers, subscription, owner, charge,
             mail(from: cancellation_email, to: receivers, subject: subject, template_path: 'billing_mailer')
           end
 
-          def csv_export_ready(receivers, subscription_or_report, owner, charge, event, report_or_other, cc_last_digits)
-            @report = subscription_or_report
-            @owner = owner
-            subject = "Travis CI: Your #{@report[:type]&.capitalize} Report is Ready"
-
-            mail(from: travis_email, to: receivers, subject: subject, template_path: 'billing_mailer')
-          end
-
           private
 
             def travis_email

lib/travis/addons/billing/mailer/views/billing_mailer/csv_export_ready.html.erb

@@ -39,26 +39,13 @@ def cc_last_digits
           params[:cc_last_digits]
         end
 
-        def report
-          params[:report]
-        end
-
         private
 
-          def send_email
-            Mailer::BillingMailer.public_send(
-              params[:email_type],
-              recipients,
-              params[:email_type] == 'csv_export_ready' ? report : subscription,
-              owner,
-              charge,
-              event,
-              invoice,
-              cc_last_digits
-            ).deliver
-            emails = recipients.map { |r| 'email=' + obfuscate_email_address(r) }.join(' ')
-            info "type=#{type} status=sent msg='email sent #{emails}'"
-          end
+        def send_email
+          Mailer::BillingMailer.public_send(params[:email_type], recipients, subscription, owner, charge, event, invoice, cc_last_digits).deliver
+          emails = recipients.map { |r| 'email=' + obfuscate_email_address(r) }.join(' ')
+          info "type=#{type} status=sent msg='email sent #{emails}'"
+        end
       end
     end
   end

lib/travis/addons/billing/task.rb

@@ -93,6 +93,13 @@ def shared_plan_no_admin(receivers, owner, params)
             mail(from: from, to: @recipients, subject: subject, template_path: 'plan_mailer')
           end
 
+          def csv_export_ready(receivers, owner, params)
+            @owner = owner
+            @report = params.fetch(:report)
+            subject = "Travis CI: Your Credits Consumption Report is Ready"
+
+            mail(from: from, to: receivers, subject: subject, template_path: 'plan_mailer')
+          end
           private
 
             def from

lib/travis/addons/plan/mailer/plan_mailer.rb

@@ -0,0 +1,46 @@
+<!-- Plan Message Section -->
+<tr>
+  <td id="plan-message-section" align="center" valign="top" style="padding-bottom: 40px;">
+    <h1 id="plan-message-header">
+      Report is Ready!
+    </h1>
+    <p style="margin: 0px; font-size: 18px; margin-bottom: 10px;">
+      Hello,
+    </p>
+    <p style="margin: 0px; font-size: 18px; margin-bottom: 20px;">
+      Your credits consumption report for
+      <span id="plan-message-github-name" style="color: #15B75E;">
+        <%= @owner && (@owner[:name] || @owner[:login]) || 'your account' %>
+      </span>
+      is now ready for download.
+    </p>
+
+    <% if @report && @report[:date_range] %>
+    <p style="margin: 0px; font-size: 18px; margin-bottom: 20px;">
+      This report contains data <%= @report[:date_range] %>.
+    </p>
+    <% end %>
+
+    <p style="margin: 0px; font-size: 18px; margin-bottom: 20px;">
+      <% if @report && @report[:expires_at] %>
+        This download link will expire on <%= Time.parse(@report[:expires_at]).strftime('%B %d, %Y at %H:%M %Z') rescue 'the expiration date' %>.
+      <% else %>
+        This download link will expire in 24 hours.
+      <% end %>
+    </p>
+
+    <p style="margin: 0px; font-size: 18px; margin-bottom: 30px; margin-top: 30px;">
+      <a href="<%= @report && @report[:download_url] || '#' %>" style="font: bold 14px Arial; color: #FFFFFF; background-color: #32D282; text-decoration: none; padding: 12px 30px; border-radius: 3px;">
+        DOWNLOAD REPORT
+      </a>
+    </p>
+  </td>
+</tr>
+  <tr>
+  <td id="closing-message-section" align="center" valign="top" style="padding: 0px 30px 20px 30px;">
+    <p style="margin: 0px; font-size: 18px;">Happy building!</p>
+    <p style="margin: 0px; font-size: 18px;">
+      <strong>Travis CI Team</strong>
+    </p>
+  </td>
+</tr>

lib/travis/addons/plan/mailer/views/plan_mailer/csv_export_ready.html.erb

@@ -281,49 +281,4 @@
 
 		end
   end
-
-  describe '#csv_export_ready' do
-    subject(:mail) do
-      described_class.csv_export_ready(
-        [recipient],
-        report,
-        owner,
-        charge,
-        event,
-        report_or_other = nil,
-        options
-      )
-    end
-
-    let(:recipient) { 'nikola.granit@yahoo.com' }
-    let(:owner) { { name: 'Ruby Monsters', login: 'rubymonsters', vcs_type: 'GithubUser', owner_type: 'User' } }
-    let(:charge) { nil }
-    let(:event) { nil }
-    let(:report) { { type: 'usage', download_url: download_url, expires_at: (Time.now + 86400).iso8601 } }
-    let(:download_url) { 'https://example.com/report.csv' }
-    let(:options) { {} }
-
-    it 'is addressed to the user' do
-      expect(mail.to).to eq([recipient])
-    end
-
-    it 'comes from Travis' do
-      expect(mail.from).to eq(['success@travis-ci.com'])
-    end
-
-    it 'has the right subject' do
-      expect(mail.subject).to eq('Travis CI: Your Usage Report is Ready')
-    end
-
-    it 'contains the download link' do
-      html = Capybara.string(mail.body.to_s)
-      expect(html).to have_link('Download Report', href: download_url)
-    end
-
-    it 'shows the report type' do
-      html = Capybara.string(mail.body.to_s)
-      expect(html).to have_text('Your usage report for')
-      expect(html).to have_text('is now ready for download.')
-    end
-  end
 end