Merge pull request #28 from codeableorg/feature-list-sport-fields-bookings

Feature list sport fields bookings

Author: Lian Nivin

api/app/controllers/sport_fields_controller.rb

@@ -13,6 +13,15 @@ def create
     end
   end
 
+  def schedule
+    @sport_field = SportField.find(params[:id])
+    p params[:selectedDate]
+    bookings = @sport_field.bookings.where("DATE(date) = ?", params[:selectedDate])
+    club = @sport_field.club
+    render json: {club: club, bookings: bookings}
+  end
+
+
   private
   def sport_field_params
     params.permit(:name, :description, :price_day, :price_night, :image)

api/app/models/booking.rb

@@ -0,0 +1,4 @@
+class Booking < ApplicationRecord
+  belongs_to :user
+  belongs_to :sport_field
+end

api/app/models/sport_field.rb

@@ -1,5 +1,9 @@
 class SportField < ApplicationRecord
   has_one_attached :image
+  has_many :bookings
+
+  belongs_to :club
 
   validates :name, :description, :price_day, :price_night, presence: true
 end
+

api/app/models/user.rb

@@ -1,6 +1,7 @@
 class User < ApplicationRecord
   has_secure_password
   has_secure_token
+  has_many :bookings
 
   has_many :favorites, dependent: :destroy
 

api/config/routes.rb

@@ -3,9 +3,12 @@
     post '/login', to: 'sessions#login'
     post '/register', to: 'sessions#register'
     delete '/logout', to: 'sessions#destroy'
+    get '/schedule/:id', to: 'sport_fields#schedule'
     resources :clubs do
       resource :favorites, only: [:create, :destroy]
     end
-    resources :sport_fields
+    resources :sport_fields do
+      get 'schedule', on: :member
+    end
   end
 end

api/db/migrate/20190715164401_create_bookings.rb

@@ -0,0 +1,14 @@
+class CreateBookings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :bookings do |t|
+        t.date :date
+        t.integer :start_hour
+        t.integer :end_hour
+        t.integer :amount
+        t.references :sport_field, foreign_key: true
+        t.references :user, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

api/db/schema.rb

@@ -36,6 +36,19 @@
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
 
+  create_table "bookings", force: :cascade do |t|
+    t.date "date"
+    t.integer "start_hour"
+    t.integer "end_hour"
+    t.integer "amount"
+    t.bigint "sport_field_id"
+    t.bigint "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["sport_field_id"], name: "index_bookings_on_sport_field_id"
+    t.index ["user_id"], name: "index_bookings_on_user_id"
+  end
+
   create_table "clubs", force: :cascade do |t|
     t.string "name"
     t.string "address"
@@ -79,6 +92,8 @@
   end
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "bookings", "sport_fields"
+  add_foreign_key "bookings", "users"
   add_foreign_key "favorites", "clubs"
   add_foreign_key "favorites", "users"
   add_foreign_key "sport_fields", "clubs"

api/db/seeds.rb

@@ -10,11 +10,11 @@
     end: '22'
   },
   'saturday': {
-    start: '8',
+    start: '10',
     end: '22'
   },
   'sunday': {
-    start: '8',
+    start: '14',
     end: '22'
   },
 }}, {name: "Club #2", address: 'Av. Jorge Chavez 184', district: "Miraflores", latitude: -13.1199378, longitude: -77.0353161,
@@ -47,9 +47,9 @@
   },
 }}])
 
-SportField.create(name: "SportField #1", description: "Soccer 5vs5", price_day: 20, price_night: 40, club_id: 1)
-SportField.create(name: "SportField #2", description: "Soccer 6vs6", price_day: 30, price_night: 60, club_id: 2)
-SportField.create(name: "SportField #3", description: "Soccer 5vs5", price_day: 20, price_night: 40, club_id: 1)
+sportfield1 = SportField.create(name: "SportField #1", description: "Soccer 5vs5", price_day: 20, price_night: 40, club_id: 1)
+sportfield2 = SportField.create(name: "SportField #2", club_id: 2);	SportField.create(name: "SportField #2", description: "Soccer 6vs6", price_day: 30, price_night: 60, club_id: 2)
+sportfield3 = SportField.create(name: "SportField #3", club_id: 1);	SportField.create(name: "SportField #3", description: "Soccer 5vs5", price_day: 20, price_night: 40, club_id: 1)
 
 Club.create(
   name: 'Club golden',
@@ -73,3 +73,14 @@
 # favorites
 regular_user.favorite(Club.first)
 regular_user.favorite(Club.last)
+regular_user.bookings.create(date: Time.now, start_hour: 14, end_hour: 15, amount: 100, sport_field_id: sportfield1.id );
+
+regular_user.bookings.create(date: Time.now, start_hour: 15, end_hour: 16, amount: 100, sport_field_id: sportfield1.id );
+
+regular_user.bookings.create(date: Time.now, start_hour: 16, end_hour: 17, amount: 100, sport_field_id: sportfield1.id );
+
+regular_user.bookings.create(date: Time.now, start_hour: 17, end_hour: 18, amount: 100, sport_field_id: sportfield1.id );
+
+regular_user.bookings.create(date: Time.now, start_hour: 15, end_hour: 16, amount: 200, sport_field_id: sportfield2.id );
+
+regular_user.bookings.create(date: Time.now, start_hour: 16, end_hour: 17, amount: 300, sport_field_id: sportfield3.id );

api/spec/controllers/sport_fields_bookings_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SportFieldsBookingsController, type: :controller do
+
+end

api/spec/models/sport_fields_booking_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SportFieldsBooking, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end