Merge pull request #96 from ZeusWPI/frecency

Frecency
This commit is contained in:
benji 2016-02-16 15:46:27 +01:00
commit 935049c1bf
7 changed files with 44 additions and 2 deletions

View file

@ -26,7 +26,7 @@ class OrdersController < ApplicationController
end
def overview
@users = User.members.publik.order(:name)
@users = User.members.publik.order(frecency: :desc)
@last = Order.order(:created_at).reverse_order.includes(:user).limit(10).map(&:user)
end

View file

@ -21,6 +21,9 @@ class Order < ActiveRecord::Base
before_save { |o| o.order_items = o.order_items.reject{ |oi| oi.count == 0 } }
after_create :create_api_job, unless: -> { user.guest? }
after_create :update_user_frecency
after_destroy :update_user_frecency
validates :user, presence: true
validates_associated :order_items
validate :product_presence
@ -66,4 +69,8 @@ class Order < ActiveRecord::Base
def product_presence
errors.add(:base, "You have to order at least one product.") if order_items.map(&:count).sum.zero?
end
def update_user_frecency
self.user.calculate_frecency
end
end

View file

@ -41,6 +41,15 @@ class User < ActiveRecord::Base
end
end
def calculate_frecency
num_orders = Rails.application.config.frecency_num_orders
last_datetimes = self.orders.order(created_at: :desc)
.limit(num_orders)
.pluck(:created_at)
self.frecency = last_datetimes.map(&:to_time).map(&:to_i).sum / num_orders
self.save
end
def balance
@balance || begin
headers = {

View file

@ -22,5 +22,6 @@ module Tab002
config.active_record.raise_in_transactional_callbacks = true
config.active_job.queue_adapter = :delayed_job
config.call_api_after = 5.minutes
config.frecency_num_orders = 10
end
end

View file

@ -0,0 +1,5 @@
class AddFrecencyToUsers < ActiveRecord::Migration
def change
add_column :users, :frecency, :integer, default: 0, null: false
end
end

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160202133903) do
ActiveRecord::Schema.define(version: 20160216133104) do
create_table "barcodes", force: :cascade do |t|
t.integer "product_id"
@ -85,6 +85,7 @@ ActiveRecord::Schema.define(version: 20160202133903) do
t.boolean "koelkast", default: false
t.string "name"
t.boolean "private", default: false
t.integer "frecency", default: 0, null: false
end
add_index "users", ["koelkast"], name: "index_users_on_koelkast"

View file

@ -133,4 +133,23 @@ describe User do
expect(User.publik).to eq([@user, user])
end
end
describe 'frecency' do
it 'should be recalculated on creating an order' do
expect(@user.frecency).to eq 0
create :order, user: @user
expect(@user.frecency).to_not eq 0
end
it 'should be valid' do
dates = [Date.today.to_time, Date.yesterday.to_time]
dates.each do |date|
create :order, user: @user, created_at: date
end
@user.reload
num_orders = Rails.application.config.frecency_num_orders
frecency = dates.last(num_orders).map(&:to_i).sum/num_orders
expect(@user.frecency).to eq(frecency)
end
end
end