Add Contributor and ContributorCreation

app/models/concerns/contributor.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Contributor
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :submissions, as: :contributor
+  end
+end

app/models/concerns/contributor_creation.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ContributorCreation
+  extend ActiveSupport::Concern
+  include Contributor
+
+  included do
+    belongs_to :contributor, polymorphic: true
+    alias_method :user, :contributor
+    alias_method :author, :user
+    alias_method :creator, :user
+  end
+end

app/models/programming_group.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ProgrammingGroup < ApplicationRecord
+  include Contributor
+
   has_many :programming_group_memberships, dependent: :destroy
   has_many :external_users, through: :programming_group_memberships, source_type: 'ExternalUser', source: :user
   has_many :internal_users, through: :programming_group_memberships, source_type: 'InternalUser', source: :user

app/models/submission.rb

@@ -2,7 +2,7 @@
 
 class Submission < ApplicationRecord
   include Context
-  include Creation
+  include ContributorCreation
   include ActionCableHelper
 
   CAUSES = %w[assess download file render run save submit test autosave requestComments remoteAssess
@@ -26,8 +26,8 @@ class Submission < ApplicationRecord
                               }, foreign_key: :contributor_id, class_name: 'InternalUser', optional: true
 
   belongs_to :programming_groups, lambda {
-                                  where(submissions: {contributor_type: 'ProgrammingGroup'}).includes(:submissions)
-                                }, foreign_key: :contributor_id, class_name: 'ProgrammingGroup', optional: true
+                                    where(submissions: {contributor_type: 'ProgrammingGroup'}).includes(:submissions)
+                                  }, foreign_key: :contributor_id, class_name: 'ProgrammingGroup', optional: true
 
   delegate :execution_environment, to: :exercise