Merge branch 'master' into employees

dfelczak · web-flow · commit e3dfd543af88 · 2017-05-16T16:11:06.000+02:00
diff --git a/app/controllers/category_controller.rb b/app/controllers/category_controller.rb
@@ -0,0 +1,2 @@
+class CategoryController < ApplicationController
+end
diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
@@ -0,0 +1,3 @@
+class CustomersController < AuthorizedController
+
+end
diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
@@ -0,0 +1,2 @@
+class OrdersController < AuthorizedController
+end
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
@@ -0,0 +1,2 @@
+class ProductsController < AuthorizedController
+end
diff --git a/app/controllers/suppliers_controller.rb b/app/controllers/suppliers_controller.rb
@@ -0,0 +1,2 @@
+class SuppliersController < AuthorizedController
+end
diff --git a/app/models/customer.rb b/app/models/customer.rb
@@ -0,0 +1,2 @@
+class Customer < ApplicationRecord
+end
diff --git a/app/models/order.rb b/app/models/order.rb
@@ -0,0 +1,2 @@
+class Order < ApplicationRecord
+end
diff --git a/app/models/product.rb b/app/models/product.rb
@@ -0,0 +1,3 @@
+class Product < ApplicationRecord
+  validates :product_name, presence: true, uniqueness: true
+end
diff --git a/app/models/supplier.rb b/app/models/supplier.rb
@@ -0,0 +1,2 @@
+class Supplier < ApplicationRecord
+end
diff --git a/app/resources/customer_resource.rb b/app/resources/customer_resource.rb
@@ -0,0 +1,12 @@
+class CustomerResource < JSONAPI::Resource
+  attributes :company_name,
+             :contact_name
+             :contact_title
+             :address
+             :city
+             :region
+             :postal_code
+             :country
+             :phone
+             :fax
+end
diff --git a/app/resources/order_resource.rb b/app/resources/order_resource.rb
@@ -0,0 +1,4 @@
+class OrderResource < JSONAPI::Resource
+  attributes :order_date, :required_date, :shipped_date, :ship_via, :freight, :ship_name, :ship_address, :ship_city,
+             :ship_region, :ship_postal_code, :ship_country
+end
diff --git a/app/resources/product_resource.rb b/app/resources/product_resource.rb
@@ -0,0 +1,3 @@
+class ProductResource < JSONAPI::Resource
+  attributes :product_name
+end
diff --git a/app/resources/supplier_resource.rb b/app/resources/supplier_resource.rb
@@ -0,0 +1,13 @@
+class SupplierResource < JSONAPI::Resource
+  attributes :company_name,
+             :contact_name,
+             :contact_title,
+             :address,
+             :city,
+             :region,
+             :postal_code,
+             :country,
+             :phone,
+             :fax,
+             :home_page
+end
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,7 +3,11 @@
   jsonapi_resources :categories
   jsonapi_resources :comments
   jsonapi_resources :posts
+  jsonapi_resources :products
   jsonapi_resources :users
   jsonapi_resources :roles
   jsonapi_resources :employees
+  jsonapi_resources :orders
+  jsonapi_resources :customers
+  jsonapi_resources :suppliers
 end
diff --git a/db/migrate/20170516130238_create_orders.rb b/db/migrate/20170516130238_create_orders.rb
@@ -0,0 +1,18 @@
+class CreateOrders < ActiveRecord::Migration[5.0]
+  def change
+    create_table :orders do |t|
+      t.date     :order_date
+      t.date     :required_date
+      t.date     :shipped_date
+      t.integer  :ship_via
+      t.float    :freight
+      t.string   :ship_name
+      t.string   :ship_address
+      t.string   :ship_city
+      t.string   :ship_region
+      t.string   :ship_postal_code
+      t.string   :ship_country
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170516130257_create_products.rb b/db/migrate/20170516130257_create_products.rb
@@ -0,0 +1,19 @@
+class CreateProducts < ActiveRecord::Migration[5.0]
+  def change
+    create_table :products do |t|
+      t.string :product_name
+      t.integer  :supplier_id
+      t.integer  :category_id
+      t.string   :quantity_per_unit
+      t.float    :unit_price
+      t.integer  :units_in_stock
+      t.integer  :units_on_order
+      t.integer  :reorder_level
+      t.boolean  :discontinued
+      t.datetime :created_at
+      t.datetime :updated_at
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170516130511_create_customers.rb b/db/migrate/20170516130511_create_customers.rb
@@ -0,0 +1,18 @@
+class CreateCustomers < ActiveRecord::Migration[5.0]
+  def change
+    create_table :customers, force: true do |t|
+      t.string  :company_name
+      t.string  :contact_name
+      t.string  :contact_title
+      t.string  :address
+      t.string  :city
+      t.string  :region
+      t.string  :postal_code
+      t.string  :country
+      t.string  :phone
+      t.string  :fax
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+  end
+end
diff --git a/db/migrate/20170516131023_create_suppliers.rb b/db/migrate/20170516131023_create_suppliers.rb
@@ -0,0 +1,18 @@
+class CreateSuppliers < ActiveRecord::Migration[5.0]
+  def change
+    create_table(:suppliers) do |t|
+      t.string :company_name
+      t.string :contact_name
+      t.string :contact_title
+      t.string :address
+      t.string :city
+      t.string :region
+      t.string :postal_code
+      t.string :country
+      t.string :phone
+      t.string :fax
+      t.text :home_page
+      t.timestamps
+    end
+  end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -13,12 +13,24 @@
 end
 
 25.times do |n|
-  User.create!(
-    email: "user#{n}@example.com",
-    password: 'Secret123',
-    confirmed_at: Time.now,
-    tokens: nil
-  ).add_role n == 0 ? :admin : :user
+  u = User.create!(email: "user#{n}@example.com", password: 'Secret123', confirmed_at: Time.now)
+  u.add_role n == 0 ? :admin : :user
+end
+
+25.times do |n|
+  FactoryGirl.create(:order)
+end
+
+25.times do |n|
+  FactoryGirl.create(:supplier)
+end
+
+25.times do |n|
+  FactoryGirl.create(:customer)
+end
+
+20.times do |n|
+  FactoryGirl.create(:product)
 end
 
 20.times do |n|
diff --git a/server/tmp/restart.txt b/server/tmp/restart.txt
diff --git a/spec/factories/customer.rb b/spec/factories/customer.rb
@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :customer do
+    company_name { Faker::Company.name }
+    contact_name { Faker::Name.name }
+    address { Faker::Address.street_address }
+    city { Faker::Address.city }
+    region { Faker::Address.state }
+    postal_code { Faker::Address.zip_code }
+    country { Faker::Address.country }
+    phone { Faker::PhoneNumber.phone_number }
+    fax { Faker::PhoneNumber.phone_number }
+  end
+end
diff --git a/spec/factories/order.rb b/spec/factories/order.rb
@@ -0,0 +1,15 @@
+FactoryGirl.define do
+  factory :order do
+    order_date { Faker::Date.between(10.days.ago, Date.today) }
+    required_date { Faker::Date.between(10.days.ago, Date.today) }
+    shipped_date { Faker::Date.between(10.days.ago, Date.today) }
+    ship_via { 'DHL' }
+    freight { rand(1000) }
+    ship_name { 'Titanic' }
+    ship_address { Faker::Address.street_name }
+    ship_city { Faker::Address.city }
+    ship_region { Faker::Address.state }
+    ship_postal_code { Faker::Address.zip }
+    ship_country { Faker::Address.country }
+  end
+end
diff --git a/spec/factories/product.rb b/spec/factories/product.rb
@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :product do
+    sequence :product_name do |n|
+      "#{Faker::Pokemon.name} + #{n}"
+    end
+  end
+end
diff --git a/spec/factories/supplier.rb b/spec/factories/supplier.rb
@@ -0,0 +1,15 @@
+FactoryGirl.define do
+  factory :supplier do
+    company_name { Faker::Company.name }
+    contact_name { Faker::Name.name }
+    contact_title { Faker::Name.title }
+    address { Faker::Address.street_address }
+    city { Faker::Address.city }
+    region { Faker::Address.state }
+    postal_code { Faker::Address.postcode }
+    country { Faker::Address.country }
+    phone { Faker::PhoneNumber.cell_phone }
+    fax { Faker::PhoneNumber.cell_phone }
+    home_page { "http://#{Faker::Company.name}.com" }
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class CategoryController < ApplicationController`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class CustomersController < AuthorizedController`
	`2`	`+`
	`3`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class OrdersController < AuthorizedController`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class ProductsController < AuthorizedController`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class SuppliersController < AuthorizedController`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Customer < ApplicationRecord`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Order < ApplicationRecord`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class Product < ApplicationRecord`
	`2`	`+ validates :product_name, presence: true, uniqueness: true`
	`3`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class Supplier < ApplicationRecord`
	`2`	`+end`