diff --git a/app/controllers/category_controller.rb b/app/controllers/category_controller.rb new file mode 100644 index 0000000..d7d9784 --- /dev/null +++ b/app/controllers/category_controller.rb @@ -0,0 +1,2 @@ +class CategoryController < ApplicationController +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000..5488757 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,2 @@ +class OrdersController < AuthorizedController +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000..10281b3 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,2 @@ +class Order < ApplicationRecord +end diff --git a/app/resources/order_resource.rb b/app/resources/order_resource.rb new file mode 100644 index 0000000..c1979d8 --- /dev/null +++ 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/config/routes.rb b/config/routes.rb index e5fe6c1..ce43b3d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ jsonapi_resources :products jsonapi_resources :users jsonapi_resources :roles + 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 new file mode 100644 index 0000000..6e8f373 --- /dev/null +++ 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/seeds.rb b/db/seeds.rb index 4c4bebc..b703a58 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -13,12 +13,12 @@ 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| diff --git a/spec/factories/order.rb b/spec/factories/order.rb new file mode 100644 index 0000000..02df027 --- /dev/null +++ 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 \ No newline at end of file