Display DataActivities on the security page

app/controllers/security_controller.rb

@@ -4,21 +4,21 @@ class SecurityController < ApplicationController
   def show
     @activity = current_user.security_activities.order(created_at: :desc)
     @data_exchanges = current_user
-      .access_grants
+      .data_activities
       .order(created_at: :desc)
-      .map { |g| grant_to_exchange(g) }
+      .map { |a| activity_to_exchange(a) }
       .compact
   end
 
 private
 
-  def grant_to_exchange(grant)
-    scopes = grant.scopes.map(&:to_sym) - ScopeDefinition.new.hidden_scopes
+  def activity_to_exchange(activity)
+    scopes = activity.scopes.split(" ").map(&:to_sym) - ScopeDefinition.new.hidden_scopes
     return if scopes.empty?
 
     {
-      application_name: grant.application.name,
-      created_at: grant.created_at,
+      application_name: activity.oauth_application.name,
+      created_at: activity.created_at,
       scopes: scopes,
     }
   end

spec/factories/activities.rb

@@ -5,4 +5,7 @@
     client_id { "MyString" }
     ip_address { "MyString" }
   end
+
+  factory :data_activity do
+  end
 end

spec/requests/data_exchange_spec.rb

@@ -12,15 +12,23 @@
     )
   end
 
-  let!(:access_grant) do
+  let(:token) do
     FactoryBot.create(
-      :oauth_access_grant,
+      :oauth_access_token,
       resource_owner_id: user.id,
       application_id: application.id,
+      scopes: application.scopes,
+    )
+  end
+
+  let!(:activity) do
+    FactoryBot.create(
+      :data_activity,
+      user_id: user.id,
+      oauth_application_id: application.id,
       created_at: Time.zone.now,
       scopes: "openid email transition_checker",
-      redirect_uri: "https://www.gov.uk",
-      expires_in: 600,
+      token: token.token,
     )
   end