Use validation helper

cs169 · Apr 26, 2024 · e94a196 · e94a196
1 parent adc3bc1
commit e94a196
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/controllers/api/v1/lmss_controller.rb b/app/controllers/api/v1/lmss_controller.rb
@@ -1,6 +1,7 @@
 module Api
   module V1
     class LmssController < BaseController
+    include CanvasValidationHelper
       before_action :validate_ids!, only: [:create]
 
       def index
@@ -56,8 +57,8 @@ def validate_ids!
           render json: { error: e.message }, status: :bad_request
           return
         else
-          unless params[:course_id].to_s.match?(/\A\d+\z/) && params[:lms_id].to_s.match?(/\A\d+\z/)
-            render json: { error: 'course_id and lms_id must be integers' }, status: :bad_request
+          unless is_valid_course_id(params[:course_id].to_i) && is_valid_lms_id(params[:lms_id].to_i)
+            render json: { error: 'Invalid course_id or lms_id' }, status: :bad_request
             return
           end
         end

diff --git a/spec/controllers/api/v1/lmss_controller_spec.rb b/spec/controllers/api/v1/lmss_controller_spec.rb
@@ -30,11 +30,11 @@ def json_response
           end
         end
 
-        context 'when course_id and lms_id are not integers' do
+        context 'when course_id and lms_id are not invalid' do
           it 'returns status :bad_request' do
-            post :create, params: { course_id: 'not_an_int', lms_id: 'also_not_an_int', external_course_id: @external_course_id }
+            post :create, params: { course_id: '-1', lms_id: '-1', external_course_id: @external_course_id }
             expect(response).to have_http_status(:bad_request)
-            expect(response.body).to include('course_id and lms_id must be integers')
+            expect(response.body).to include('Invalid course_id or lms_id')
           end
         end