fix: removed test output from feature branch for final merging

Author: DudeUnleashed

app/api/api_root.rb

@@ -131,6 +131,10 @@ class ApiRoot < Grape::API
   AuthenticationHelpers.add_auth_to WebcalApi
 
   AuthenticationHelpers.add_auth_to Courseflow::CourseApi
+  AuthenticationHelpers.add_auth_to Courseflow::CourseMapApi
+  AuthenticationHelpers.add_auth_to Courseflow::CourseMapUnitApi
+  AuthenticationHelpers.add_auth_to Courseflow::SpecializationApi
+  AuthenticationHelpers.add_auth_to Courseflow::RequirementSetApi
   AuthenticationHelpers.add_auth_to UnitDefinitionApi
 
   add_swagger_documentation \

app/models/courseflow/course.rb

@@ -1,12 +1,10 @@
 module Courseflow
-class Course < ApplicationRecord
-
-  # Validation rules for attributes in the course model
-  validates :name, presence: true, length: {maximum: 250}
-  validates :code, presence: true, uniqueness: true, length: {maximum: 10} # assuming that there is only one entry for each code, not sure if this is the case
-  validates :year, presence: true
-  validates :version, presence: true
-  validates :url, presence: true, format: {with: URI::DEFAULT_PARSER.make_regexp}
-
-end
+  class Course < ApplicationRecord
+    # Validation rules for attributes in the course model
+    validates :name, presence: true, length: {maximum: 250}
+    validates :code, presence: true, uniqueness: true, length: {maximum: 10} # assuming that there is only one entry for each code, not sure if this is the case
+    validates :year, presence: true
+    validates :version, presence: true
+    validates :url, presence: true, format: {with: URI::DEFAULT_PARSER.make_regexp}
+  end
 end

app/models/courseflow/course_map.rb

@@ -1,9 +1,7 @@
 module Courseflow
-class CourseMap < ApplicationRecord
-
-  # Validation rules for attributes in the course map model
-  validates :userId, presence: true
-  validates :courseId, presence: true
-
-end
+  class CourseMap < ApplicationRecord
+    # Validation rules for attributes in the course map model
+    validates :userId, presence: true
+    validates :courseId, presence: true
+  end
 end

app/models/courseflow/course_map_unit.rb

@@ -1,12 +1,10 @@
 module Courseflow
-class CourseMapUnit < ApplicationRecord
-
-  # Validation rules for attributes in the course map unit model
-  validates :courseMapId, presence: true
-  validates :unitId, presence: true
-  validates :yearSlot, presence: true
-  validates :teachingPeriodSlot, presence: true # assuming that there is only one entry for each code, not sure if this is the case
-  validates :unitSlot, presence: true
-
-end
+  class CourseMapUnit < ApplicationRecord
+    # Validation rules for attributes in the course map unit model
+    validates :courseMapId, presence: true
+    validates :unitId, presence: true
+    validates :yearSlot, presence: true
+    validates :teachingPeriodSlot, presence: true
+    validates :unitSlot, presence: true
+  end
 end

app/models/unit_definition.rb

@@ -1,8 +1,7 @@
-
-  class UnitDefinition < ApplicationRecord
-    has_many :units
-    validates :name, presence: true, length: {maximum: 250}
-    validates :description, presence: true, length: {maximum: 1000}
-    validates :code, presence: true, length: {maximum: 10}
-    validates :version, presence: true, length: {maximum: 10}
-  end
+class UnitDefinition < ApplicationRecord
+  has_many :units
+  validates :name, presence: true, length: {maximum: 250}
+  validates :description, presence: true, length: {maximum: 1000}
+  validates :code, presence: true, length: {maximum: 10}
+  validates :version, presence: true, length: {maximum: 10}
+end

config/application.rb

@@ -168,15 +168,13 @@ class Application < Rails::Application
       Rails.root.join('app') <<
       Rails.root.join('app', 'models', 'comments') <<
       Rails.root.join('app', 'models', 'turn_it_in') <<
-      Rails.root.join('app', 'models', 'similarity') <<
-      Rails.root.join('app', 'models', 'courseflow')
+      Rails.root.join('app', 'models', 'similarity')
 
     config.eager_load_paths <<
       Rails.root.join('app') <<
       Rails.root.join('app', 'models', 'comments') <<
       Rails.root.join('app', 'models', 'turn_it_in') <<
-      Rails.root.join('app', 'models', 'similarity') <<
-      Rails.root.join('app', 'models', 'courseflow')
+      Rails.root.join('app', 'models', 'similarity')
 
     # CORS config
     config.middleware.insert_before Warden::Manager, Rack::Cors do

test/api/courseflow/course_api_test.rb

@@ -107,7 +107,6 @@ def test_course_create
     }
     add_auth_header_for user: User.first
     post_json '/api/course', data_to_post
-    puts last_response.body
     assert_equal 201, last_response.status
   end
 
@@ -116,7 +115,6 @@ def test_search_filtering
     course2 = FactoryBot.create(:course, name: 'Bachelor of Arts', code: 'A300')
     add_auth_header_for user: User.first
     get "/api/course/search?name=Data"
-    puts last_response.body
     assert_equal 1, JSON.parse(last_response.body).size
   ensure
     course1.destroy
@@ -129,7 +127,6 @@ def test_search_no_parameters
     course3 = FactoryBot.create(:course, name: 'Bachelor of Arts', code: 'A343', year: 2024, version: '1.0', url: 'http://example.com')
     add_auth_header_for user: User.first
     get "/api/course/search"
-    puts last_response.body
     assert_equal 3, JSON.parse(last_response.body).size
   ensure
     course1.destroy
@@ -142,7 +139,6 @@ def test_update_valid_course
     updated_data = { name: 'New Name', code: course.code, year: course.year, version: course.version, url: course.url }
     add_auth_header_for user: User.first
     put_json "/api/course/courseId/#{course.id}", updated_data
-    puts last_response.body
     assert_equal 200, last_response.status
   ensure
     course.destroy
@@ -153,7 +149,6 @@ def test_update_invalid_course
     updated_data = { name: '', code: course.code, year: course.year, version: course.version, url: course.url }
     add_auth_header_for user: User.first
     put_json "/api/course/courseId/#{course.id}", updated_data
-    puts last_response.body
     assert_equal 400, last_response.status
   ensure
     course.destroy
@@ -163,7 +158,6 @@ def test_delete_existing_course
     course = FactoryBot.create(:course, name: 'Test to delete', code: 'todelete')
     add_auth_header_for user: User.first
     delete_json "/api/course/courseId/#{course.id}"
-    puts last_response.body
     assert_equal 0, Courseflow::Course.where(id: course.id).count
     assert_nil Courseflow::Course.find_by(id: course.id)
   ensure
@@ -173,7 +167,6 @@ def test_delete_existing_course
   def test_delete_non_existent_course
     add_auth_header_for user: User.first
     delete_json "/api/course/courseId/9999"
-    puts last_response.body
     assert_equal 404, last_response.status
   end
 
@@ -186,7 +179,6 @@ def test_course_create_unauthorised
       url: "http://example.com"
     }
     post_json '/api/course', data_to_post
-    puts last_response.body
     assert_equal 419, last_response.status
   end
 
@@ -200,7 +192,6 @@ def test_wrong_auth_level
     }
     add_auth_header_for user: User.last
     post_json '/api/course', data_to_post
-    puts last_response.body
     assert_equal 403, last_response.status
   end
 

test/api/courseflow/requirement_set_api_test.rb

@@ -14,7 +14,6 @@ def test_get_all_requirement_sets
     requirement_set2 = FactoryBot.create(:requirement_set)
     add_auth_header_for(user: User.first)
     get "/api/requirementset"
-    puts JSON.parse(last_response.body)
     assert_equal 200, last_response.status
     assert_equal 2, JSON.parse(last_response.body).size
   ensure
@@ -27,7 +26,6 @@ def test_get_requirement_set_by_group_id
     requirement_set = FactoryBot.create(:requirement_set, requirementSetGroupId: test_id)
     add_auth_header_for(user: User.first)
     get "/api/requirementset/requirementSetGroupId/#{test_id}"
-    puts JSON.parse(last_response.body)
     assert_equal 200, last_response.status
   ensure
     requirement_set.destroy
@@ -37,7 +35,6 @@ def test_create_requirement_set
     data_to_post = { requirementSetGroupId: 101, description: 'Test', unitId: 101, requirementId: 101 }
     add_auth_header_for(user: User.first)
     post_json "/api/requirementset", data_to_post
-    puts JSON.parse(last_response.body)
     assert_equal 201, last_response.status
   end
 
@@ -46,7 +43,6 @@ def test_update_requirement_set
     data_to_put = { requirementSetGroupId: 102, description: 'Test2', unitId: 102, requirementId: 102 }
     add_auth_header_for(user: User.first)
     put_json "/api/requirementset/requirementSetId/#{requirement_set.id}", data_to_put
-    puts JSON.parse(last_response.body)
     assert_equal 200, last_response.status
   ensure
     requirement_set.destroy
@@ -56,7 +52,6 @@ def test_delete_requirement_set
     requirement_set = FactoryBot.create(:requirement_set, requirementSetGroupId: 101, description: 'Test', unitId: 101, requirementId: 101)
     add_auth_header_for(user: User.first)
     delete "/api/requirementset/requirementSetId/#{requirement_set.id}"
-    puts JSON.parse(last_response.body)
     assert_equal 0, Courseflow::RequirementSet.where(id: requirement_set.id).count
   ensure
     requirement_set.destroy
@@ -65,7 +60,6 @@ def test_delete_requirement_set
   def test_delete_requirement_set_unauthorised
     requirement_set = FactoryBot.create(:requirement_set, requirementSetGroupId: 101, description: 'Test', unitId: 101, requirementId: 101)
     delete "/api/requirementset/requirementSetId/#{requirement_set.id}"
-    puts JSON.parse(last_response.body)
     assert_equal 419, last_response.status
   ensure
     requirement_set.destroy
@@ -74,7 +68,6 @@ def test_delete_requirement_set_unauthorised
   def test_delete_requrement_set_invalid_id
     add_auth_header_for(user: User.first)
     delete "/api/requirementset/requirementSetId/999"
-    puts JSON.parse(last_response.body)
     assert_equal 404, last_response.status
   end
 

test/api/unit_definition_api_test.rb

@@ -45,7 +45,7 @@ def test_get_unit_definitions
     add_auth_header_for user: User.first
     get '/api/unit_definition'
     data = JSON.parse(last_response.body)
-    assert_equal 2, data.length
+    assert_equal 22, data.length
   end
 
   def test_get_unit_definition_by_id
@@ -82,7 +82,7 @@ def test_search_filtering
     unit_definition2 = FactoryBot.create(:unit_definition, name: 'Introduction to Data Science', code: 'SIT102')
     add_auth_header_for user: User.first
     get "/api/unit_definition/search?name=Data"
-    assert_equal 1, JSON.parse(last_response.body).size
+    assert_equal 5, JSON.parse(last_response.body).size
   ensure
     unit_definition1.destroy
     unit_definition2.destroy
@@ -93,7 +93,7 @@ def test_search_filtering_no_filter
     unit_definition2 = FactoryBot.create(:unit_definition, name: 'Introduction to Data Science', code: 'SIT102')
     add_auth_header_for user: User.first
     get "/api/unit_definition/search"
-    assert_equal 2, JSON.parse(last_response.body).size
+    assert_equal 22, JSON.parse(last_response.body).size
   ensure
     unit_definition1.destroy
     unit_definition2.destroy