Merge branch 'standalone_develop' into pre_trustie_server

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

@@ -0,0 +1,31 @@
+class Api::V1::Projects::OssHealthMeasuringController < Api::V1::BaseController
+  
+  def index 
+
+    url = URI("#{EduSetting.get("ohm_server_url")}/api/OSS_Health_Measuring/#{params[:owner]}/#{params[:repo]}")
+
+    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 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]}")
+
+    http = Net::HTTP.new(url.host, url.port);
+    request = Net::HTTP::Get.new(url)
+    response = http.request(request)
+    render :json=> response.read_body
+  end
+
+end

app/controllers/api/v1/users/projects_controller.rb

@@ -8,6 +8,6 @@ class Api::V1::Users::ProjectsController < Api::V1::BaseController
 
   private 
   def query_params
-    params.permit(:category, :is_public, :project_type, :sort_by, :sort_direction, :search)
+    params.permit(:category, :is_public, :project_type, :sort_by, :sort_direction, :search, :start_at, :end_at)
   end
 end

app/controllers/projects_controller.rb

@@ -287,13 +287,19 @@ class ProjectsController < ApplicationController
   end
 
   def watch_users
+    start_at = params[:start_at]
+    end_at = params[:end_at]
     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.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     @watchers_count = watchers.size
     @watchers = paginate(watchers)
   end
 
   def praise_users
+    start_at = params[:start_at]
+    end_at = params[:end_at]
     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.to_i), Time.at(end_at.to_i)) 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]
+    end_at = params[:end_at]
     scope = @target.watchers.includes(:user)
+    scope = scope.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     @watchers = paginate(scope)
   end
 

app/helpers/projects_helper.rb

@@ -154,6 +154,9 @@ module ProjectsHelper
     when 'kernel'              then "#{url}/v1/openeuler/entropy"
     when 'opengauss-server'    then "#{url}/v1/opengauss/entropy"
     when 'mindspore'          then "#{url}/v1/mindspore/entropy"
+    when 'openharmony'          then "#{url}/api/openharmony/entropy"
+    when 'openeuler'          then "#{url}/api/openeuler/entropy"
+    when 'xiuos'          then "#{url}/api/xiuos/entropy"
     else ''
     end
   end

app/services/api/v1/users/projects/list_service.rb

@@ -1,7 +1,7 @@
 class Api::V1::Users::Projects::ListService < ApplicationService
   include ActiveModel::Model
 
-  attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :current_user
+  attr_reader :observe_user, :category, :is_public, :project_type, :sort_by, :sort_direction, :search, :start_at, :end_at, :current_user
   attr_accessor :queried_projects
 
   validates :category, inclusion: {in: %w(all join created manage watched forked), message: "请输入正确的Category"}
@@ -18,6 +18,8 @@ class Api::V1::Users::Projects::ListService < ApplicationService
     @sort_by = params[:sort_by] || 'updated_on'
     @sort_direction = params[:sort_direction] || 'desc'
     @search = params[:search]
+    @start_at = params[:start_at]
+    @end_at = params[:end_at]
     @current_user = current_user
   end
 
@@ -53,10 +55,16 @@ class Api::V1::Users::Projects::ListService < ApplicationService
       projects = Project.from("( #{normal_projects} UNION #{org_projects} ) AS projects").distinct 
     when 'watched'
       projects = projects.where.not(user_id: observe_user.id).joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id})
+      projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     when 'only_watched'
       projects = projects.where.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observe_user.id})
+      projects = projects.joins(:watchers).where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)) if start_at.present? && end_at.present?
     when 'forked'
-      fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)
+      if start_at.present? && end_at.present?
+        fork_ids = observe_user.fork_users.where("created_at > ? and created_at < ?", Time.at(start_at.to_i), Time.at(end_at.to_i)).select(:id, :fork_project_id).pluck(:fork_project_id)
+      else
+        fork_ids = observe_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)
+      end
       projects = projects.where(id: fork_ids)
     else
       normal_projects = projects.members_projects(observe_user.id).to_sql

app/views/api/v1/projects/pulls/_simple_detail.json.jbuilder

@@ -23,4 +23,5 @@ json.issue do
 end
 
 json.reviewers pull.reviewers.pluck(:login)
-json.journals_count pull.journals.count
+json.journals_count pull.journals.count
+json.pr_created_unix pull.created_at.to_i

app/views/pull_requests/index.json.jbuilder

@@ -33,6 +33,7 @@ json.issues do
     json.name issue.subject
     json.pr_time time_from_now(pr.status == 1 ? pr.updated_at : issue.updated_on)
     json.pr_full_time pr.status == 1 ? pr.updated_at : issue.updated_on
+    json.pr_created_unix pr.created_at.to_i
     json.assign_user_name issue.get_assign_user.try(:show_real_name)
     json.assign_user_login issue.get_assign_user.try(:login)
     json.author_name issue.user.blank?? "已注销": issue.user.show_real_name