mirror of
https://github.com/iritmaximus/brewery.git
synced 2026-10-12 19:13:49 +03:00
upto 3.2
This commit is contained in:
+1
-1
@@ -5,6 +5,6 @@ class Beer < ApplicationRecord
|
||||
has_many :ratings, dependent: :destroy
|
||||
|
||||
def to_s
|
||||
"#{self.name}, #{(Brewery.find_by_id self.brewery_id).name}"
|
||||
"#{name}, #{(Brewery.find_by_id brewery_id).name}"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,6 +12,6 @@ class Brewery < ApplicationRecord
|
||||
|
||||
def restart
|
||||
self.year = 2023
|
||||
puts "changed year to #{2023}"
|
||||
puts "changed year to 2023"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5,11 +5,11 @@ module RatingAverage
|
||||
total_score = 0
|
||||
count = 0
|
||||
|
||||
if defined? self.beers
|
||||
beers = self.beers
|
||||
else
|
||||
beers = self
|
||||
end
|
||||
beers = if defined? self.beers
|
||||
self.beers
|
||||
else
|
||||
self
|
||||
end
|
||||
|
||||
beers.each do |beer|
|
||||
count += beer.ratings.count
|
||||
@@ -18,24 +18,22 @@ module RatingAverage
|
||||
end
|
||||
end
|
||||
|
||||
if count == 0
|
||||
return 0
|
||||
end
|
||||
return 0 unless count != 0
|
||||
|
||||
return total_score / count
|
||||
total_score / count
|
||||
end
|
||||
|
||||
def count_ratings
|
||||
if defined? self.beers
|
||||
beers = self.beers
|
||||
else
|
||||
beers = self
|
||||
end
|
||||
beers = if defined? self.beers
|
||||
self.beers
|
||||
else
|
||||
self
|
||||
end
|
||||
|
||||
count = 0
|
||||
beers.each do |beer|
|
||||
count += beer.ratings.count
|
||||
end
|
||||
return count
|
||||
count
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user