fixed credit in code creation

Author: Dennis Deli

app/controllers/courses_controller.rb

@@ -110,7 +110,8 @@ def info_parts(info)
     faculty = (info.faculty_abrev.presence || info.faculty_short.presence || info.faculty).to_s.upcase.gsub(/[^A-Z]/, '')
     subject = (info.subject_abrev.presence || info.subject).to_s.upcase.gsub(/[^A-Z]/, '')
     number  = info.course_number.to_s.upcase
-    credits = info.credit.present? ? sprintf('%.2f', info.credit.to_f) : '0.00'
+    credit_value = info.credit.presence || '0'
+    credits = Course.normalize_code_credit(credit_value)
     {
       faculty: faculty,
       subject: subject,

app/controllers/request_wizard_controller.rb

@@ -142,7 +142,8 @@ def parts_from_info(info)
     faculty = (info.faculty_abrev.presence || info.faculty_short.presence || info.faculty).to_s.upcase.gsub(/[^A-Z]/, '')
     subject = (info.subject_abrev.presence || info.subject).to_s.upcase.gsub(/[^A-Z]/, '')
     number  = info.course_number.to_s.upcase
-    credits = info.credit.present? ? format('%.2f', info.credit.to_f) : '0.00'
+    credit_value = info.credit.presence || '0'
+    credits = Course.normalize_code_credit(credit_value)
     term    = normalize_term(info.study_session)
     year    = info.academic_year.to_s.split('-').first # supports "2024-2025"
     section = info.section.to_s.upcase

app/controllers/requests_controller.rb

@@ -253,7 +253,8 @@ def parts_from_info(info)
     faculty = (info.faculty_abrev.presence || info.faculty_short.presence || info.faculty).to_s.upcase.gsub(/[^A-Z]/, '')
     subject = (info.subject_abrev.presence || info.subject).to_s.upcase.gsub(/[^A-Z]/, '')
     number  = info.course_number.to_s.upcase
-    credits = info.credit.present? ? format('%.2f', info.credit.to_f) : '0.00'
+    credit_value = info.credit.presence || '0'
+    credits = Course.normalize_code_credit(credit_value)
     term    = normalize_term(info.study_session)
     year    = info.academic_year.to_s.split('-').first
     section = info.section.to_s.upcase

app/models/course.rb

@@ -35,6 +35,20 @@ class Course < ApplicationRecord
   TERM_CREDITS = %w[1 3 4 6 9].freeze
   SUBJECTS ||= IO.readlines("#{Rails.root}/lib/course_subjects.txt").collect(&:strip)
 
+  def self.normalize_code_credit(value)
+    str = value.to_s.strip
+    return '' if str.blank?
+
+    numeric_pattern = /\A-?\d+(?:\.\d+)?\z/
+    return str unless str.match?(numeric_pattern)
+
+    integer_part, decimal_part = str.split('.', 2)
+    return integer_part if decimal_part.blank? || decimal_part.match?(/\A0+\z/)
+
+    decimal_part = decimal_part.sub(/0+\z/, '')
+    decimal_part.blank? ? integer_part : "#{integer_part}.#{decimal_part}"
+  end
+
   # VALIDATIONS
   validates_uniqueness_of :code, message: 'Duplicate Course Code, Someone Has Made a Request For that Course.'
 
@@ -113,7 +127,7 @@ def credits
   end
 
   def credits=(credits)
-    insert_into_code(6, credits)
+    insert_into_code(6, self.class.normalize_code_credit(credits))
   end
 
   def section
@@ -171,4 +185,5 @@ def update_code_columns
     self[:code_credits] = credits
     self[:code_section] = section
   end
+
 end

test/controllers/requests_controller_test.rb

@@ -162,7 +162,7 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest
 
       r = get_instance_var(:request)
       assert_equal Request::REMOVED, r.status
-    end    
+    end
 
     should 'destroy request' do
       request = create(:request)
@@ -174,6 +174,18 @@ class RequestsControllerTest < ActionDispatch::IntegrationTest
       assert_redirected_to requests_path
     end
 
+    should 'build course code without decimal credit segment' do
+      info = create(:course_info, credit: 3)
+      controller = RequestsController.new
+
+      parts = controller.send(:parts_from_info, info)
+      assert_equal '3', parts[:credits], 'Credit part should be sanitized'
+
+      code = controller.send(:build_code_from_info, parts, info.instructor_name)
+      assert_includes code, '__3_', 'Code should embed sanitized credits'
+      refute_includes code, '__3.00_', 'Code should not contain decimal credits'
+    end
+
     ## ADDITIONAL ACTIONS TESTS ##
 
     should 'change status' do

test/models/course_test.rb

@@ -132,6 +132,16 @@ class CourseTest < ActiveSupport::TestCase
     assert_equal '6', course.credits, 'Credits should now be 6'
   end
 
+  should 'remove trailing zeros when updating credits segment' do
+    course = create(:course, code: '2013_GL_ECON_S1_2500__3_A')
+
+    course.credits = '3.00'
+
+    assert_equal '3', course.credits, 'Credits should strip trailing zeros'
+    assert_includes course.code, '__3_', 'Course code should embed sanitized credits'
+    refute_includes course.code, '__3.00_', 'Course code should not include decimal credits'
+  end
+
   should 'set and return a proper section' do
     course = create(:course, code: '2013_GL_ECON_S1_2500__3_A')