chore: add flight_id to bookings

app/assets/stylesheets/application.css

@@ -14,6 +14,13 @@
  *= require_self
  *= require_flight_table
  */
+* {
+    /* better font */
+    font-family: 'Open Sans', sans-serif;
+    /* rm link formatting */
+    text-decoration: none;
+}
+
 .flash {
     padding: 10px;
     margin-bottom: 10px;

app/assets/stylesheets/flight_table.css

@@ -5,4 +5,8 @@
     tr:nth-child(odd) {
         background-color: #f9f9f9;
     }
+
+    /* better font */
+    font-family: 'Open Sans',
+    sans-serif;
 }

app/controllers/flights_controller.rb

@@ -1,9 +1,5 @@
 class FlightsController < ApplicationController
   def index
-    @arrival_codes = Airport.arrival_codes
-    @departure_codes = Airport.departure_codes
-    @departure_dates = Flight.departure_dates
-    @available_seats = (1..4).to_a
     if flight_params.empty?
       @flights = Flight.all
     else

app/models/booking.rb

@@ -1,3 +1,4 @@
 class Booking < ApplicationRecord
   belongs_to :passenger, class_name: "User", foreign_key: "passenger_id"
+  belongs_to :flight
 end

app/models/flight.rb

@@ -19,8 +19,13 @@ class Flight < ApplicationRecord
     end
   end
 
+  def self.available_seats
+    select(:available_seats).map(&:available_seats).uniq.sort
+  end
+
   def self.departure_dates
-    select("DISTINCT DATE(flights.depart_time) as depart_date").order("depart_date").map(&:depart_date)
+    select("DISTINCT DATE(flights.depart_time) as depart_date").
+      order("depart_date").map(&:depart_date)
   end
 
   def self.search_by_airports(departure_airport_code, arrival_airport_code)

app/models/user.rb

@@ -3,5 +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"
+  has_many :bookings
 end

app/views/flights/_results.html.erb

@@ -1,8 +1,8 @@
-<h2 class="flight-results">
+<h2>
   Flight results
 </h2>
-<%= form_with model: @booking, url: bookings_path, local: true do |form| %>
-  <table>
+<%= form_with model: @booking, url: new_booking_path do |form| %>
+  <table class="flight-results">
     <thead>
       <tr>
         <th>Departs from</th>
@@ -14,7 +14,7 @@
       </tr>
     </thead>
     <tbody>
-      <% if @flights.present? %>
+      <% if @flights.any? %>
         <% @flights.each do |flight| %>
           <tr>
             <td>
@@ -45,5 +45,5 @@
     </tbody>
   </table>
   <%= form.submit "Book Selected Flight" %>
-  <%= link_to "Show all", flights_path %>
 <% end %>
+<%= link_to "Show all", flights_path %>

app/views/flights/_search.html.erb

@@ -1,24 +1,16 @@
 <h2>Enter your desired flight attributes here.</h2>
-<%= form_with url: flights_path, method: :get, local: true do |form| %>
-  <div>
-    <%= form.label :departure_airport, "Departure Airport" %>
-    <%= form.select :departure_airport, options_for_select(@departure_codes),
-    include_blank: true %>
-  </div>
-  <div>
-    <%= form.label :arrival_airport, "Arrival Airport" %>
-    <%= form.select :arrival_airport, options_for_select(@arrival_codes),
-    include_blank: true %>
-  </div>
-  <div>
-    <%= form.label :available_seats, "Number of passengers" %>
-    <%= form.select :available_seats, options_for_select(@available_seats),
-    include_blank: true%>
-  </div>
-  <div>
-    <%= form.label :depart_date, "Departure date" %>
-    <%= form.select :depart_date, options_for_select(@departure_dates),
-    include_blank: true%>
+<%= form_with method: :get do |form| %>
+  <div>Depart from:
+    <%= form.select :departure_airport, Airport.departure_codes, include_blank:
+    true %></div>
+  <div>Arrive at:
+    <%= form.select :arrival_airport, Airport.arrival_codes,
+    include_blank: true %></div>
+  <div>Required seats:
+    <%= form.select :available_seats, Flight.available_seats,
+    include_blank: true %></div>
+  <div>Departure date:
+    <%= form.select :depart_date, Flight.departure_dates, include_blank: true%>
   </div>
   <div>
     <%= form.submit "Search flights" %>

db/migrate/20241011205934_add_flight_id_to_bookings.rb

@@ -0,0 +1,5 @@
+class AddFlightIdToBookings < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :bookings, :flight, null: false, foreign_key: true
+  end
+end