Feature report

app/controllers/ad_api_controller.rb

@@ -8,7 +8,7 @@ def view
     target_ids = Ad.pluck(:id).sample(params[:count].to_i)
     ads = Ad.find(target_ids)
     ads.each do |ad|
-      report =  Report.find_by(ad_id: ad.id, adspot_id: params[:adspot_id],date: Date.today)
+      report =  Report.find_by(ad_id: ad.id, adspot_id: params[:adspot_id], date: Date.today)
       unless report
         report = Report.new(ad_id: ad.id, adspot_id: params[:adspot_id], date: Date.today)
       end
@@ -27,7 +27,7 @@ def view
   end
 
   def click
-    report =  Report.find_by(ad_id: params[:ad_id], adspot_id: params[:adspot_id],date: Date.today)
+    report = Report.find_by(ad_id: params[:ad_id], adspot_id: params[:adspot_id], date: Date.today)
     unless report
       report = Report.new(ad_id: params[:ad_id], adspot_id: params[:adspot_id], date: Date.today)
     end
@@ -37,4 +37,3 @@ def click
   end
 
 end
-

app/controllers/ad_controller.rb

@@ -38,9 +38,21 @@ def destroy
     redirect_to(ad_index_path)
   end
 
+  def report
+    @report = Report.all
+    @ad = Ad.find(1)
+    p "afleihfjoiwahfoiawhgfoiahfoiaho"
+    p @ad.class
+  end
+
+  def report_period
+    @ads = Ad.all
+    @Report = Report.where(date: ( params[:date_min])..( params[:date_max]))
+  end
+
   private
 
   def ad_params # Adオブジェクト作成時にフォームから入力したパラメーターを渡す。
-    params.require(:ad).permit(:price, :text, :advertiser_id, :image)
+    params.require(:ad).permit(:price, :text, :image)
   end
 end

app/models/ad.rb

@@ -4,6 +4,5 @@ class Ad < ApplicationRecord
   validates :text, presence: true
   validates :price, presence: true
   validates :image, presence: true
-  validates :advertiser_id, presence: true
 
 end

app/views/ad/edit.html.erb

@@ -5,8 +5,6 @@
     <%= f.text_area :text,value: @ad.text,class: "form-control" %>
     <p>price</p>
     <%= f.number_field :price,value: @ad.price %>
-    <p>advertiser_id</p>
-    <%= f.number_field :advertiser_id,value: @ad.advertiser_id %>
     <p>image</p>
     <%= f.file_field :image,value: @ad.image,class: "form-control-file" %>
     <%= f.submit class: "btn btn-primary",value: "更新" %>

app/views/ad/new.html.erb

@@ -5,8 +5,6 @@
     <%= f.text_area :text,value: @ad.text,class: "form-control" %>
     <p>price</p>
     <%= f.number_field :price,value: @ad.price %>
-    <p>advertiser_id</p>
-    <%= f.number_field :advertiser_id,value: @ad.advertiser_id %>
     <p>image</p>
     <%= f.file_field :image,value: @ad.image,class: "form-control-file" %>
     <%= f.submit class: "btn btn-primary",value: "入稿" %>

config/routes.rb

@@ -3,5 +3,7 @@
   get '/view' => 'ad_api#view'
   get '/click' => 'ad_api#click'
   resources :ad
+  get '/report' => 'ad#report'
+  post '/report' => 'ad#report_period'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

db/schema.rb

@@ -13,7 +13,6 @@
 ActiveRecord::Schema.define(version: 2019_06_14_041856) do
 
   create_table "ads", force: :cascade do |t|
-    t.integer "advertiser_id", null: false
     t.string "image", default: "", null: false
     t.integer "price", null: false
     t.string "text", default: "", null: false

spec/controllers/ad_controller_spec.rb

@@ -7,7 +7,6 @@
       expect do
         post :create, params: { ad: { 'text' => 'Updated!',
                                       'price' => 1010101,
-                                      'advertiser_id' => 1010101,
                                       'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) } }
       end.to change(Ad, :count).by(1)
       expect(response).to redirect_to(ad_index_path)
@@ -16,31 +15,20 @@
     it "without text should render 'new'" do
       post :create, params: { ad: { 'text' => nil,
                                     'price' => 1010101,
-                                    'advertiser_id' => 1010101,
                                     'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) } }
       expect(response).to render_template :new
     end
 
     it "without price should render 'new'" do
       post :create, params: { ad: { 'text' => 'Updated!',
                                     'price' => nil,
-                                    'advertiser_id' => 1010101,
-                                    'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) } }
-      expect(response).to render_template :new
-    end
-
-    it "without advertiser_id should render 'new'" do
-      post :create, params: { ad: { 'text' => 'Updated!',
-                                    'price' => 1010101,
-                                    'advertiser_id' => nil,
                                     'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) } }
       expect(response).to render_template :new
     end
 
     it "without image should render 'new'" do
       post :create, params: { ad: { 'text' => 'Updated!',
                                     'price' => 1010101,
-                                    'advertiser_id' => 1010101,
                                     'image' => nil } }
       expect(response).to render_template :new
     end
@@ -56,10 +44,8 @@
         patch :update, params: { ad: {
           'text' => nil,
           'price' => nil,
-          'advertiser_id' => nil,
           'image' => nil
-        },
-                                 id: @ad.id }
+        },id: @ad.id }
         expect(response).to render_template :edit
       end
 
@@ -73,11 +59,6 @@
         expect(response).to redirect_to(ad_index_path)
       end
 
-      it 'with advertiser_id should be redirected' do
-        patch :update, params: { ad: { 'advertiser_id' => 1010101 }, id: @ad.id }
-        expect(response).to redirect_to(ad_index_path)
-      end
-
       it 'with image should be redirected' do
         patch :update, params: { ad: { 'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) }, id: @ad.id }
         expect(response).to redirect_to(ad_index_path)
@@ -87,10 +68,8 @@
         patch :update, params: { ad: {
           'text' => 'Updated!',
           'price' => 1010101,
-          'advertiser_id' => 1010101,
           'image' => Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg'))
-        },
-                                 id: @ad.id }
+        },id: @ad.id }
         expect(response).to redirect_to(ad_index_path)
       end
     end
@@ -106,11 +85,6 @@
         expect(response).to render_template :edit
       end
 
-      it 'without advertiser_id should be rendered' do
-        patch :update, params: { ad: { 'advertiser_id' => nil }, id: @ad.id }
-        expect(response).to render_template :edit
-      end
-
       it 'without image should be rendered' do
         patch :update, params: { ad: { 'image' => nil }, id: @ad.id }
         expect(response).to render_template :edit
@@ -120,10 +94,8 @@
         patch :update, params: { ad: {
           'text' => nil,
           'price' => nil,
-          'advertiser_id' => nil,
           'image' => nil
-        },
-                                 id: @ad.id }
+        },id: @ad.id }
         expect(response).to render_template :edit
       end
     end

spec/factories/ads.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 FactoryBot.define do
   factory :ad do
-    advertiser_id { 1 }
     image { Rack::Test::UploadedFile.new(File.join(Rails.root, 'spec/fixture/image.jpg')) }
     price { 1 }
     text { 'Test Text' }

spec/features/path_spec.rb

@@ -16,15 +16,13 @@
   it 'is Forms valid?' do
     fill_in 'ad_text', with: 'TextForm'
     fill_in 'ad_price', with: '1000'
-    fill_in 'ad_advertiser_id', with: '1'
     fill_in 'ad_text', with: 'TextForm'
     page.attach_file('ad_image', '/Users/hashimototakuma/Downloads/PNG_transparency_demonstration_1.png')
   end
 
   it 'is create action valid?' do
     fill_in 'ad_text', with: 'TextForm'
     fill_in 'ad_price', with: '1000'
-    fill_in 'ad_advertiser_id', with: '1'
     fill_in 'ad_text', with: 'TextForm'
     page.attach_file('ad_image', '/Users/hashimototakuma/Downloads/PNG_transparency_demonstration_1.png')
 
@@ -53,7 +51,6 @@
       visit 'ad/new'
       fill_in 'ad_text', with: 'TextForm'
       fill_in 'ad_price', with: '1000'
-      fill_in 'ad_advertiser_id', with: '1'
       fill_in 'ad_text', with: 'TextForm'
       page.attach_file('ad_image', '/Users/hashimototakuma/Downloads/PNG_transparency_demonstration_1.png')
       click_button '入稿'

spec/models/ad_spec.rb

@@ -11,11 +11,6 @@
     expect(@ad).not_to be_valid
   end
 
-  it 'without advertiser_id should be invalid' do
-    @ad.advertiser_id = nil
-    expect(@ad).not_to be_valid
-  end
-
   it 'without image should be invalid' do
     @ad.image = nil
     expect(@ad).not_to be_valid

test/fixtures/ads.yml

@@ -1,13 +1,11 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  advertiser_id: 1
   image: MyString
   price: MyString
   text: MyString
 
 two:
-  advertiser_id: 1
   image: MyString
   price: MyString
   text: MyString