Victor Costa · Leandro Santos · Victor Costa · Victor Costa · Victor Costa · Victor Costa
Showing 29 changed files Show diff stats
controllers/admin/gamification_plugin_badges_controller.rb
lib/ext/environment.rb
lib/ext/organization.rb
lib/gamification_plugin/api.rb
lib/gamification_plugin/dashboard_helper.rb
lib/merit/badge_rules.rb
lib/merit/point_rules.rb
lib/merit_ext.rb
models/gamification_plugin/points_categorization.rb
models/gamification_plugin/points_type.rb
public/admin.css
public/admin.js
public/style.css
test/functional/gamification_plugin_badges_controller_test.rb
test/functional/gamification_plugin_profile_controller_test.rb
test/test_helper.rb
test/unit/api_test.rb
test/unit/article_test.rb
test/unit/badge_rules_test.rb
test/unit/badge_test.rb
 class GamificationPluginBadgesController < PluginAdminController
   def index
-    @gamification_plugin_badges = environment.gamification_plugin_badges
+    @gamification_plugin_badges = environment.gamification_plugin_badges.group_by(&:owner)
   end
   def show
@@ -17,8 +17,13 @@ class GamificationPluginBadgesController &lt; PluginAdminController
   end
   def create
+    owner_id = params[:gamification_plugin_badge].delete(:owner_id)
     @gamification_plugin_badge = GamificationPlugin::Badge.new(params[:gamification_plugin_badge])
-    @gamification_plugin_badge.owner = environment
+    if owner_id.present?
+      @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
+    else
+      @gamification_plugin_badge.owner = environment
+    end
     if @gamification_plugin_badge.save
       session[:notice] = _('Badge was successfully created.')
@@ -31,6 +36,14 @@ class GamificationPluginBadgesController &lt; PluginAdminController
   def update
     @gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
+    # FIXME avoid code duplication
+    owner_id = params[:gamification_plugin_badge].delete(:owner_id)
+    if owner_id.present?
+      @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
+    else
+      @gamification_plugin_badge.owner = environment
+    end
+
     if @gamification_plugin_badge.update_attributes(params[:gamification_plugin_badge])
       session[:notice] = _('Badge was successfully updated.')
       redirect_to :action => :index
@@ -39,6 +52,10 @@ class GamificationPluginBadgesController &lt; PluginAdminController
     end
   end
+  def search_owners
+    render :text => prepare_to_token_input(environment.organizations).to_json
+  end
+
   def destroy
     @gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
     @gamification_plugin_badge.destroy
@@ -2,6 +2,11 @@ require_dependency &#39;environment&#39;
 class Environment
-  has_many :gamification_plugin_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+  has_many :gamification_plugin_environment_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+  has_many :gamification_plugin_organization_badges, :through => :organizations
+
+  def gamification_plugin_badges
+    GamificationPlugin::Badge.from("#{gamification_plugin_organization_badges.union(gamification_plugin_environment_badges).to_sql} as #{GamificationPlugin::Badge.table_name}")
+  end
 end
@@ -0,0 +1,7 @@
+require_dependency 'organization'
+
+class Organization
+
+  has_many :gamification_plugin_organization_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+
+end
@@ -57,7 +57,7 @@ class GamificationPlugin::API &lt; Grape::API
       get ':id/points_by_profile' do
         person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
         return not_found! if person.blank?
-        {points: person.points_by_type(params[:profile]) }
+        {points: person.points_by_profile(params[:profile]) }
       end
       get ':id/points_out_of_profiles' do
@@ -12,10 +12,19 @@ module GamificationPlugin::DashboardHelper
   end
   def score_point_category(point)
-    point = GamificationPlugin::PointsType.where(name: point.score.category).first
+    point = GamificationPlugin::PointsType.where(id: point.score.category).first
     point.nil? ? '' : point.description
   end
+  def score_point_target_link(point, text)
+    url = Merit::PointRules.target_url(point)
+    url.present? ? link_to(text, url) : text
+  end
+
+  def score_point_action_class(point)
+    point.undo_rule? ? 'undo_action':'do_action'
+  end
+
   def ranking(target, from_date=nil, limit=10)
     # FIXME move these queries to profile model
     ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).order('sum(num_points) DESC').group('profiles.id')
@@ -35,4 +44,15 @@ module GamificationPlugin::DashboardHelper
     (context_ranking.blank? ? '' : render(:partial => 'gamification/ranking', :locals => {:ranking => context_ranking, :target_ranking => target_ranking, :ranking_class => 'context'}))
   end
+  def badges_title(owner)
+    return _('Badges for %s' % owner.name) if owner.kind_of?(Organization)
+    _('Badges')
+  end
+
+  def grouped_badges
+    environment.gamification_plugin_badges.all.group_by(&:owner).sort do |a, b|
+      a.first.kind_of?(Environment) ? -1 : a.first.name <=> b.first.name
+    end
+  end
+
 end
@@ -14,6 +14,7 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         }
       ],
@@ -22,6 +23,7 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: lambda {|comment| comment.source.author},
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? Comment.where(source_id: Article.where(author_id: author.id)).count : 0 }
         }
       ],
@@ -30,6 +32,7 @@ module Merit
           action: 'article#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|article| article.profile },
           value: lambda { |article, author| author.present? ? TextArticle.where(author_id: author.id).count : 0 }
         },
       ],
@@ -38,6 +41,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voteable.author},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, author| vote.voteable ? Vote.for_voteable(vote.voteable).where('vote > 0').count : 0}
         }
       ],
@@ -46,6 +50,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voteable.author},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, author| Vote.for_voteable(vote.voteable).where('vote < 0').count }
         }
       ],
@@ -54,6 +59,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voter},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| voter ? Vote.for_voter(voter).count : 0 }
         }
       ],
@@ -65,6 +71,7 @@ module Merit
           value: lambda { |friendship, person| person.friends.count }
         }
       ],
+      manual: [],
 #FIXME review the name of the badges and see a way to make it generic
       creative: [
@@ -72,12 +79,14 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         },
         {
           action: 'article#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|article| article.profile },
           value: lambda { |article, author| author.present? ? author.articles.count : 0 }
         },
       ],
@@ -86,6 +95,7 @@ module Merit
           action: 'articlefollower#create',
           default_threshold: 5,
           to: lambda {|article| article.person },
+          target_profile: lambda {|article_follower| article_follower.article.profile },
           model: 'ArticleFollower',
           value: lambda { |article, person| person.present? ? person.article_followers.count : 0 }
         }
@@ -95,12 +105,14 @@ module Merit
           action: 'Vote#create',
           default_threshold: 5,
           to: lambda { |vote| vote.voter },
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| Vote.for_voter(voter).count }
         },
         {
           action: 'Event#create',
           default_threshold: 5,
           to: lambda { |article| article.author },
+          target_profile: lambda {|article| article.profile },
           value: lambda { |event, author| author.events.count }
         },
       ],
@@ -109,12 +121,14 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voter},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| voter ? voter.votes.where('vote > 0').count : 0 }
         },
         {
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         }
       ],
@@ -123,6 +137,7 @@ module Merit
           action: 'articlefollower#create',
           default_threshold: 5,
           to: :person,
+          target_profile: lambda {|article_follower| article_follower.article.profile },
           model: 'ArticleFollower',
           value: lambda { |article_follower, person| person.present? ? person.article_followers.count : 0 }
         },
@@ -130,11 +145,28 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         },
       ]
     }
+    def target_author(source, setting)
+      if setting[:to].is_a? Symbol
+        source.send(setting[:to])
+      else
+        setting[:to].call(source) rescue nil
+      end
+    end
+
+    def target_profile(source, setting)
+      setting[:target_profile].present? ? setting[:target_profile].call(source) : nil
+    end
+
+    def check_organization_badge(badge, source, setting)
+      !badge.owner.kind_of?(Organization) || badge.owner == target_profile(source, setting)
+    end
+
     def initialize(environment=nil)
       return if environment.nil?
       @environment = environment
@@ -142,7 +174,7 @@ module Merit
       rules = AVAILABLE_RULES
       rules.merge! CONFERENCE_RULES if defined? CONFERENCE_RULES
-      environment.gamification_plugin_badges.all.each do |badge|
+      environment.gamification_plugin_badges.each do |badge|
         next if rules[badge.name.to_sym].nil?
         rules[badge.name.to_sym].each do |setting|
           options = {badge: badge.name, level: badge.level, to: setting[:to]}
@@ -150,18 +182,11 @@ module Merit
           grant_on setting[:action], options do |source|
             can_be_granted = true
             rules[badge.name.to_sym].each do |s|
-              if setting[:to].is_a? Symbol
-                to = source.send(setting[:to])
-              else
-                begin
-                  to = setting[:to].call(source)
-                rescue
-                  to = nil
-                end
-              end
-                # pass source and to for different situations
+              to = target_author(source, setting)
+              # pass source and to for different situations
               action = (badge.custom_fields || {}).fetch(s[:action], {})
               can_be_granted &= s[:value].call(source, to) >= action.fetch(:threshold, s[:default_threshold]).to_i
+              can_be_granted &= check_organization_badge(badge, source, setting)
             end
             can_be_granted
           end
@@ -11,6 +11,7 @@ module Merit
         description: _('Comment author'),
         default_weight: 40,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_article_author: {
         action: 'comment#create',
@@ -20,6 +21,7 @@ module Merit
         description: _('Article author of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_article: {
         action: 'comment#create',
@@ -29,6 +31,7 @@ module Merit
         description: _('Source article of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_community: {
         action: 'comment#create',
@@ -38,7 +41,8 @@ module Merit
         description: _('Article community of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
-        condition: lambda {|comment, profile| comment.profile.community?}
+        condition: lambda {|comment, profile| comment.profile.community?},
+        target_url: lambda {|comment| comment.url},
       },
       article_author: {
         action: 'article#create',
@@ -48,6 +52,7 @@ module Merit
         description: _('Article author'),
         default_weight: 50,
         target_profile: lambda {|article| article.profile },
+        target_url: lambda {|article| article.url},
       },
       article_community: {
         action: 'article#create',
@@ -57,7 +62,8 @@ module Merit
         description: _('Article community'),
         default_weight: 10,
         target_profile: lambda {|article| article.profile },
-        condition: lambda {|article, profile| article.profile.present? and article.profile.community? }
+        condition: lambda {|article, profile| article.profile.present? and article.profile.community? },
+        target_url: lambda {|article| article.url},
       },
       vote_voteable_author: {
         action: 'vote#create',
@@ -67,6 +73,7 @@ module Merit
         description: _('Author of a voted content'),
         default_weight: 20,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       vote_voteable: {
         action: 'vote#create',
@@ -76,6 +83,7 @@ module Merit
         description: _('Voted content'),
         default_weight: 30,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       vote_voter: {
         action: 'vote#create',
@@ -85,6 +93,7 @@ module Merit
         description: _('Voter'),
         default_weight: 10,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       friends: {
         action: 'friendship#create',
@@ -150,6 +159,7 @@ module Merit
     end
     def profile_condition(setting, target, profile)
+      return false if target == true
       profile.nil? || setting[:target_profile].blank? || setting[:target_profile].call(target) == profile
     end
@@ -163,6 +173,15 @@ module Merit
       end
     end
+    def self.target_url(point)
+      rule_name = point.point_type.present? ? point.point_type.name : point.score.category
+      target_url = AVAILABLE_RULES[rule_name.to_sym][:target_url]
+      return nil if target_url.blank? || point.action.blank?
+
+      model = BaseTargetFinder.new(Merit::Rule.new, point.action).get_target_from_database
+      model.present? ? target_url.call(model) : nil
+    end
+
     def initialize(environment=nil)
       return if environment.nil?
       @environment = environment
@@ -17,6 +17,15 @@ module Merit
   class Score
     class Point
       belongs_to :action
+
+      def point_type
+        @point_type ||= GamificationPlugin::PointsType.where(id: score.category).first
+      end
+
+      def undo_rule?
+        rule = Merit::PointRules::AVAILABLE_RULES[point_type.name.to_sym]
+        rule[:undo_action] == "#{action.target_model}##{action.action_method}"
+      end
     end
   end
-class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord
+class GamificationPlugin::PointsCategorization < ActiveRecord::Base
   belongs_to :profile
   belongs_to :point_type, class_name: 'GamificationPlugin::PointsType', foreign_key: :point_type_id
   attr_accessible :profile_id, :profile, :point_type_id, :weight
@@ -10,5 +10,5 @@ class GamificationPlugin::PointsCategorization &lt; Noosfero::Plugin::ActiveRecord
   scope :for_type, lambda { |p_type| joins(:point_type).where(gamification_plugin_points_types: {name: p_type}) }
   scope :for_profile, lambda { |p_profile| joins(:profile).where(profiles: {identifier: p_profile}) }
-  scope :grouped_profiles, select(:profile_id).group(:profile_id).includes(:profile)
+  scope :grouped_profiles, -> { select(:profile_id).group(:profile_id).includes(:profile) }
 end
-class GamificationPlugin::PointsType < Noosfero::Plugin::ActiveRecord
+class GamificationPlugin::PointsType < ActiveRecord::Base
   attr_accessible :description, :name
   validates :name, presence: true, uniqueness: true
 .gamification-plugin-rank-rules .template-level {
   display: none !important;
 }
+
+.gamification-plugin-badges .badge-owner-group {
+  text-align: right;
+  color: gray;
+  font-weight: bold;
+}
@@ -13,6 +13,11 @@ var gamificationPluginAdmin = {
   	var name = jQuery('#gamification-plugin-form-badge-name').find('option:selected').text();
   	jQuery('.name_'+name).show();
   	jQuery('.name_'+name).find('input').removeAttr('disabled');
+    if(jQuery('.name_'+name).children().length>0) {
+      jQuery('.action-fields').show();
+    } else {
+      jQuery('.action-fields').hide();
+    }
   }
 }
@@ -237,3 +237,7 @@
   float: left;
   width: 180px;
 }
+
+.gamification-dashboard .points .score.undo_action .category {
+  text-decoration: line-through;
+}
@@ -25,6 +25,14 @@ class GamificationPluginBadgesControllerTest &lt; ActionController::TestCase
     end
   end
+  should "should create gamification_plugin_badge with organization as owner" do
+    organization = fast_create(Organization)
+    assert_difference('GamificationPlugin::Badge.count') do
+      post :create, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+      assert_equal organization, GamificationPlugin::Badge.last.owner
+    end
+  end
+
   should "should show gamification_plugin_badge" do
     get :show, id: @gamification_plugin_badge
     assert_response :success
@@ -40,6 +48,23 @@ class GamificationPluginBadgesControllerTest &lt; ActionController::TestCase
     assert assigns(:gamification_plugin_badge)
   end
+  should "should change badge owner" do
+    organization = fast_create(Organization)
+    put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+    assert assigns(:gamification_plugin_badge)
+    assert_equal organization, @gamification_plugin_badge.reload.owner
+  end
+
+  should "should keep badge owner when update" do
+    organization = fast_create(Organization)
+    @gamification_plugin_badge.owner = organization
+    @gamification_plugin_badge.save!
+
+    put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+    assert assigns(:gamification_plugin_badge)
+    assert_equal organization, @gamification_plugin_badge.reload.owner
+  end
+
   should "should destroy gamification_plugin_badge" do
     assert_difference('GamificationPlugin::Badge.count', -1) do
       delete :destroy, id: @gamification_plugin_badge
@@ -11,12 +11,13 @@ class GamificationPluginProfileControllerTest &lt; ActionController::TestCase
   attr_accessor :person, :environment
   should 'display points in gamification dashboard' do
-    person.add_points(20, :category => :comment_author)
-    person.add_points(30, :category => :article_author)
+    create_all_point_rules
+    article = create(TextArticle, :profile_id => fast_create(Community).id, :author => person)
+    create(Comment, :source => article, :author_id => create_user.person.id)
     get :dashboard, :profile => person.identifier
-    assert_tag :div, :attributes => {:class => 'score article_author positive'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '30'}
-    assert_tag :div, :attributes => {:class => 'score comment_author positive'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '20'}
-    assert_tag :div, :attributes => {:class => 'score total'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '50'}
+    assert_tag :div, :attributes => {:class => 'score article_author positive do_action'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => default_point_weight(:article_author).to_s}
+    assert_tag :div, :attributes => {:class => 'score comment_article_author positive do_action'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => default_point_weight(:comment_article_author).to_s}
+    assert_tag :div, :attributes => {:class => 'score total'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => (default_point_weight(:comment_article_author) + default_point_weight(:article_author)).to_s}
   end
   should 'display level in gamification dashboard' do
@@ -15,6 +15,10 @@ def create_all_point_rules
   end
 end
+def default_point_weight(rule_name)
+  Merit::PointRules::AVAILABLE_RULES[rule_name][:default_weight]
+end
+
 def load_point_rule(rule_name, config)
   rule_config = Merit::PointRules::AVAILABLE_RULES[rule_name.to_sym]
   raise "Point rule '#{rule_name}' is not available" if rule_config.nil?
@@ -22,7 +26,7 @@ def load_point_rule(rule_name, config)
   rule_config
 end
-#person_points_debug(person)  
+#person_points_debug(person)
 def person_points_debug(person)
   person.score_points.map do |sp|
     puts 'Ponto:'
@@ -8,6 +8,7 @@ class APITest &lt;  ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(GamificationPlugin)
     GamificationPlugin.gamification_set_rules(@environment)
+    create_all_point_rules
   end
   should 'get my own badges' do
@@ -27,14 +28,6 @@ class APITest &lt;  ActiveSupport::TestCase
     assert_not_nil json['percent']
   end
-  should 'get my total pontuation' do
-    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
-    person.add_badge(badge.id)
-    get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
-    json = JSON.parse(last_response.body)
-    assert_not_nil json['points']
-  end
-
   should 'get badges of the public person' do
     badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
     another_person = create(User, :environment => environment).person
@@ -76,4 +69,95 @@ class APITest &lt;  ActiveSupport::TestCase
     assert_equal 404, last_response.status
   end
+  should 'get amount of environment badges grouped by name' do
+    3.times { GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge') }
+    get "/api/v1/gamification_plugin/badges"
+    json = JSON.parse(last_response.body)
+    assert_equal 3, json['test_badge']
+  end
+
+  should 'get my points' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
+  end
+
+  should 'get my points filtered by type' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+    params[:type] = 'article_author'
+
+    get "/api/v1/gamification_plugin/my/points_by_type?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get my points filtered by profile' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+    params[:profile] = community.identifier
+
+    get "/api/v1/gamification_plugin/my/points_by_profile?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get my points excluding points earned in profiles' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    get "/api/v1/gamification_plugin/my/points_out_of_profiles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2*default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    get "/api/v1/gamification_plugin/people/#{person.id}/points?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
+  end
+
+  should 'get points of a person filtered by type' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+    params[:type] = 'article_author'
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_type?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person filtered by profile' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+    params[:profile] = community.identifier
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_profile?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person excluding points earned in profiles' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_out_of_profiles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2*default_point_weight(:article_author), json['points']
+  end
+
 end
@@ -189,4 +189,24 @@ class ArticleTest &lt; ActiveSupport::TestCase
     end
   end
+  should "add organization's merit badge to author when create 5 new articles" do
+    organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'article_author', :level => 1)
+    GamificationPlugin.gamification_set_rules(environment)
+
+    5.times { create(TextArticle, :profile_id => organization.id, :author => person) }
+    assert_equal 'article_author', person.badges.first.name
+    assert_equal 1, person.badges.first.level
+  end
+
+  should "do not earn organization's badge when the article is not posted in the organization itself" do
+    organization = fast_create(Organization)
+    other_organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'article_author', :level => 1)
+    GamificationPlugin.gamification_set_rules(environment)
+
+    5.times { create(TextArticle, :profile_id => other_organization.id, :author => person) }
+    assert_equal [], person.badges
+  end
+
 end
@@ -0,0 +1,48 @@
+require_relative "../test_helper"
+
+class BadgeRulesTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+  end
+
+  attr_accessor :environment
+
+  should "define badge rules for environment's badges" do
+    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    assert_equal [Merit::BadgeRules::AVAILABLE_RULES[badge.name].first[:action]], badge_rules.defined_rules.keys
+  end
+
+  should "define badge rules for organization's badges" do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    assert_equal [Merit::BadgeRules::AVAILABLE_RULES[badge.name].first[:action]], badge_rules.defined_rules.keys
+  end
+
+  should 'check organization returns true when badge belongs to the environment' do
+    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    comment = fast_create(Comment)
+    assert badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name].first)
+  end
+
+  should 'check organization returns true when the comment belongs to the organization' do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    article = fast_create(Article,:profile_id => organization.id)
+    comment = fast_create(Comment, :source_id => article.id)
+    assert badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name].first)
+  end
+
+  should 'check organization returns false when the comment does not belongs to the organization' do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    comment = fast_create(Comment)
+    assert !badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name].first)
+  end
+
+end
@@ -5,9 +5,10 @@ class BadgeTest &lt; ActiveSupport::TestCase
   def setup
     @person = create_user('testuser').person
     @environment = Environment.default
+    @organization = fast_create(Organization)
   end
-  attr_accessor :person, :environment
+  attr_accessor :person, :environment, :organization
   should 'add badge to person' do
     badge = GamificationPlugin::Badge.create!(:owner => environment)
@@ -37,4 +38,16 @@ class BadgeTest &lt; ActiveSupport::TestCase
     assert_equal [badge2], person.badges.notification_pending
   end
+  should 'add badge to person with organization as the badge owner' do
+    badge = GamificationPlugin::Badge.create(:owner => organization)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+  end
+
+  should 'add a manual badge to person' do
+    badge = GamificationPlugin::Badge.create!(:name => :manual, :owner => environment)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+  end
+
 end
@@ -276,5 +276,14 @@ class CommentTest &lt; ActiveSupport::TestCase
     end
   end
+  should "add organization's merit badge to author when create 5 new comments" do
+    organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'comment_author')
+    GamificationPlugin.gamification_set_rules(environment)
+    article.profile = organization
+
+    5.times { create(Comment, :source => article, :author_id => person.id) }
+    assert_equal 'comment_author', person.badges.first.name
+  end
 end
@@ -0,0 +1,34 @@
+require_relative "../test_helper"
+
+class DashboardHelperTest < ActiveSupport::TestCase
+
+  include GamificationPlugin::DashboardHelper
+
+  should 'return title for global badges' do
+    owner = Environment.new
+    assert_equal 'Badges', badges_title(owner)
+  end
+
+  should 'return title for organization badges' do
+    owner = Organization.new(:name => 'organization')
+    assert_equal 'Badges for organization', badges_title(owner)
+  end
+
+  should 'return badges grouped by owner' do
+    environment = Environment.default
+    expects(:environment).at_least_once.returns(environment)
+    badge1 = GamificationPlugin::Badge.create!(:owner => fast_create(Organization))
+    badge2 = GamificationPlugin::Badge.create!(:owner => environment)
+    assert_equal [[badge2.owner, [badge2]], [badge1.owner, [badge1]]], grouped_badges
+  end
+
+  should 'return category of a score point' do
+    point_type = GamificationPlugin::PointsType.create!(name: "point category", description: "point category")
+    score = Merit::Score.new
+    score.category = point_type.id.to_s
+    score.save!
+    point = score.score_points.create!
+    assert_equal "point category", score_point_category(point)
+  end
+
+end
-require_relative '../../../../test/test_helper'
+require_relative '../test_helper'
 class GamificationPluginTest < ActiveSupport::TestCase
@@ -0,0 +1,27 @@
+require_relative "../test_helper"
+
+class MeritExtTest < ActiveSupport::TestCase
+
+  should 'check if the point was originated by an undo action' do
+    point = Merit::Score::Point.new
+    point_type = GamificationPlugin::PointsType.new(name: :comment_author)
+    point.expects(:point_type).returns(point_type)
+    action = mock
+    action.expects(:target_model).returns('comment')
+    action.expects(:action_method).returns('destroy')
+    point.expects(:action).at_least_once.returns(action)
+    assert point.undo_rule?
+  end
+
+  should 'check if the point was originated by a do action' do
+    point = Merit::Score::Point.new
+    point_type = GamificationPlugin::PointsType.new(name: :comment_author)
+    point.expects(:point_type).returns(point_type)
+    action = mock
+    action.expects(:target_model).returns('comment')
+    action.expects(:action_method).returns('create')
+    point.expects(:action).at_least_once.returns(action)
+    assert !point.undo_rule?
+  end
+
+end
@@ -19,4 +19,21 @@ class PointRulesTest &lt; ActiveSupport::TestCase
     assert point_rules.defined_rules.present?
   end
+  should 'return target url for a point related to article creation' do
+    person = create_user('testuser').person
+    create_point_rule_definition('article_author')
+    article = create(TextArticle, :profile_id => person.id, :author => person)
+    url = Merit::PointRules.target_url(person.score_points.last)
+    assert_equal article.url, url
+  end
+
+  should 'return target url for a point related to comment creation' do
+    person = create_user('testuser').person
+    create_point_rule_definition('comment_author')
+    article = create(Article, :profile_id => person.id, :author => person)
+    comment = create(Comment, :source_id => article.id, :author => person)
+    url = Merit::PointRules.target_url(person.score_points.last)
+    assert_equal comment.url, url
+  end
+
 end
@@ -22,9 +22,9 @@
     <div class="scores">
       <h3><%= _('Latest Score Points') %></h3>
       <% @target.score_points.order('created_at desc').limit(5).each do |point| %>
-        <div class="score <%= point.score.category %> <%= score_point_class(point) %>">
+        <div class="score <%= point.point_type.name %> <%= score_point_class(point) %> <%= score_point_action_class(point) %>">
           <span class="value"><%= point.num_points %></span>
-          <span class="category"><%= _(score_point_category(point)) %></span>
+          <span class="category"><%= score_point_target_link point, _(score_point_category(point)) %></span>
           <span class="date timeago" title="<%= point.created_at %>"><%= point.created_at %></span>
         </div>
       <% end %>
@@ -34,24 +34,26 @@
   <% unless environment.gamification_plugin_badges.empty? %>
   <div class="badges">
-    <h3><%= _('Badges') %></h3>
-    <ul class="badge-list">
-      <% environment.gamification_plugin_badges.group(:name).count.each do |badge_name, amount| %>
-        <% person_badge = @target.badges.where(:name => badge_name).last %>
-        <% badge =  environment.gamification_plugin_badges.where(:name => badge_name).last %>
-        <li class="badge <%= badge.name %>">
-          <div class="badge" title="<%= badge.description %>">
-            <div class="image <%= badge.name %>"></div>
-            <ul class="level rating">
-              <% 1.upto(badge.level).map do |n|%>
-                <span class="star <%= (person_badge && person_badge.level >= n) ? 'earned' : 'not-earned' %>" >★</span>
-              <% end %>
-            </ul>
-            <div class="title"><%= badge.title %></div>
-          </div>
-        </li>
+      <% grouped_badges.each do |owner, badges| %>
+        <h3><%= badges_title owner %></h3>
+        <ul class="badge-list">
+          <% badges.group_by(&:name).each do |badge_name, badges_group| %>
+            <% badge = badges_group.sort_by(&:level).last %>
+            <% person_badge = @target.badges.where(:name => badge.name).last %>
+            <li class="badge <%= badge.name %>">
+              <div class="badge" title="<%= badge.description %>">
+                <div class="image <%= badge.name %>"></div>
+                <ul class="level rating">
+                  <% 1.upto(badge.level).map do |n|%>
+                    <span class="star <%= (person_badge && person_badge.level >= n) ? 'earned' : 'not-earned' %>" >★</span>
+                  <% end %>
+                </ul>
+                <div class="title"><%= badge.title %></div>
+              </div>
+            </li>
+          <% end %>
+        </ul>
       <% end %>
-    </ul>
   </div>
   <% end %>
 </div>
@@ -29,24 +29,31 @@
     <%= f.label :level %><br />
     <%= f.text_field :level %>
   </div>
-  <h4><%= _('Actions') %></h4>
-  <%= f.fields_for :custom_fields do |c| %>
-    <% rules.each do |name, settings| %>
-      <div class='controller-actions <%= "name_#{name}" %>'>
-        <% settings.each do |setting| %>
-          <%= c.label _(setting[:action]) %>
-          <%= c.fields_for setting[:action]  do |d| %>
-            <% action = (@gamification_plugin_badge.custom_fields || {}).fetch(setting[:action], {}) %>
-            <div class="field">
-              <%= d.label :threshold %><br />
-              <%= d.text_field :threshold, {value: action.fetch('threshold', "")} %>
-            </div>
-            <br>
+  <div class="field">
+    <%= f.label :profile_owner %><br />
+    <% tokenized_owner = @gamification_plugin_badge.owner.present? && @gamification_plugin_badge.owner.kind_of?(Organization) ? prepare_to_token_input([@gamification_plugin_badge.owner]) : nil %>
+    <%= token_input_field_tag('gamification_plugin_badge[owner_id]', 'badge-owner', {:action => 'search_owners'}, {:focus => false, :hint_text => _('Choose a profile or leave it blank for a global badge'), :token_limit => 1, :pre_populate => tokenized_owner}) %>
+  </div>
+  <div class="action-fields">
+    <h4><%= _('Actions') %></h4>
+    <%= f.fields_for :custom_fields do |c| %>
+      <% rules.each do |name, settings| %>
+        <div class='controller-actions <%= "name_#{name}" %>'>
+          <% settings.select {|s| s[:action].present?}.each do |setting| %>
+            <%= c.label _(setting[:action]) %>
+            <%= c.fields_for setting[:action]  do |d| %>
+              <% action = (@gamification_plugin_badge.custom_fields || {}).fetch(setting[:action], {}) %>
+              <div class="field">
+                <%= d.label :threshold %><br />
+                <%= d.text_field :threshold, {value: action.fetch('threshold', "")} %>
+              </div>
+              <br>
+            <% end %>
           <% end %>
-        <% end %>
-      </div>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
+<%= stylesheet_link_tag 'plugins/gamification/admin.css' %>
+
 <h1><%= _('Gamification Settings: Listing Badges') %></h1>
-<table>
+<table class="gamification-plugin-badges">
   <tr>
     <th>Name</th>
     <th>Title</th>
@@ -10,7 +12,11 @@
     <th></th>
   </tr>
-<% @gamification_plugin_badges.each do |gamification_plugin_badge| %>
+<% @gamification_plugin_badges.each do |owner, badges| %>
+  <% if owner.present? %>
+    <tr><td class="badge-owner-group" colspan="6"><%= _("Badges for:") %> <%= owner.name %></td></tr>
+  <% end %>
+  <% badges.each do |gamification_plugin_badge| %>
   <tr>
     <td><%= gamification_plugin_badge.name %></td>
     <td><%= gamification_plugin_badge.title %></td>
@@ -19,6 +25,7 @@
     <td><%= link_to 'Edit', :action => :edit, :id => gamification_plugin_badge.id %></td>
     <td><%= button_without_text :delete, _('Remove'), {:action => :destroy, :id => gamification_plugin_badge.id}, :method => :post, :confirm => _('Are you sure?') %></td>
   </tr>
+  <% end %>
 <% end %>
 </table>
@@ -22,6 +22,13 @@
   <%= @gamification_plugin_badge.level %>
 </p>
+<% if @gamification_plugin_badge.owner.kind_of?(Organization) %>
+<p>
+  <b><%= _('Profile owner:') %></b>
+  <%= @gamification_plugin_badge.owner.name %>
+  </p>
+<% end %>
+
 <p>
   <b>Threshold:</b>
   <% if @gamification_plugin_badge.custom_fields.is_a? Hash %>
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+require_dependency 'organization'
	2	+
	3	+class Organization
	4	+
	5	+ has_many :gamification_plugin_organization_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
	6	+
	7	+end
	@@ -57,7 +57,7 @@ class GamificationPlugin::API < Grape::API		@@ -57,7 +57,7 @@ class GamificationPlugin::API < Grape::API
57	get ':id/points_by_profile' do	57	get ':id/points_by_profile' do
58	person = environment.people.visible_for_person(current_person).find_by_id(params[:id])	58	person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
59	return not_found! if person.blank?	59	return not_found! if person.blank?
60	- {points: person.points_by_type(params[:profile]) }	60	+ {points: person.points_by_profile(params[:profile]) }
61	end	61	end
62		62
63	get ':id/points_out_of_profiles' do	63	get ':id/points_out_of_profiles' do
	@@ -12,10 +12,19 @@ module GamificationPlugin::DashboardHelper		@@ -12,10 +12,19 @@ module GamificationPlugin::DashboardHelper
12	end	12	end
13		13
14	def score_point_category(point)	14	def score_point_category(point)
15	- point = GamificationPlugin::PointsType.where(name: point.score.category).first	15	+ point = GamificationPlugin::PointsType.where(id: point.score.category).first
16	point.nil? ? '' : point.description	16	point.nil? ? '' : point.description
17	end	17	end
18		18
		19	+ def score_point_target_link(point, text)
		20	+ url = Merit::PointRules.target_url(point)
		21	+ url.present? ? link_to(text, url) : text
		22	+ end
		23	+
		24	+ def score_point_action_class(point)
		25	+ point.undo_rule? ? 'undo_action':'do_action'
		26	+ end
		27	+
19	def ranking(target, from_date=nil, limit=10)	28	def ranking(target, from_date=nil, limit=10)
20	# FIXME move these queries to profile model	29	# FIXME move these queries to profile model
21	ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).order('sum(num_points) DESC').group('profiles.id')	30	ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).order('sum(num_points) DESC').group('profiles.id')
	@@ -35,4 +44,15 @@ module GamificationPlugin::DashboardHelper		@@ -35,4 +44,15 @@ module GamificationPlugin::DashboardHelper
35	(context_ranking.blank? ? '' : render(:partial => 'gamification/ranking', :locals => {:ranking => context_ranking, :target_ranking => target_ranking, :ranking_class => 'context'}))	44	(context_ranking.blank? ? '' : render(:partial => 'gamification/ranking', :locals => {:ranking => context_ranking, :target_ranking => target_ranking, :ranking_class => 'context'}))
36	end	45	end
37		46
		47	+ def badges_title(owner)
		48	+ return _('Badges for %s' % owner.name) if owner.kind_of?(Organization)
		49	+ _('Badges')
		50	+ end
		51	+
		52	+ def grouped_badges
		53	+ environment.gamification_plugin_badges.all.group_by(&:owner).sort do \|a, b\|
		54	+ a.first.kind_of?(Environment) ? -1 : a.first.name <=> b.first.name
		55	+ end
		56	+ end
		57	+
38	end	58	end
	@@ -17,6 +17,15 @@ module Merit		@@ -17,6 +17,15 @@ module Merit
17	class Score	17	class Score
18	class Point	18	class Point
19	belongs_to :action	19	belongs_to :action
		20	+
		21	+ def point_type
		22	+ @point_type \|\|= GamificationPlugin::PointsType.where(id: score.category).first
		23	+ end
		24	+
		25	+ def undo_rule?
		26	+ rule = Merit::PointRules::AVAILABLE_RULES[point_type.name.to_sym]
		27	+ rule[:undo_action] == "#{action.target_model}##{action.action_method}"
		28	+ end
20	end	29	end
21	end	30	end
22		31
1	-class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord	1	+class GamificationPlugin::PointsCategorization < ActiveRecord::Base
2	belongs_to :profile	2	belongs_to :profile
3	belongs_to :point_type, class_name: 'GamificationPlugin::PointsType', foreign_key: :point_type_id	3	belongs_to :point_type, class_name: 'GamificationPlugin::PointsType', foreign_key: :point_type_id
4	attr_accessible :profile_id, :profile, :point_type_id, :weight	4	attr_accessible :profile_id, :profile, :point_type_id, :weight
	@@ -10,5 +10,5 @@ class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord		@@ -10,5 +10,5 @@ class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord
10	scope :for_type, lambda { \|p_type\| joins(:point_type).where(gamification_plugin_points_types: {name: p_type}) }	10	scope :for_type, lambda { \|p_type\| joins(:point_type).where(gamification_plugin_points_types: {name: p_type}) }
11	scope :for_profile, lambda { \|p_profile\| joins(:profile).where(profiles: {identifier: p_profile}) }	11	scope :for_profile, lambda { \|p_profile\| joins(:profile).where(profiles: {identifier: p_profile}) }
12		12
13	- scope :grouped_profiles, select(:profile_id).group(:profile_id).includes(:profile)	13	+ scope :grouped_profiles, -> { select(:profile_id).group(:profile_id).includes(:profile) }
14	end	14	end
1	-class GamificationPlugin::PointsType < Noosfero::Plugin::ActiveRecord	1	+class GamificationPlugin::PointsType < ActiveRecord::Base
2	attr_accessible :description, :name	2	attr_accessible :description, :name
3		3
4	validates :name, presence: true, uniqueness: true	4	validates :name, presence: true, uniqueness: true
1	.gamification-plugin-rank-rules .template-level {	1	.gamification-plugin-rank-rules .template-level {
2	display: none !important;	2	display: none !important;
3	}	3	}
		4	+
		5	+.gamification-plugin-badges .badge-owner-group {
		6	+ text-align: right;
		7	+ color: gray;
		8	+ font-weight: bold;
		9	+}
	@@ -237,3 +237,7 @@		@@ -237,3 +237,7 @@
237	float: left;	237	float: left;
238	width: 180px;	238	width: 180px;
239	}	239	}
		240	+
		241	+.gamification-dashboard .points .score.undo_action .category {
		242	+ text-decoration: line-through;
		243	+}
	@@ -25,6 +25,14 @@ class GamificationPluginBadgesControllerTest < ActionController::TestCase		@@ -25,6 +25,14 @@ class GamificationPluginBadgesControllerTest < ActionController::TestCase
25	end	25	end
26	end	26	end
27		27
		28	+ should "should create gamification_plugin_badge with organization as owner" do
		29	+ organization = fast_create(Organization)
		30	+ assert_difference('GamificationPlugin::Badge.count') do
		31	+ post :create, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
		32	+ assert_equal organization, GamificationPlugin::Badge.last.owner
		33	+ end
		34	+ end
		35	+
28	should "should show gamification_plugin_badge" do	36	should "should show gamification_plugin_badge" do
29	get :show, id: @gamification_plugin_badge	37	get :show, id: @gamification_plugin_badge
30	assert_response :success	38	assert_response :success
	@@ -40,6 +48,23 @@ class GamificationPluginBadgesControllerTest < ActionController::TestCase		@@ -40,6 +48,23 @@ class GamificationPluginBadgesControllerTest < ActionController::TestCase
40	assert assigns(:gamification_plugin_badge)	48	assert assigns(:gamification_plugin_badge)
41	end	49	end
42		50
		51	+ should "should change badge owner" do
		52	+ organization = fast_create(Organization)
		53	+ put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
		54	+ assert assigns(:gamification_plugin_badge)
		55	+ assert_equal organization, @gamification_plugin_badge.reload.owner
		56	+ end
		57	+
		58	+ should "should keep badge owner when update" do
		59	+ organization = fast_create(Organization)
		60	+ @gamification_plugin_badge.owner = organization
		61	+ @gamification_plugin_badge.save!
		62	+
		63	+ put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
		64	+ assert assigns(:gamification_plugin_badge)
		65	+ assert_equal organization, @gamification_plugin_badge.reload.owner
		66	+ end
		67	+
43	should "should destroy gamification_plugin_badge" do	68	should "should destroy gamification_plugin_badge" do
44	assert_difference('GamificationPlugin::Badge.count', -1) do	69	assert_difference('GamificationPlugin::Badge.count', -1) do
45	delete :destroy, id: @gamification_plugin_badge	70	delete :destroy, id: @gamification_plugin_badge
	@@ -8,6 +8,7 @@ class APITest < ActiveSupport::TestCase		@@ -8,6 +8,7 @@ class APITest < ActiveSupport::TestCase
8	environment = Environment.default	8	environment = Environment.default
9	environment.enable_plugin(GamificationPlugin)	9	environment.enable_plugin(GamificationPlugin)
10	GamificationPlugin.gamification_set_rules(@environment)	10	GamificationPlugin.gamification_set_rules(@environment)
		11	+ create_all_point_rules
11	end	12	end
12		13
13	should 'get my own badges' do	14	should 'get my own badges' do
	@@ -27,14 +28,6 @@ class APITest < ActiveSupport::TestCase		@@ -27,14 +28,6 @@ class APITest < ActiveSupport::TestCase
27	assert_not_nil json['percent']	28	assert_not_nil json['percent']
28	end	29	end
29		30
30	- should 'get my total pontuation' do
31	- badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
32	- person.add_badge(badge.id)
33	- get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
34	- json = JSON.parse(last_response.body)
35	- assert_not_nil json['points']
36	- end
37	-
38	should 'get badges of the public person' do	31	should 'get badges of the public person' do
39	badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')	32	badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
40	another_person = create(User, :environment => environment).person	33	another_person = create(User, :environment => environment).person
	@@ -76,4 +69,95 @@ class APITest < ActiveSupport::TestCase		@@ -76,4 +69,95 @@ class APITest < ActiveSupport::TestCase
76	assert_equal 404, last_response.status	69	assert_equal 404, last_response.status
77	end	70	end
78		71
		72	+ should 'get amount of environment badges grouped by name' do
		73	+ 3.times { GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge') }
		74	+ get "/api/v1/gamification_plugin/badges"
		75	+ json = JSON.parse(last_response.body)
		76	+ assert_equal 3, json['test_badge']
		77	+ end
		78	+
		79	+ should 'get my points' do
		80	+ article = create(TextArticle, :profile_id => @person.id, :author => @person)
		81	+ create(Comment, :source_id => article.id, :author => fast_create(Person))
		82	+
		83	+ get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
		84	+ json = JSON.parse(last_response.body)
		85	+ assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
		86	+ end
		87	+
		88	+ should 'get my points filtered by type' do
		89	+ article = create(TextArticle, :profile_id => @person.id, :author => @person)
		90	+ create(Comment, :source_id => article.id, :author => fast_create(Person))
		91	+ params[:type] = 'article_author'
		92	+
		93	+ get "/api/v1/gamification_plugin/my/points_by_type?#{params.to_query}"
		94	+ json = JSON.parse(last_response.body)
		95	+ assert_equal default_point_weight(:article_author), json['points']
		96	+ end
		97	+
		98	+ should 'get my points filtered by profile' do
		99	+ community = fast_create(Community)
		100	+ create_point_rule_definition('article_author', community)
		101	+ create(TextArticle, :profile_id => @person.id, :author => @person)
		102	+ create(TextArticle, :profile_id => community.id, :author => @person)
		103	+ params[:profile] = community.identifier
		104	+
		105	+ get "/api/v1/gamification_plugin/my/points_by_profile?#{params.to_query}"
		106	+ json = JSON.parse(last_response.body)
		107	+ assert_equal default_point_weight(:article_author), json['points']
		108	+ end
		109	+
		110	+ should 'get my points excluding points earned in profiles' do
		111	+ community = fast_create(Community)
		112	+ create_point_rule_definition('article_author', community)
		113	+ create(TextArticle, :profile_id => @person.id, :author => @person)
		114	+ create(TextArticle, :profile_id => community.id, :author => @person)
		115	+
		116	+ get "/api/v1/gamification_plugin/my/points_out_of_profiles?#{params.to_query}"
		117	+ json = JSON.parse(last_response.body)
		118	+ assert_equal 2*default_point_weight(:article_author), json['points']
		119	+ end
		120	+
		121	+ should 'get points of a person' do
		122	+ article = create(TextArticle, :profile_id => @person.id, :author => @person)
		123	+ create(Comment, :source_id => article.id, :author => fast_create(Person))
		124	+
		125	+ get "/api/v1/gamification_plugin/people/#{person.id}/points?#{params.to_query}"
		126	+ json = JSON.parse(last_response.body)
		127	+ assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
		128	+ end
		129	+
		130	+ should 'get points of a person filtered by type' do
		131	+ article = create(TextArticle, :profile_id => @person.id, :author => @person)
		132	+ create(Comment, :source_id => article.id, :author => fast_create(Person))
		133	+ params[:type] = 'article_author'
		134	+
		135	+ get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_type?#{params.to_query}"
		136	+ json = JSON.parse(last_response.body)
		137	+ assert_equal default_point_weight(:article_author), json['points']
		138	+ end
		139	+
		140	+ should 'get points of a person filtered by profile' do
		141	+ community = fast_create(Community)
		142	+ create_point_rule_definition('article_author', community)
		143	+ create(TextArticle, :profile_id => @person.id, :author => @person)
		144	+ create(TextArticle, :profile_id => community.id, :author => @person)
		145	+ params[:profile] = community.identifier
		146	+
		147	+ get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_profile?#{params.to_query}"
		148	+ json = JSON.parse(last_response.body)
		149	+ assert_equal default_point_weight(:article_author), json['points']
		150	+ end
		151	+
		152	+ should 'get points of a person excluding points earned in profiles' do
		153	+ community = fast_create(Community)
		154	+ create_point_rule_definition('article_author', community)
		155	+ create(TextArticle, :profile_id => @person.id, :author => @person)
		156	+ create(TextArticle, :profile_id => community.id, :author => @person)
		157	+
		158	+ get "/api/v1/gamification_plugin/people/#{@person.id}/points_out_of_profiles?#{params.to_query}"
		159	+ json = JSON.parse(last_response.body)
		160	+ assert_equal 2*default_point_weight(:article_author), json['points']
		161	+ end
		162	+
79	end	163	end