Merge branch 'features/create_database' into 'master'

Create database See merge request !1

Merge branch 'features/create_database' into 'master'
Create database See merge request !1
fe41d8a4 · Ba Toi Dang · aa4aff23 · 37c2419d · fe41d8a4 · fe41d8a4
Commit fe41d8a4 authored Oct 02, 2017 by Ba Toi Dang
28 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@
 /yarn-error.log
 .byebug_history
+# Ignore application configuration
+/config/application.yml
--- a/Gemfile
+++ b/Gemfile
@@ -16,29 +16,14 @@ gem 'puma', '~> 3.7'
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
-# See https://github.com/rails/execjs#readme for more supported runtimes
+gem 'figaro'
-# gem 'therubyracer', platforms: :ruby
+gem 'devise'
+gem 'carrierwave'
-# Use CoffeeScript for .coffee assets and views
+gem 'kaminari'
-gem 'coffee-rails', '~> 4.2'
-# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem 'turbolinks', '~> 5'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 3.0'
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
 group :development, :test do
  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.13'
-  gem 'selenium-webdriver'
 end
 group :development do

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,39 +38,43 @@ GEM
      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
    arel (8.0.0)
+    bcrypt (3.1.11)
    bindex (0.5.0)
    builder (3.2.3)
    byebug (9.1.0)
-    capybara (2.15.1)
+    carrierwave (1.2.0)
-      addressable
+      activemodel (>= 4.0.0)
-      mini_mime (>= 0.1.3)
+      activesupport (>= 4.0.0)
-      nokogiri (>= 1.3.3)
+      mime-types (>= 1.16)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.8.0)
-      ffi (~> 1.0, >= 1.0.11)
-    coffee-rails (4.2.2)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
    concurrent-ruby (1.0.5)
    crass (1.0.2)
+    devise (4.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.2)
+      responders
+      warden (~> 1.2.3)
    erubi (1.6.1)
    execjs (2.7.0)
    ffi (1.9.18)
+    figaro (1.1.1)
+      thor (~> 0.14)
    globalid (0.4.0)
      activesupport (>= 4.2.0)
    i18n (0.8.6)
-    jbuilder (2.7.0)
+    kaminari (1.0.1)
-      activesupport (>= 4.2.0)
+      activesupport (>= 4.1.0)
-      multi_json (>= 1.2)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
    listen (3.1.5)
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
@@ -84,15 +88,13 @@ GEM
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
-    mini_mime (0.1.4)
    mini_portile2 (2.3.0)
    minitest (5.10.3)
-    multi_json (1.12.2)
    mysql2 (0.4.9)
    nio4r (2.1.0)
    nokogiri (1.8.1)
      mini_portile2 (~> 2.3.0)
-    public_suffix (3.0.0)
+    orm_adapter (0.5.0)
    puma (3.10.0)
    rack (2.0.3)
    rack-test (0.7.0)
@@ -124,8 +126,10 @@ GEM
    rb-fsevent (0.10.2)
    rb-inotify (0.9.10)
      ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
    ruby_dep (1.5.0)
-    rubyzip (1.2.1)
    sass (3.5.1)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
@@ -137,9 +141,6 @@ GEM
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
-    selenium-webdriver (3.6.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.0)
    spring (2.0.2)
      activesupport (>= 4.2)
    spring-watcher-listen (2.0.1)
@@ -155,13 +156,12 @@ GEM
    thor (0.20.0)
    thread_safe (0.3.6)
    tilt (2.0.8)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.3)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
    uglifier (3.2.0)
      execjs (>= 0.3.0, < 3)
+    warden (1.2.7)
+      rack (>= 1.0)
    web-console (3.5.1)
      actionview (>= 5.0)
      activemodel (>= 5.0)
@@ -170,26 +170,23 @@ GEM
    websocket-driver (0.6.5)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.2)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
 PLATFORMS
  ruby
 DEPENDENCIES
  byebug
-  capybara (~> 2.13)
+  carrierwave
-  coffee-rails (~> 4.2)
+  devise
-  jbuilder (~> 2.5)
+  figaro
+  kaminari
  listen (>= 3.0.5, < 3.2)
  mysql2 (>= 0.3.18, < 0.5)
  puma (~> 3.7)
  rails (~> 5.1.4)
  sass-rails (~> 5.0)
-  selenium-webdriver
  spring
  spring-watcher-listen (~> 2.0.0)
-  turbolinks (~> 5)
  tzinfo-data
  uglifier (>= 1.3.0)
  web-console (>= 3.3.0)

--- a/app/models/apply_job.rb
+++ b/app/models/apply_job.rb
+class ApplyJob < ApplicationRecord
+  belongs_to :job
+  belongs_to :user
+end
--- a/app/models/city.rb
+++ b/app/models/city.rb
+class City < ApplicationRecord
+  belongs_to :country
+  has_many :companies
+  has_many :jobs
+end
--- a/app/models/company.rb
+++ b/app/models/company.rb
+class Company < ApplicationRecord
+  belongs_to :city
+  has_many :jobs
+end
--- a/app/models/country.rb
+++ b/app/models/country.rb
+class Country < ApplicationRecord
+  has_many :cities
+end
--- a/app/models/favorite_job.rb
+++ b/app/models/favorite_job.rb
+class FavoriteJob < ApplicationRecord
+  belongs_to :job
+  belongs_to :user
+end
--- a/app/models/industry.rb
+++ b/app/models/industry.rb
+class Industry < ApplicationRecord
+  has_and_belongs_to_many :jobs
+end
--- a/app/models/job.rb
+++ b/app/models/job.rb
+class Job < ApplicationRecord
+  belongs_to :city
+  belongs_to :company
+  has_many :apply_jobs
+  has_many :candidates, through: :apply_jobs, class_name: 'User', source: :user
+  has_many :favorite_jobs
+  has_many :people_who_liked, through: :favorite_jobs, class_name: 'User', source: :user
+  has_and_belongs_to_many :industries
+end
--- a/app/models/user.rb
+++ b/app/models/user.rb
+class User < ApplicationRecord
+  has_many :apply_jobs
+  has_many :applied_jobs, through: :apply_jobs, class_name: 'Job', source: :job
+  has_many :favorite_jobs
+  has_many :liked_jobs, through: :favorite_jobs, class_name: 'Job', source: :job
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end
--- a/config/database.yml
+++ b/config/database.yml
@@ -14,7 +14,7 @@ default: &default
  encoding: utf8
  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
  username: root
-  password:
+  password: <%= ENV["PASSWORD_MYSQL"] %>
  socket: /var/run/mysqld/mysqld.sock
 development:

--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
--- a/config/routes.rb
+++ b/config/routes.rb
 Rails.application.routes.draw do
+  devise_for :users
  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
--- a/db/migrate/20171002013327_devise_create_users.rb
+++ b/db/migrate/20171002013327_devise_create_users.rb
+class DeviseCreateUsers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :users do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      ## Rememberable
+      t.datetime :remember_created_at
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+      t.timestamps null: false
+    end
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end
--- a/db/migrate/20171002013453_create_countries.rb
+++ b/db/migrate/20171002013453_create_countries.rb
+class CreateCountries < ActiveRecord::Migration[5.1]
+  def change
+    create_table :countries do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002013802_create_cities.rb
+++ b/db/migrate/20171002013802_create_cities.rb
+class CreateCities < ActiveRecord::Migration[5.1]
+  def change
+    create_table :cities do |t|
+      t.string :name
+      t.references :country, index: true
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002013939_create_companies.rb
+++ b/db/migrate/20171002013939_create_companies.rb
+class CreateCompanies < ActiveRecord::Migration[5.1]
+  def change
+    create_table :companies do |t|
+      t.string :name
+      t.string :location
+      t.text :description
+      t.references :city, index: true
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002014044_create_industries.rb
+++ b/db/migrate/20171002014044_create_industries.rb
+class CreateIndustries < ActiveRecord::Migration[5.1]
+  def change
+    create_table :industries do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002015233_create_jobs.rb
+++ b/db/migrate/20171002015233_create_jobs.rb
+class CreateJobs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :jobs do |t|
+      t.string :name
+      t.string :salary
+      t.text :description
+      t.string :level
+      t.string :experience
+      t.references :city, index: true
+      t.references :company, index: true
+      t.datetime :expiry_date
+      t.datetime :updated_date
+      t.datetime :updated_at
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002021206_create_favorite_jobs.rb
+++ b/db/migrate/20171002021206_create_favorite_jobs.rb
+class CreateFavoriteJobs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :favorite_jobs do |t|
+      t.references :job, index: true
+      t.references :user, index: true
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002021358_create_apply_jobs.rb
+++ b/db/migrate/20171002021358_create_apply_jobs.rb
+class CreateApplyJobs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :apply_jobs do |t|
+      t.references :job, index: true
+      t.references :user, index: true
+      t.string :cv
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002033143_create_industries_jobs.rb
+++ b/db/migrate/20171002033143_create_industries_jobs.rb
+class CreateIndustriesJobs < ActiveRecord::Migration[5.1]
+  def change
+    create_table :industries_jobs do |t|
+      t.references :industry, index: true
+      t.references :job, index: true
+      t.timestamps
+    end
+  end
+end
--- a/db/migrate/20171002033456_add_cv_name_to_users.rb
+++ b/db/migrate/20171002033456_add_cv_name_to_users.rb
+class AddCvNameToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :cv, :string
+    add_column :users, :name, :string
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+ActiveRecord::Schema.define(version: 20171002033456) do
+  create_table "apply_jobs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.bigint "job_id"
+    t.bigint "user_id"
+    t.string "cv"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["job_id"], name: "index_apply_jobs_on_job_id"
+    t.index ["user_id"], name: "index_apply_jobs_on_user_id"
+  end
+  create_table "cities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.bigint "country_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["country_id"], name: "index_cities_on_country_id"
+  end
+  create_table "companies", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.string "location"
+    t.text "description"
+    t.bigint "city_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["city_id"], name: "index_companies_on_city_id"
+  end
+  create_table "countries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+  create_table "favorite_jobs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.bigint "job_id"
+    t.bigint "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["job_id"], name: "index_favorite_jobs_on_job_id"
+    t.index ["user_id"], name: "index_favorite_jobs_on_user_id"
+  end
+  create_table "industries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+  create_table "industries_jobs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.bigint "industry_id"
+    t.bigint "job_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["industry_id"], name: "index_industries_jobs_on_industry_id"
+    t.index ["job_id"], name: "index_industries_jobs_on_job_id"
+  end
+  create_table "jobs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.string "salary"
+    t.text "description"
+    t.string "level"
+    t.string "experience"
+    t.bigint "city_id"
+    t.bigint "company_id"
+    t.datetime "expiry_date"
+    t.datetime "updated_date"
+    t.datetime "updated_at", null: false
+    t.datetime "created_at", null: false
+    t.index ["city_id"], name: "index_jobs_on_city_id"
+    t.index ["company_id"], name: "index_jobs_on_company_id"
+  end
+  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer "sign_in_count", default: 0, null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "cv"
+    t.string "name"
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
+end
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
-require "test_helper"
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
-end
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-  fixtures :all
-  # Add more helper methods to be used by all tests here...
-end