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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'date'
 class AdController < ApplicationController
   def index
     @ads = Ad.all
@@ -38,9 +39,30 @@ def destroy
     redirect_to(ad_index_path)
   end
 
+  def report #report.htmlに全レポートを出力
+    @reports = Report.select("
+      ad_id,
+      SUM(reports.imp) AS imp,
+      SUM(reports.click) AS click,
+      SUM(reports.cv) AS cv,
+      SUM(reports.price) AS price
+      ").group(:ad_id)
+  end
+
+  def report_period #report.htmlに一定期間のレポートを出力
+    @reports = Report.select("
+      ad_id,
+      SUM(reports.imp) AS imp,
+      SUM(reports.click) AS click,
+      SUM(reports.cv) AS cv,
+      SUM(reports.price) AS price
+      ").where(date: Date.parse(params[:date_min])..Date.parse(params[:date_max])).group(:ad_id)
+    render('/ad/report')
+    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,6 @@ class Ad < ApplicationRecord
   validates :text, presence: true
   validates :price, presence: true
   validates :image, presence: true
-  validates :advertiser_id, presence: true
+  has_many :reports
 
 end

app/models/report.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 class Report < ApplicationRecord
+  belongs_to :ad
 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: "入稿" %>

app/views/ad/report.html.erb

@@ -0,0 +1,33 @@
+<%= form_tag(report_period_path, method: :get) do %>
+  <%= date_field_tag :date_min %>
+  <%= date_field_tag :date_max %>
+  <%= submit_tag "期間指定", class: "btn btn-primary" %>
+<% end %>
+<div class="ads">
+  <table class="table">
+    <thead class="thead-dark">
+      <tr>
+        <th scope="col" class="h2">広告ID</th>
+        <th scope="col" class="h2">Impression数</th>
+        <th scope="col" class="h2">Click数</th>
+        <th scope="col" class="h2">総費用(円)</th>
+        <th scope="col" class="h2">CTR</th>
+        <th scope="col" class="h2">CPM</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <% @reports.each do |report| %>
+          <td class="h3 align-middle"><%= report.ad_id %></td>
+          <td class="h3 align-middle"><%= report.imp %></td>
+          <td class="h3 align-middle"><%= report.click %></td>
+          <td class="h3 align-middle"><%= report.price %></td>
+          <td class="h3 align-middle">
+            <%= (report.click.to_f / report.imp.to_f).round(3) %></td>
+          <td class="h3 align-middle">
+            <%= (report.price / (1000 / report.imp)) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

config/routes.rb

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

db/migrate/20190528085221_create_ads.rb

@@ -2,7 +2,6 @@
 class CreateAds < ActiveRecord::Migration[5.2] # Reportテーブルのtotalpriceにpriceを加算する為に使用しているのでここでも使っています
   def change
     create_table :ads do |t|
-      t.integer :advertiser_id, null: false # 広告主ID
       t.string :image, null: false, default: '' # 広告の画像URL
       t.integer :price, null: false # 広告の価格
       t.string :text, null: false, default: '' # 広告の説明文

db/migrate/20190614041856_create_repos.rb

@@ -8,7 +8,7 @@ def change
       t.integer :imp, null: false, default: 0
       t.integer :cv, null: false, default: 0
       t.integer :price, null: false, default: 0
-      t.date :date,null: false,unique: true
+      t.date :date, null: false, unique: true
       t.timestamps
     end
   end

db/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # 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.
@@ -11,26 +12,23 @@
 # It's strongly recommended that you check this file into your version control system.
 
 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
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'ads', force: :cascade do |t|
+    t.string 'image', default: '', null: false
+    t.integer 'price', null: false
+    t.string 'text', default: '', null: false
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "reports", force: :cascade do |t|
-    t.integer "ad_id", null: false
-    t.integer "adspot_id", null: false
-    t.integer "click", default: 0, null: false
-    t.integer "imp", default: 0, null: false
-    t.integer "cv", default: 0, null: false
-    t.integer "price", default: 0, null: false
-    t.date "date", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'reports', force: :cascade do |t|
+    t.integer 'ad_id', null: false
+    t.integer 'adspot_id', null: false
+    t.integer 'click', default: 0, null: false
+    t.integer 'imp', default: 0, null: false
+    t.integer 'cv', default: 0, null: false
+    t.integer 'price', default: 0, null: false
+    t.date 'date', null: false
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
-
 end

spec/controllers/ad_api_controller_spec.rb

@@ -3,101 +3,94 @@
 
 RSpec.describe AdApiController, type: :controller do
   before do
-    @ad1 =FactoryBot.create(:ad)
+    @ad1 = FactoryBot.create(:ad)
   end
 
   describe 'GET #view' do
     it 'returns http success with valid params' do
-      get :view,params: {adspot_id: 1,count: 1}
+      get :view, params: { adspot_id: 1, count: 1 }
       expect(response).to have_http_status(:success)
     end
 
-    describe "Report" do
-      it "an ad should be recorded" do
-        expect { get :view,params: {adspot_id: 1,count: 1} }.to change(Report, :count).by(1)
+    describe 'Report' do
+      it 'an ad should be recorded' do
+        expect { get :view, params: { adspot_id: 1, count: 1 } }.to change(Report, :count).by(1)
       end
 
       it "record 'imp' should be increased" do
-        get :view,params: {adspot_id: 1,count: 1}
-        report =  Report.find_by(ad_id: @ad1.id, adspot_id: 1, date: Date.today)
+        get :view, params: { adspot_id: 1, count: 1 }
+        report = Report.find_by(ad_id: @ad1.id, adspot_id: 1, date: Date.today)
         expect(report.imp).to eq 1
       end
 
       it "an ad shouldn't be recorded twice from the same adspot_id  on the same day" do
-        get :view,params: {adspot_id: 100,count: 1}
-        expect { get :view,params: {adspot_id: 100,count: 1}}.to change(Report, :count).by(0)
+        get :view, params: { adspot_id: 100, count: 1 }
+        expect { get :view, params: { adspot_id: 100, count: 1 } }.to change(Report, :count).by(0)
       end
 
-      it "an ad should be recorded from other adspots" do
-        get :view,params: {adspot_id: 100,count: 1}
-        expect { get :view,params: {adspot_id: 101,count: 1}}.to change(Report, :count).from(1).to(2)
+      it 'an ad should be recorded from other adspots' do
+        get :view, params: { adspot_id: 100, count: 1 }
+        expect { get :view, params: { adspot_id: 101, count: 1 } }.to change(Report, :count).from(1).to(2)
       end
 
-      it "ads should be recorded at the same time" do
-        ad2 =FactoryBot.create(:ad)
-        expect { get :view,params: {adspot_id: 101,count: 2}}.to change(Report, :count).from(0).to(2)
+      it 'ads should be recorded at the same time' do
+        ad2 = FactoryBot.create(:ad)
+        expect { get :view, params: { adspot_id: 101, count: 2 } }.to change(Report, :count).from(0).to(2)
       end
 
-      it "an ad should be recorded on the other day" do
-        get :view,params: {adspot_id: 101,count: 1}
+      it 'an ad should be recorded on the other day' do
+        get :view, params: { adspot_id: 101, count: 1 }
         travel 1.day do
-          expect { get :view,params: {adspot_id: 101,count: 1}}.to change(Report, :count).from(1).to(2)
+          expect { get :view, params: { adspot_id: 101, count: 1 } }.to change(Report, :count).from(1).to(2)
         end
+      end
 
-    end
-
-
-    context "when many ads are requested" do
-
-      it "all ads should be visible " do
-        @ad2 =FactoryBot.create(:ad)
-        @ad3 =FactoryBot.create(:ad)
-        get :view,params: {adspot_id: 1,count: 3}
-        jsons = JSON.parse(response.body)
-
-
-        ad1_ispresent = false
-        ad2_ispresent = false
-        ad3_ispresent = false
-
-        jsons.each do |json|
-          if json['ad_id'] == @ad1.id
-            ad1_ispresent = true
-          elsif json['ad_id'] == @ad2.id
-            ad2_ispresent = true
-          elsif json['ad_id'] == @ad3.id
-            ad3_ispresent = true
+      context 'when many ads are requested' do
+        it 'all ads should be visible ' do
+          @ad2 = FactoryBot.create(:ad)
+          @ad3 = FactoryBot.create(:ad)
+          get :view, params: { adspot_id: 1, count: 3 }
+          jsons = JSON.parse(response.body)
+
+          ad1_ispresent = false
+          ad2_ispresent = false
+          ad3_ispresent = false
+
+          jsons.each do |json|
+            if json['ad_id'] == @ad1.id
+              ad1_ispresent = true
+            elsif json['ad_id'] == @ad2.id
+              ad2_ispresent = true
+            elsif json['ad_id'] == @ad3.id
+              ad3_ispresent = true
+            end
           end
+          expect(ad1_ispresent).to be_truthy
+          expect(ad2_ispresent).to be_truthy
+          expect(ad3_ispresent).to be_truthy
         end
-        expect(ad1_ispresent).to be_truthy
-        expect(ad2_ispresent).to be_truthy
-        expect(ad3_ispresent).to be_truthy
       end
     end
   end
-end
-
-describe 'GET #click' do
-  before do
-    @ad =FactoryBot.create(:ad)
-    get :view,params: {adspot_id: 1,count: 1}
-    #     get :click,params: {ad_id: ad.id,adspot_id: 1}
-    #@report = Report.new(ad_id: params[:ad_id], adspot_id: params[:adspot_id], date: Date.today)
-
-  end
 
-  it 'returns http success' do
-    get :click,params: {ad_id: @ad.id,adspot_id: 1}
-    expect(response).to have_http_status(:success)
-  end
+  describe 'GET #click' do
+    before do
+      @ad = FactoryBot.create(:ad)
+      get :view, params: { adspot_id: 1, count: 1 }
+      #     get :click,params: {ad_id: ad.id,adspot_id: 1}
+      # @report = Report.new(ad_id: params[:ad_id], adspot_id: params[:adspot_id], date: Date.today)
+    end
 
-  describe "Report" do
+    it 'returns http success' do
+      get :click, params: { ad_id: @ad.id, adspot_id: 1 }
+      expect(response).to have_http_status(:success)
+    end
 
-    it "an ad should be recorded " do
-        expect { get :click,params: {ad_id: @ad.id,adspot_id: 1} }.to change(Report, :count).by(0)
+    describe 'Report' do
+      it 'an ad should be recorded ' do
+        expect { get :click, params: { ad_id: @ad.id, adspot_id: 1 } }.to change(Report, :count).by(0)
       end
 
-
       # it "record 'click' should be increased" do
       #   report = Report.find_by(ad_id: @ad.id, adspot_id: 1,date: Date.today)
       #   expect{get :click,params: {ad_id: @ad.id,adspot_id: 1}}.to change(report.click).by(0)
@@ -125,8 +118,7 @@
       #   end
       # end
     end
-
-end
+  end
 end
 
 #     it 'returns http success with valid params' do
@@ -167,7 +159,6 @@
 #         end
 #       end
 
-
 #     end
 #   end
 # end