Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/controllers/api/v1/projects/oss_health_measuring_controller.rb

@@ -10,6 +10,15 @@ class Api::V1::Projects::OssHealthMeasuringController < Api::V1::BaseController
     render :json=> response.read_body
   end
 
+  def keyid
+    url = URI("#{EduSetting.get("ohm_server_url")}/api/OSS_Health_Measuring/#{params[:owner]}/#{params[:repo]}/#{params[:key_id]}")
+
+    http = Net::HTTP.new(url.host, url.port);
+    request = Net::HTTP::Get.new(url)
+    response = http.request(request)
+    render :json=> response.read_body
+  end
+
   def can_get
     url = URI("#{EduSetting.get("ohm_server_url")}/api/OHM_can_get/#{params[:owner]}/#{params[:repo]}")
 

app/controllers/projects_controller.rb

@@ -287,13 +287,19 @@ class ProjectsController < ApplicationController
   end
 
   def watch_users
+    start_at = params[:start_at].to_i
+    end_at = params[:end_at].to_i
     watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct
+    watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
     @watchers_count = watchers.size
     @watchers = paginate(watchers)
   end
 
   def praise_users
+    start_at = params[:start_at].to_i
+    end_at = params[:end_at].to_i
     praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct
+    praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
     @praises_count = praises.size
     @praises = paginate(praises)
   end

app/controllers/watchers_controller.rb

@@ -5,7 +5,10 @@ class WatchersController < ApplicationController
   before_action :get_target
 
   def index
+    start_at = params[:start_at].to_i
+    end_at = params[:end_at].to_i
     scope = @target.watchers.includes(:user)
+    scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present?
     @watchers = paginate(scope)
   end