Merge branch 'master' into orders

tb · web-flow · commit 818491715adf · 2017-05-16T15:55:04.000+02:00
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/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/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/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,10 @@
   jsonapi_resources :categories
   jsonapi_resources :comments
   jsonapi_resources :posts
+  jsonapi_resources :products
   jsonapi_resources :users
   jsonapi_resources :roles
   jsonapi_resources :orders
+  jsonapi_resources :customers
+  jsonapi_resources :suppliers
 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
@@ -21,3 +21,14 @@
   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
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/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,3 @@`
	`1`	`+class CustomersController < AuthorizedController`
	`2`	`+`
	`3`	`+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,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`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class ProductResource < JSONAPI::Resource`
	`2`	`+ attributes :product_name`
	`3`	`+end`