Refactor controllers to use merge method for setting the ID in airline, airport, and route models

Author: teetangh

app/controllers/api/v1/airlines_controller.rb

@@ -25,7 +25,7 @@ def create
         if @airline
           render json: { message: "Airline with ID #{params[:id]} already exists" }, status: :conflict
         else
-          @airline = Airline.new(airline_params)
+          @airline = Airline.new(airline_params.merge(id: params[:id]))
           if @airline.save
             render json: @airline, status: :created
           else
@@ -41,7 +41,7 @@ def create
 
       # PUT /api/v1/airlines/{id}
       def update
-        @airline = Airline.new(airline_params)
+        @airline = Airline.new(airline_params.merge(id: params[:id]))
         if @airline.save
           render json: @airline.attributes.except('id'), status: :ok
         else

app/controllers/api/v1/airports_controller.rb

@@ -25,7 +25,7 @@ def create
         if @airport
           render json: { message: "Airport with ID #{params[:id]} already exists" }, status: :conflict
         else
-          @airport = Airport.new(airport_params)
+          @airport = Airport.new(airport_params.merge(id: params[:id]))
           if @airport.save
             render json: @airport, status: :created
           else
@@ -41,7 +41,7 @@ def create
 
       # PUT /api/v1/airports/{id}
       def update
-        @airport = Airport.new(airport_params)
+        @airport = Airport.new(airport_params.merge(id: params[:id]))
         if @airport.save
           render json: @airport.attributes.except('id'), status: :ok
         else

app/controllers/api/v1/routes_controller.rb

@@ -25,7 +25,7 @@ def create
         if @route
           render json: { message: "Route with ID #{params[:id]} already exists" }, status: :conflict
         else
-          @route = Route.new(route_params)
+          @route = Route.new(route_params.merge(id: params[:id]))
           if @route.save
             render json: @route, status: :created
           else
@@ -41,7 +41,7 @@ def create
 
       # PUT /api/v1/routes/{id}
       def update
-        @route = Route.new(route_params)
+        @route = Route.new(route_params.merge(id: params[:id]))
         if @route.save
           render json: @route.attributes.except('id'), status: :ok
         else

test/integration/airlines_spec.rb

@@ -28,7 +28,6 @@
     let(:airline_id) { 'airline_post' }
     let(:airline_params) do
       {
-        'id' => airline_id, # 'id' is not a required field in the airline_params hash
         'name' => '40-Mile Air',
         'iata' => 'Q5',
         'icao' => 'MLA',
@@ -67,7 +66,6 @@
 
     let(:current_params) do
       {
-        'id' => airline_id, # 'id' is not a required field in the airline_params hash
         'name' => '40-Mile Air',
         'iata' => 'U5',
         'icao' => 'UPD',
@@ -77,7 +75,6 @@
     end
     let(:updated_params) do
       {
-        'id' => airline_id,
         'name' => '41-Mile Air',
         'iata' => 'U6',
         'icao' => 'UPE',
@@ -128,7 +125,6 @@
     let(:airline_id) { 'airline_delete' }
     let(:airline_params) do
       {
-        'id' => airline_id, # 'id' is not a required field in the airline_params hash
         'name' => '40-Mile Air',
         'iata' => 'Q5',
         'icao' => 'MLA',

test/integration/airports_spec.rb

@@ -157,7 +157,6 @@
     let(:airport_id) { 'airport_delete' }
     let(:airport_params) do
       {
-        'id' => airport_id, # 'id' should be 'airport_delete
         'airportname' => 'Test Airport',
         'city' => 'Test City',
         'country' => 'Test Country',

test/integration/routes_spec.rb

@@ -139,7 +139,6 @@
     let(:route_id) { 'route_delete' }
     let(:route_params) do
       {
-        'id' => route_id,
         'airline' => 'AF',
         'airlineid' => 'airline_137',
         'sourceairport' => 'TLV',