fixup! bookings

* Added bookings controller * Added booking model * Added booking migration * radio button for selecting a flight * button to submit data to create booking todo: figure out how to wire turbodrive so that the params persist after the form is submitted chore: add passenger ref to bookings * css stylesheet for flashes * show flashes in app layouts
sean-garwood · Oct 9, 2024 · e989c0d · e989c0d
1 parent 5fd06f8
commit e989c0d
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 34 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -13,3 +13,18 @@
  *= require_tree .
  *= require_self
  */
+.flash {
+    padding: 10px;
+    margin-bottom: 10px;
+    border-radius: 5px;
+}
+
+.flash.notice {
+    background-color: #dff0d8;
+    color: #3c763d;
+}
+
+.flash.alert {
+    background-color: #f2dede;
+    color: #a94442;
+}
diff --git a/app/controllers/bookings_controller.rb b/app/controllers/bookings_controller.rb
@@ -0,0 +1,22 @@
+class BookingsController < ApplicationController
+  def new
+    @booking = Booking.new
+  end
+
+  def create
+    @booking = Booking.new(booking_params)
+    @booking.passenger = current_user
+
+    if @booking.save
+      redirect_to @booking
+    else
+      render :new
+    end
+  end
+
+  private
+
+  def booking_params
+    params.require(:booking).permit(:flight_id, :passenger_id)
+  end
+end
diff --git a/app/controllers/flights_controller.rb b/app/controllers/flights_controller.rb
@@ -17,6 +17,6 @@ def get_departure_dates
   end
 
   def flight_params
-    params.permit(:departure_airport, :arrival_airport, :available_seats, :depart_date)
+    params.permit(:id, :commit, :departure_airport, :arrival_airport, :available_seats, :depart_date)
   end
 end
diff --git a/app/helpers/bookings_helper.rb b/app/helpers/bookings_helper.rb
@@ -0,0 +1,2 @@
+module BookingsHelper
+end
diff --git a/app/models/booking.rb b/app/models/booking.rb
@@ -0,0 +1,3 @@
+class Booking < ApplicationRecord
+  belongs_to :passenger, class_name: "User", foreign_key: "passenger_id"
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -3,4 +3,5 @@ class User < ApplicationRecord
   # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :validatable
+  has_many :bookings, foreign_key: "passenger_id"
 end
diff --git a/app/views/flights/_results.html.erb b/app/views/flights/_results.html.erb
@@ -1,34 +1,42 @@
 <h2 class="flight-results">
   Flight results
 </h2>
-<table>
-  <td class="flights">
-    <tr>
-      <th>Departs from</th>
-      <th>Arrives at</th>
-      <th>Depart time</th>
-      <th>Duration</th>
-      <th>Available seats</th>
-    </tr>
-    <% @flights.each do |flight| %>
+<%= form_with url: bookings_path, method: :post, local: true do |form| %>
+  <table>
+    <thead>
       <tr>
-        <td>
-          <%= flight.departure_airport.code %>
-        </td>
-        <td>
-          <%= flight.arrival_airport.code %>
-        </td>
-        <td>
-          <%= flight.depart_time %>
-        </td>
-        <td>
-          <%# duration is in minutes, so we need to format as HH:MM %>
-          <%= Time.at(flight.duration * 60).utc.strftime("%H:%M") %>
-        </td>
-        <td>
-          <%= flight.available_seats %>
-        </td>
+        <th>Departs from</th>
+        <th>Arrives at</th>
+        <th>Depart time</th>
+        <th>Duration</th>
+        <th>Available seats</th>
+        <th>Select</th>
       </tr>
-    <% end %>
-  </td>
-</table>
+    </thead>
+    <tbody>
+      <% @flights.each do |flight| %>
+        <tr>
+          <td>
+            <%= flight.departure_airport.code %>
+          </td>
+          <td>
+            <%= flight.arrival_airport.code %>
+          </td>
+          <td>
+            <%= flight.depart_time %>
+          </td>
+          <td>
+            <%= Time.at(flight.duration * 60).utc.strftime("%H:%M") %>
+          </td>
+          <td>
+            <%= flight.available_seats %>
+          </td>
+          <td>
+            <%= form.radio_button :selected_flight_id, flight.id %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <%= form.submit "Book Selected Flight" %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -17,9 +17,9 @@
   <body>
     <p class="notice"><%= notice %></p>
     <p class="alert"><%= alert %></p>
-    <div>
-      <% flash.each do |msg| %>
-        <div><%= msg %></div>
+    <div class="flash-messages">
+      <% flash.each do |k, message| %>
+        <div class="flash <%= k %>"><%= message %></div>
       <% end %>
     </div>
     <%= yield %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   devise_for :users
   resources :flights, only: [ :index ]
+  resources :bookings, only: [ :index, :show, :new, :create ]
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 
   # Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.

diff --git a/db/migrate/20241008203508_create_bookings.rb b/db/migrate/20241008203508_create_bookings.rb
@@ -0,0 +1,7 @@
+class CreateBookings < ActiveRecord::Migration[7.2]
+  def change
+    create_table :bookings do |t|
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20241009133310_add_passenger_ref_to_bookings.rb b/db/migrate/20241009133310_add_passenger_ref_to_bookings.rb
@@ -0,0 +1,5 @@
+class AddPassengerRefToBookings < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :bookings, :passenger, null: false, foreign_key: { to_table: :users }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/controllers/bookings_controller_test.rb b/test/controllers/bookings_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class BookingsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/fixtures/bookings.yml b/test/fixtures/bookings.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the "{}" from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/models/booking_test.rb b/test/models/booking_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class BookingTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end