Implement Teach Computing to Shopify redirects

.env.defaults

@@ -21,6 +21,7 @@ STEM_OAUTH_SITE=https://ncce-www-stage-int.stem.org.uk
 STEM_ACCOUNT_SITE="preprod-account.stem.org.uk"
 STEM_AUTH0_DOMAIN=user-profile-preprod.uk.auth0.com
 STEM_COURSE_REDIRECT=https://ncce-www-stage-int.stem.org.uk
+STEM_CPD_STORE_REDIRECT=https://cpd.stem.org.uk/
 
 MANDRILL_SMTP_USERNAME=username
 MANDRILL_API_KEY=key

.env.test

@@ -29,6 +29,7 @@ STEM_ACCOUNT_SITE="preprod-account.stem.org.uk"
 STEM_COURSE_REDIRECT=https://ncce-www-stage-int.stem.org.uk
 STEM_AUTH0_DOMAIN=user-profile-preprod.uk.auth0.com
 
+STEM_CPD_STORE_REDIRECT=https://cpd.stem.org.uk
 
 CURRICULUM_TEST_SCHEMA_PATH='spec/support/curriculum/curriculum_schema.json'
 CURRICULUM_APP_URL=https://staging-curriculum.teachcomputing.org

app/helpers/courses_helper.rb

@@ -44,8 +44,8 @@ def max_fee(fees)
     "£#{sorted_fees[0].fee}"
   end
 
-  def stem_course_link(course_template_no)
-    "#{Rails.application.config.stem_course_redirect}/cpdredirect/#{course_template_no}"
+  def stem_course_link(course_activity_code)
+    "#{Rails.application.config.stem_course_redirect}/app/#{course_activity_code}"
   end
 
   def stripped_summary(string)

app/presenters/live_booking_presenter.rb

@@ -79,8 +79,8 @@ def course_button(occurrences, course_template_no)
     )
   end
 
-  def booking_path(occurrence_id)
-    "#{Rails.application.config.stem_course_redirect}/cpdredirect/#{occurrence_id}"
+  def booking_path(stem_activity_code)
+    "#{Rails.application.config.stem_course_redirect}/app/#{stem_activity_code}"
   end
 
   def address(occurrence)

app/presenters/online_booking_presenter.rb

@@ -81,8 +81,8 @@ def completed_button_introduction
     "You will be taken to the MyLearning platform for further details."
   end
 
-  def booking_path(stem_course_id)
-    "#{Rails.application.config.stem_course_redirect}/cpdredirect/#{stem_course_id}"
+  def booking_path(stem_activity_code)
+    "#{Rails.application.config.stem_course_redirect}/app/#{stem_activity_code}"
   end
 
   def show_stem_occurrence_list(always_on)

app/views/courses/_aside-booking.html.erb

@@ -20,29 +20,30 @@
                   <%= @booking.address(occurrence) %>
                 </span>
                 <span class='ncce-booking-list__button_wrapper'>
-                  <%= link_to(
-                    @booking.booking_button_title,
-                    @booking.booking_path(occurrence.course_occurrence_no),
-                    class: 'govuk-button button',
-                    draggable: 'false',
-                    data: { event_action: 'click', event_category: 'course details', event_label: 'join course' },
-                    target: :_blank
-                  ) %>
+
                 </span>
               </div>
             </li>
           <% end %>
+          <%= link_to(
+            @booking.authenticated_title,
+            @booking.booking_path(@activity.stem_activity_code),
+            class: 'govuk-button button--aside govuk-!-margin-top-4',
+            draggable: 'false',
+            data: { event_action: 'click', event_category: 'course details', event_label: 'join online course' },
+            target: :_blank
+            ) %>
           </ul>
         <% else %>
           <p class="govuk-body">
             <%= link_to(
-                @booking.authenticated_title,
-                @booking.booking_path(@activity.stem_course_template_no),
-                class: 'govuk-button button--aside',
-                draggable: 'false',
-                data: { event_action: 'click', event_category: 'course details', event_label: 'join online course' },
-                target: :_blank
-                ) %>
+              @booking.authenticated_title,
+              @booking.booking_path(@activity.stem_activity_code),
+              class: 'govuk-button button--aside',
+              draggable: 'false',
+              data: { event_action: 'click', event_category: 'course details', event_label: 'join online course' },
+              target: :_blank
+              ) %>
           </p>
           <%= render('start-date', date: @start_date) if (@start_date && !@started)  %>
         <% end %>

config/application.rb

@@ -59,7 +59,7 @@ class Application < Rails::Application
     config.stem_credentials_access_token = ENV["STEM_CREDENTIALS_ACCESS_TOKEN_KEY"]
     config.stem_credentials_refresh_token = ENV["STEM_CREDENTIALS_REFRESH_TOKEN_KEY"]
 
-    config.stem_course_redirect = ENV["STEM_COURSE_REDIRECT"]
+    config.stem_course_redirect = ENV["STEM_CPD_STORE_REDIRECT"]
 
     # default is true
     config.secure_cookies = ENV["SECURE_COOKIES"] != "off"

spec/helpers/courses_helper_spec.rb

@@ -86,7 +86,7 @@
 
   describe("#stem_course_link") do
     it "returns the link to the course page on stem.org.uk" do
-      expect(helper.stem_course_link("01de2624")).to eq "#{ENV.fetch("STEM_COURSE_REDIRECT")}/cpdredirect/01de2624"
+      expect(helper.stem_course_link("01de2624")).to eq "#{ENV.fetch("STEM_CPD_STORE_REDIRECT")}/app/01de2624"
     end
   end
 

spec/presenters/live_booking_presenter_spec.rb

@@ -70,7 +70,7 @@
       it "links to the course booking path" do
         expect(
           described_class.new.course_button([], "FAKE_COURSE_ID")
-        ).to match(/href="https:\/\/ncce-www-stage-int.stem.org.uk\/cpdredirect\/FAKE_COURSE_ID"/)
+        ).to match(/href="https:\/\/cpd.stem.org.uk\/app\/FAKE_COURSE_ID"/)
       end
 
       it 'says "View course"' do
@@ -84,7 +84,7 @@
       it "links to the course booking path" do
         expect(
           described_class.new.course_button(Array.new(20), "FAKE_COURSE_ID")
-        ).to match(/href="https:\/\/ncce-www-stage-int.stem.org.uk\/cpdredirect\/FAKE_COURSE_ID"/)
+        ).to match(/href="https:\/\/cpd.stem.org.uk\/app\/FAKE_COURSE_ID"/)
       end
 
       it 'says "See more dates"' do
@@ -107,7 +107,7 @@
     it "is the full URI of the stem website booking" do
       expect(
         described_class.new.booking_path("FAKE_COURSE_ID")
-      ).to eq "https://ncce-www-stage-int.stem.org.uk/cpdredirect/FAKE_COURSE_ID"
+      ).to eq "https://cpd.stem.org.uk/app/FAKE_COURSE_ID"
     end
   end
 

spec/views/courses/_aside-booking.html_spec.rb

@@ -53,9 +53,8 @@
           )
         end
 
-        it "renders link to STEM Learning booking page using occurence" do
-          occurence = occurrences.first
-          expected_link = "https://ncce-www-stage-int.stem.org.uk/cpdredirect/#{occurence.course_occurrence_no}"
+        it "renders link to STEM Learning booking page" do
+          expected_link = "https://cpd.stem.org.uk/app/#{activity.stem_activity_code}"
           expect(rendered).to have_link("Join", href: expected_link)
         end
 
@@ -96,7 +95,7 @@
           end
 
           it "renders link to STEM Learning booking page" do
-            expected_link = "https://ncce-www-stage-int.stem.org.uk/cpdredirect/#{activity.stem_course_template_no}"
+            expected_link = "https://cpd.stem.org.uk/app/#{activity.stem_activity_code}"
             expect(rendered).to have_link("Join this course", href: expected_link)
           end
 
@@ -114,7 +113,7 @@
           end
 
           it "renders link to STEM Learning booking page" do
-            expected_link = "https://ncce-www-stage-int.stem.org.uk/cpdredirect/#{activity.stem_course_template_no}"
+            expected_link = "https://cpd.stem.org.uk/app/#{activity.stem_activity_code}"
             expect(rendered).to have_link("Join this course", href: expected_link)
           end
 
@@ -288,7 +287,7 @@
 
               expect(rendered).to have_link(
                 "Book",
-                href: "https://ncce-www-stage-int.stem.org.uk/cpdredirect/#{occurrence.course_occurrence_no}"
+                href: "https://cpd.stem.org.uk/app/#{activity.stem_activity_code}"
               )
             end
           end
@@ -452,7 +451,7 @@
 
               expect(rendered).to have_link(
                 "Book",
-                href: "https://ncce-www-stage-int.stem.org.uk/cpdredirect/#{occurrence.course_occurrence_no}"
+                href: "https://cpd.stem.org.uk/app/#{activity.stem_activity_code}"
               )
             end
           end