Merge pull request #57 from codeableorg/release-5

Release 5

Author: Frank Davis Condezo Fabian

.gitignore

@@ -49,3 +49,4 @@ client/yarn-debug.log*
 client/yarn-error.log*
 
 client/.env
+api/.env

api/.env.example

@@ -0,0 +1,2 @@
+STRIPE_SECRET_KEY=""
+STRIPE_PUBLISHABLE_KEY=""

api/Gemfile

@@ -40,8 +40,11 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
 
+gem 'stripe'
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'active_model_serializers'
 gem 'rspec-rails'
+
+gem 'dotenv-rails', groups: [:development, :test]

api/Gemfile.lock

@@ -56,9 +56,16 @@ GEM
     case_transform (0.2)
       activesupport
     concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
     crass (1.0.4)
     diff-lcs (1.3)
+    dotenv (2.7.5)
+    dotenv-rails (2.7.5)
+      dotenv (= 2.7.5)
+      railties (>= 3.2, < 6.1)
     erubi (1.8.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -82,6 +89,9 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     msgpack (1.3.0)
+    multipart-post (2.1.1)
+    net-http-persistent (3.1.0)
+      connection_pool (~> 2.2)
     nio4r (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
@@ -148,6 +158,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    stripe (4.22.0)
+      faraday (~> 0.13)
+      net-http-persistent (~> 3.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -164,6 +177,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   bootsnap (>= 1.1.0)
   byebug
+  dotenv-rails
   listen (>= 3.0.5, < 3.2)
   pg (>= 0.18, < 2.0)
   puma (~> 3.11)
@@ -172,6 +186,7 @@ DEPENDENCIES
   rspec-rails
   spring
   spring-watcher-listen (~> 2.0.0)
+  stripe
   tzinfo-data
 
 RUBY VERSION

api/app/assets/images/Cancha de Futbol 6/gallery_1.jpg

@@ -20,12 +20,11 @@ def render_unauthorized(message)
 
   def authenticate_token
     user = User.find_by_token(cookies.signed[:auth_token])
-    regenerate_and_signed_token(user) if user
   end
 
   def regenerate_and_signed_token(user)
     user.regenerate_token
-    cookies.signed[:auth_token] = { value: user.token, httponly: true }
+    cookies.signed[:auth_token] = { value: user.token, httponly: true, expires: Time.now + 7.day  }
     user
   end
 end

api/app/assets/images/Cancha de Futbol 6/gallery_2.jpg

@@ -0,0 +1,31 @@
+class BookingsController < ApplicationController
+  before_action :set_booking, only: [:show]
+
+  def index
+    render json: Booking.all
+  end
+
+  def show
+    render json: @booking
+  end
+
+  def create
+    booking = current_user.bookings.new(booking_params)
+    if booking.save
+      render json: booking, status: :created
+    else
+      render json: { errors: booking.errors.full_messages}, status: :unprocessable_entity
+    end
+  end
+
+  private
+  
+  def set_booking
+    @booking = Booking.find(params[:id])
+  end
+
+  def booking_params
+    params.permit(:date, :start_hour, :end_hour, :amount, :sport_field_id)
+  end
+
+end

api/app/assets/images/Complejo Deportivo - Municipalidad de San Isidro/gallery_1.jpg

@@ -0,0 +1,27 @@
+class ChargesController < ApplicationController
+  def create
+    
+    charge = Stripe::Charge.create({
+      amount: params[:amount] * 100,
+      description: "Kampu - Sports Field booking",
+      currency: "usd",
+      source: params[:token]
+    })
+
+    booking = current_user.bookings.create(
+      date: params[:date],
+      start_hour: params[:start_hour], 
+      end_hour: params[:end_hour], 
+      amount: params[:amount],
+      sport_field_id: params[:sport_field_id]
+    )
+    if booking.save
+      render json: booking, status: :created
+    else
+      render json: { errors: booking.errors.full_messages}, status: :unprocessable_entity
+    end
+  
+  rescue Stripe::CardError => e
+    render json: { errors: e.message }, status: :unprocessable_entity
+  end
+end

api/app/assets/images/Complejo Deportivo - Municipalidad de San Isidro/gallery_2.jpg

@@ -15,6 +15,7 @@ def login
   def register
     user = User.new(user_params)
     if user.save
+      regenerate_and_signed_token(user)
       render json: user
     else
       render json: { errors: user.errors.full_messages}, status: :bad_request
@@ -24,7 +25,7 @@ def register
 
   def destroy
     current_user.invalidate_token
-    cookies.delete :auth_token
+    cookies.update(response.cookies)
     head :ok
   end
 

api/app/assets/images/Complejo Deportivo - Municipalidad de San Isidro/gallery_3.jpg

@@ -1,7 +1,11 @@
 class UsersController < ApplicationController
 
   def me
-    render json: current_user.as_json(only: %i[name email role]), status: :ok
+    render json: current_user.as_json(only: %i[id name email role]), status: :ok
+  end
+
+  def user_with_bookings
+    render json: current_user
   end
 
 end

api/app/assets/images/Complejo Deportivo Chino Vasquez/gallery_1.jpg

@@ -0,0 +1,15 @@
+class UserSerializer < ActiveModel::Serializer
+
+  attributes :id, :name, :email, :role, :bookings
+
+  def bookings
+    object.bookings.map do |booking|
+      booking.attributes.merge({
+        sport_field_name: booking.sport_field.name,
+        club_id: booking.sport_field.club.id,
+        club_name: booking.sport_field.club.name
+      })
+    end
+  end
+
+end

api/app/assets/images/Complejo Deportivo Chino Vasquez/gallery_2.jpg

@@ -0,0 +1,6 @@
+Rails.configuration.stripe = {
+  :publishable_key => ENV['STRIPE_PUBLISHABLE_KEY'],
+  :secret_key      => ENV['STRIPE_SECRET_KEY']
+}
+
+Stripe.api_key = Rails.configuration.stripe[:secret_key]

api/app/assets/images/Depor Plaza Costa Verde/gallery_1.jpg

@@ -6,12 +6,16 @@
     get '/schedule/:id', to: 'sport_fields#schedule'
     get '/report/:id', to: 'clubs#report'
     get '/me', to: 'users#me'
+    get '/userinfo', to: 'users#user_with_bookings'
+    post '/booking', to: 'bookings#create'
     resources :clubs do
       resource :favorites, only: [:create, :destroy]
     end
     resources :sport_fields do
       get 'schedule', on: :member
       get 'times', on: :member
     end
+
+    post '/charge', to: 'charges#create'
   end
 end

api/app/assets/images/Depor Plaza Costa Verde/gallery_2.jpg

@@ -1,43 +1,69 @@
-puts "Init seed"
+puts "Init seed 🙈🙉🙊"
 
 def get_image(file_name)
   { io: File.open(File.join(Rails.root, "/app/assets/images/#{file_name}")), filename: file_name }
 end
 
-User.destroy_all
-regular_user = User.create(name: 'Lian Nivin', email: '[email protected]', role: "regular", password: '123456')
-owner_user = User.create(name: 'Cristian Berly', email: '[email protected]', role: "owner", password: '123456')
-
-clubs = Club.create([{name: "Club #1", image: get_image("cancha1.jpg"), address: 'Jr cayumba 440', district: "Lince", latitude: -12.1199378, longitude: -77.0373161,
-schedule: {
-  'monday-friday': {
-    start: '8',
-    end: '22'
-  },
-  'saturday': {
-    start: '10',
-    end: '22'
+clubs = [
+  {
+    name: "La Diez",
+    address: "La Calera de la Merced 178, Distrito de Lima 15038",
+    district: "Surquillo",
+    latitude: -12.1135125,
+    longitude: -77.0113851,
+    num_img: 4
   },
-  'sunday': {
-    start: '14',
-    end: '22'
-  },
-}}, {name: "Club #2", image: get_image("cancha2.jpg"), address: 'Av. Jorge Chavez 184', district: "Miraflores", latitude: -13.1199378, longitude: -77.0353161,
-schedule: {
-  'monday-friday': {
-    start: '8',
-    end: '22'
+  {
+    name: "Depor plaza Puericultorio",
+    address: "Av. del Ejército 700",
+    district: "Magdalena",
+    latitude: -12.1003595,
+    longitude: -77.0646032,
+    num_img: 4
   },
-  'saturday': {
-    start: '8',
-    end: '22'
+  {
+    name: "Depor Plaza Costa Verde",
+    address: "Costa Verde Magdalena del Mar",
+    district: "Magdalena",
+    latitude: -12.1053237,
+    longitude: -77.0652807,
+    num_img: 4
   },
-  'sunday': {
-    start: '8',
-    end: '22'
+  {
+    name: "Complejo Deportivo - Municipalidad de San Isidro",
+    address: "Av. Augusto Pérez Araníbar 1355",
+    district: "San Isidro",
+    latitude: -12.1078158,
+    longitude: -77.053914,
+    num_img: 3
+  }, 
+  {
+    name: "Cancha de Futbol 6",
+    address: "Jirón Rio Piura 481",
+    district: "Cercado de Lima",
+    latitude: -12.0778519,
+    longitude: -77.0023999,
+    num_img: 2
   },
-}}, {name: "Club #3", image: get_image("cancha1.jpg"), address: 'Jr General Artigas 440', district: "Pueblo Libre", latitude: -14.1199378, longitude: -77.0373261,
-schedule: {
+  {
+    name: "Fanatic Soccer Fir",
+    address: "Av Bolivia 148",
+    district: "Cercado de Lima",
+    latitude: -12.054698,
+    longitude: -77.036893,
+    num_img: 2
+  }, 
+  {
+    name: "Complejo Deportivo Chino Vasquez",
+    address: "Malecón de la Marina 9, Miraflores 15074",
+    district: "Miraflores",
+    latitude: -12.1137559,
+    longitude: -77.0493404,
+    num_img: 2
+  }, 
+]
+
+schedule = {
   'monday-friday': {
     start: '8',
     end: '22'
@@ -49,11 +75,21 @@ def get_image(file_name)
   'sunday': {
     start: '8',
     end: '22'
-  },
-}}])
+  }
+}
+
+regular_user = User.create(name: 'Lian Nivin', email: '[email protected]', role: "regular", password: '123456')
+owner_user = User.create(name: 'Cristian Berly', email: '[email protected]', role: "owner", password: '123456')
+
+clubs.each do |club|
+  image = club[:num_img].times.map { |i| get_image("#{club[:name]}/gallery_#{i + 1}.jpg") }
+  club.delete(:num_img)
+  Club.create(club.merge({image: image, schedule: schedule}))
+end
 
 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)
+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)
 
 # favorites

api/app/assets/images/Depor Plaza Costa Verde/gallery_3.jpg

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

api/app/assets/images/Depor Plaza Costa Verde/gallery_4.jpg

@@ -2,3 +2,4 @@ REACT_APP_VERSION=$npm_package_version
 REACT_APP_API_URL=http://localhost:4000/api
 REACT_APP_API_URL_PRODUCTION=
 REACT_APP_OPEN_CAGE_DATA_KEY=
+REACT_APP_STRIPE_KEY=

api/app/assets/images/Depor plaza Puericultorio/gallery_1.jpg

@@ -19,6 +19,7 @@
     "react-leaflet": "^2.4.0",
     "react-redux": "^7.1.0",
     "react-scripts": "3.0.1",
+    "react-stripe-elements": "^4.0.0",
     "redux": "^4.0.1",
     "redux-thunk": "^2.3.0"
   },

api/app/assets/images/Depor plaza Puericultorio/gallery_2.jpg

@@ -24,6 +24,7 @@
   <meta name="author" content="Team Codeable">
   <title>Kampu</title>
   <link href="https://fonts.googleapis.com/css?family=Rubik&display=swap" rel="stylesheet">
+  <script src="https://js.stripe.com/v3/"></script>
 </head>
 
 <body>