Merge pull request code-dot-org#15200 from code-dot-org/fix-gallery-project-links

Fix project links in the public gallery

Author: davidsbailey

dashboard/lib/projects_list.rb

@@ -90,6 +90,7 @@ def fetch_published_project_types(project_types, limit:, offset: 0)
       {}.tap do |projects|
         project_types.map do |type|
           projects[type] = PEGASUS_DB[:storage_apps].
+            select_append(Sequel[:storage_apps][:id].as(:channel_id)).
             join(:user_storage_ids, id: :storage_id).
             join(users, id: :user_id).
             where(state: 'active', project_type: type).
@@ -104,7 +105,7 @@ def fetch_published_project_types(project_types, limit:, offset: 0)
 
     def get_published_project_data(project)
       project_value = project[:value] ? JSON.parse(project[:value]) : {}
-      channel_id = storage_encrypt_channel_id(project[:storage_id], project[:id])
+      channel_id = storage_encrypt_channel_id(project[:storage_id], project[:channel_id])
       {
         channel: channel_id,
         name: project_value['name'],

dashboard/test/controllers/api/v1/projects/public_gallery_controller_test.rb

@@ -4,7 +4,8 @@ class Api::V1::Projects::PublicGalleryControllerTest < ActionController::TestCas
   published_applab_project = nil
   setup do
     published_applab_project = {
-      id: 33,
+      storage_id: 22,
+      channel_id: 33,
       published_at: '2017-03-03T00:00:00.000-08:00',
       project_type: 'applab',
       value: {
@@ -95,7 +96,7 @@ class Api::V1::Projects::PublicGalleryControllerTest < ActionController::TestCas
     assert_equal 1, categories_list.length
     project_row = categories_list['applab'].first
     assert_equal 'Charlies App', project_row['name']
-    assert_equal 'STUB_CHANNEL_ID-1234', project_row['channel']
+    assert_equal 'STUB_CHANNEL_ID-22-33', project_row['channel']
     assert_equal '/v3/files-public/charlies_thumbnail.png', project_row['thumbnailUrl']
     assert_equal 'applab', project_row['type']
     assert_equal '2017-03-03T00:00:00.000-08:00', project_row['publishedAt']
@@ -111,7 +112,7 @@ class Api::V1::Projects::PublicGalleryControllerTest < ActionController::TestCas
     assert_equal 1, categories_list.length
     project_row = categories_list['applab'].first
     assert_equal 'App with no thumbnail', project_row['name']
-    assert_equal nil, project_row['thumbnailUrl']
+    assert_nil project_row['thumbnailUrl']
   end
 
   test 'project details are correct listing all published projects' do
@@ -128,7 +129,7 @@ class Api::V1::Projects::PublicGalleryControllerTest < ActionController::TestCas
 
     project_row = categories_list['applab'].first
     assert_equal 'Charlies App', project_row['name']
-    assert_equal 'STUB_CHANNEL_ID-1234', project_row['channel']
+    assert_equal 'STUB_CHANNEL_ID-22-33', project_row['channel']
     assert_equal '/v3/files-public/charlies_thumbnail.png', project_row['thumbnailUrl']
     assert_equal 'applab', project_row['type']
     assert_equal '2017-03-03T00:00:00.000-08:00', project_row['publishedAt']
@@ -139,6 +140,6 @@ class Api::V1::Projects::PublicGalleryControllerTest < ActionController::TestCas
   private
 
   def db_result(result)
-    stub(join: stub(join: stub(where: stub(exclude: stub(order: stub(limit: stub(offset: result)))))))
+    stub(select_append: stub(join: stub(join: stub(where: stub(exclude: stub(order: stub(limit: stub(offset: result))))))))
   end
 end

dashboard/test/controllers/api/v1/projects/section_projects_controller_test.rb

@@ -73,7 +73,7 @@ class Api::V1::Projects::SectionProjectsControllerTest < ActionController::TestC
     # this verifies that the hidden project was not shown.
     assert_equal 1, projects_list.size
     project_row = projects_list.first
-    assert_equal 'STUB_CHANNEL_ID-1234', project_row['channel']
+    assert_equal 'STUB_CHANNEL_ID-11-22', project_row['channel']
     assert_equal 'Bobs App', project_row['name']
     assert_equal @student.name, project_row['studentName']
     assert_equal 'applab', project_row['type']

dashboard/test/controllers/xhr_proxy_controller_test.rb

@@ -8,7 +8,7 @@ class XhrProxyControllerTest < ActionController::TestCase
   XHR_URI = 'https://www.wikipedia.org/foo?a=1&b=2'
   XHR_DATA = '{"key1":"value1", "key2":2, "obj":{"x":3, "y":4}}'
   XHR_CONTENT_TYPE = 'application/json'
-  CHANNEL_ID = $stub_encrypted_channel_id
+  CHANNEL_ID = 'STUB_CHANNEL_ID-1234'
   BAD_CHANNEL_MSG = "XhrProxyController request with invalid channel_id"
 
   test "should fetch proxied media with correct content type" do

dashboard/test/test_helper.rb

@@ -450,9 +450,8 @@ def storage_id(_)
   SecureRandom.hex
 end
 
-$stub_encrypted_channel_id = 'STUB_CHANNEL_ID-1234'
-def storage_encrypt_channel_id(_, _)
-  $stub_encrypted_channel_id
+def storage_encrypt_channel_id(storage_id, channel_id)
+  "STUB_CHANNEL_ID-#{storage_id}-#{channel_id}"
 end
 
 $stub_channel_owner = 33