From 594093429add8c6fa95b6a09c52bc4069021b5ff Mon Sep 17 00:00:00 2001
From: kiragrammel <kira.grammel@student.hpi.de>
Date: Thu, 27 Jul 2023 15:35:08 +0200
Subject: [PATCH] Fix contributor renaming and linting

---
 app/controllers/concerns/submission_parameters.rb         | 1 +
 app/controllers/exercises_controller.rb                   | 8 ++++----
 app/controllers/flowr_controller.rb                       | 2 +-
 ...6_rename_user_columns_to_contributor_in_submissions.rb | 2 +-
 db/migrate/20230710131250_create_programming_groups.rb    | 2 +-
 db/schema.rb                                              | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/concerns/submission_parameters.rb b/app/controllers/concerns/submission_parameters.rb
index b6efddfdc..b513dbc06 100644
--- a/app/controllers/concerns/submission_parameters.rb
+++ b/app/controllers/concerns/submission_parameters.rb
@@ -23,6 +23,7 @@ def merge_user(params)
     # The study_group_id might not be present in the session (e.g. for internal users), resulting in session[:study_group_id] = nil which is intended.
     params.merge(
       contributor_id: current_user.id,
+      contributor_type: current_user.class.name,
       study_group_id: current_user.current_study_group_id
     )
   end
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 9432be6b1..7cf53026c 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -339,10 +339,10 @@ def implement
     @paths = collect_paths(@files)
 
     @contributor_id = if current_user.respond_to? :external_id
-                 current_user.external_id
-               else
-                 current_user.id
-               end
+                        current_user.external_id
+                      else
+                        current_user.id
+                      end
   end
 
   def set_course_token
diff --git a/app/controllers/flowr_controller.rb b/app/controllers/flowr_controller.rb
index 278fa31b0..397b2d0e6 100644
--- a/app/controllers/flowr_controller.rb
+++ b/app/controllers/flowr_controller.rb
@@ -5,7 +5,7 @@ def insights
     require_user!
     # get the latest submission for this user that also has a test run (i.e. structured_errors if applicable)
     submission = Submission.joins(:testruns)
-      .where(submissions: {user: current_user})
+      .where(submissions: {contributor: current_user})
       .includes(structured_errors: [structured_error_attributes: [:error_template_attribute]])
       .merge(Testrun.order(created_at: :desc)).first
 
diff --git a/db/migrate/20230710130036_rename_user_columns_to_contributor_in_submissions.rb b/db/migrate/20230710130036_rename_user_columns_to_contributor_in_submissions.rb
index 6585af188..fafc5f2c4 100644
--- a/db/migrate/20230710130036_rename_user_columns_to_contributor_in_submissions.rb
+++ b/db/migrate/20230710130036_rename_user_columns_to_contributor_in_submissions.rb
@@ -7,4 +7,4 @@ def change
       t.rename :user_type, :contributor_type
     end
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20230710131250_create_programming_groups.rb b/db/migrate/20230710131250_create_programming_groups.rb
index dc6d9df05..5184f38bc 100644
--- a/db/migrate/20230710131250_create_programming_groups.rb
+++ b/db/migrate/20230710131250_create_programming_groups.rb
@@ -2,7 +2,7 @@
 
 class CreateProgrammingGroups < ActiveRecord::Migration[7.0]
   def change
-    create_table :programming_groups do |t|
+    create_table :programming_groups, id: :uuid do |t|
       t.belongs_to :exercise
 
       t.timestamps
diff --git a/db/schema.rb b/db/schema.rb
index 84e1218ee..8963bb7f3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -360,7 +360,7 @@
     t.index ["user_type", "user_id"], name: "index_programming_group_memberships_on_user"
   end
 
-  create_table "programming_groups", force: :cascade do |t|
+  create_table "programming_groups", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.bigint "exercise_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false