mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 20:33:38 +08:00
Add notification_id column to user_badges.
This commit is contained in:
parent
7daf584251
commit
a68b47cb9f
|
@ -35,6 +35,7 @@ end
|
|||
# updated_at :datetime
|
||||
# allow_title :boolean default(FALSE), not null
|
||||
# multiple_grant :boolean default(FALSE), not null
|
||||
# icon :string(255) default("fa-certificate")
|
||||
#
|
||||
# Indexes
|
||||
#
|
||||
|
|
|
@ -2,17 +2,12 @@ class UserBadge < ActiveRecord::Base
|
|||
belongs_to :badge
|
||||
belongs_to :user
|
||||
belongs_to :granted_by, class_name: 'User'
|
||||
belongs_to :notification, dependent: :destroy
|
||||
|
||||
validates :badge_id, presence: true, uniqueness: {scope: :user_id}, if: 'badge.single_grant?'
|
||||
validates :user_id, presence: true
|
||||
validates :granted_at, presence: true
|
||||
validates :granted_by, presence: true
|
||||
|
||||
# This may be inefficient, but not very easy to optimize unless the data hash
|
||||
# is converted into a hstore.
|
||||
def notification
|
||||
@notification ||= self.user.notifications.where(notification_type: Notification.types[:granted_badge]).where("data LIKE ?", "%" + self.badge_id.to_s + "%").select {|n| n.data_hash["badge_id"] == self.badge_id }.first
|
||||
end
|
||||
end
|
||||
|
||||
# == Schema Information
|
||||
|
@ -24,6 +19,8 @@ end
|
|||
# user_id :integer not null
|
||||
# granted_at :datetime not null
|
||||
# granted_by_id :integer not null
|
||||
# post_id :integer
|
||||
# notification_id :integer
|
||||
#
|
||||
# Indexes
|
||||
#
|
||||
|
|
|
@ -25,9 +25,8 @@ class BadgeGranter
|
|||
end
|
||||
|
||||
if SiteSetting.enable_badges?
|
||||
@user.notifications.create(notification_type: Notification.types[:granted_badge],
|
||||
data: { badge_id: @badge.id,
|
||||
badge_name: @badge.name }.to_json)
|
||||
notification = @user.notifications.create(notification_type: Notification.types[:granted_badge], data: { badge_id: @badge.id, badge_name: @badge.name }.to_json)
|
||||
user_badge.update_attributes notification_id: notification.id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -48,8 +47,6 @@ class BadgeGranter
|
|||
user_badge.user.title = nil
|
||||
user_badge.user.save!
|
||||
end
|
||||
|
||||
user_badge.notification && user_badge.notification.destroy!
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
class AddNotificationIdToUserBadge < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :user_badges, :notification_id, :integer
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user