From c5505dc4a2b6b2cc6d0458a98b7a16c4d662f796 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 4 Nov 2024 17:16:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E5=81=A5=E5=BA=B7=E5=BA=A6=E6=8E=A5=E5=8F=A3keyid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/projects/oss_health_measuring_controller.rb | 9 +++++++++ config/routes/api.rb | 1 + 2 files changed, 10 insertions(+) diff --git a/app/controllers/api/v1/projects/oss_health_measuring_controller.rb b/app/controllers/api/v1/projects/oss_health_measuring_controller.rb index 370a4c824..5cc95907f 100644 --- a/app/controllers/api/v1/projects/oss_health_measuring_controller.rb +++ b/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]}") diff --git a/config/routes/api.rb b/config/routes/api.rb index 6669adac2..7f0a68ed6 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -134,6 +134,7 @@ defaults format: :json do resources :oss_health_measuring, only: [:index] do collection do get :can_get + get :keyid end end resources :portrait, only: [:index] From 7d6d95c7eb343c077ff341ede76f783010580a97 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:01:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8\=E7=82=B9=E8=B5=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +++ app/controllers/watchers_controller.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4724224e8..0ece8f227 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -293,7 +293,10 @@ class ProjectsController < ApplicationController 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), Time.at(end_at)) if start_at.present? && end_at.present? @praises_count = praises.size @praises = paginate(praises) end diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index aa3642616..81ba7ceda 100644 --- a/app/controllers/watchers_controller.rb +++ b/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), Time.at(end_at)) if start_at.present? && end_at.present? @watchers = paginate(scope) end From 1756c73a3fbb155f55611405649713d807f03695 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:10:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0ece8f227..7cf068cd5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,7 +287,10 @@ 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), Time.at(end_at)) if start_at.present? && end_at.present? @watchers_count = watchers.size @watchers = paginate(watchers) end From 4a12ab2d90465449fbbb992a1e6d552eff1fd10a Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 11:11:06 +0800 Subject: [PATCH 4/5] fix: string to number --- app/controllers/projects_controller.rb | 8 ++++---- app/controllers/watchers_controller.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7cf068cd5..cfd032e5e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -287,8 +287,8 @@ class ProjectsController < ApplicationController end def watch_users - start_at = params[:start_at] - end_at = params[:end_at] + 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 @@ -296,8 +296,8 @@ class ProjectsController < ApplicationController end def praise_users - start_at = params[:start_at] - end_at = params[:end_at] + 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 diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 81ba7ceda..e6d0053a2 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -5,8 +5,8 @@ class WatchersController < ApplicationController before_action :get_target def index - start_at = params[:start_at] - end_at = params[:end_at] + 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) From dd4b21115f2d96b37efa310a7854ab6525d30b45 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 6 Nov 2024 15:53:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8F=A6=E5=A4=96=E4=B8=80=E4=B8=AA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../import_issues_from_another_forge.rake | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 lib/tasks/import_issues_from_another_forge.rake diff --git a/lib/tasks/import_issues_from_another_forge.rake b/lib/tasks/import_issues_from_another_forge.rake new file mode 100644 index 000000000..7bd9c4e90 --- /dev/null +++ b/lib/tasks/import_issues_from_another_forge.rake @@ -0,0 +1,138 @@ + +desc "导入导出issue、version、journal数据" +namespace :import_from_another_forge do + desc "导出数据" + # 执行示例 bundle exec rake "import_from_another_forge:export[110]" + # RAILS_ENV=production bundle exec rake "import_from_another_forge:export[110]" + task :export, [:project_id] => :environment do |t, args| + project_id = args.project_id + project = Project.find_by_id project_id + Axlsx::Package.new do |p| + p.workbook.add_worksheet(:name => 'version') do |sheet| + sheet.add_row ['id', 'name', 'description', 'effective_date', 'created_on', 'updated_on', 'status', 'creator','issues_count', 'closed_issues_count', 'percent'] + project.versions.each do |version| + sheet.add_row [version.id, version.name, version.description, version.effective_date, version.created_on.strftime("%Y-%m-%d %H:%M:%S"), version.updated_on.strftime("%Y-%m-%d %H:%M:%S"), version.status, version.user.try(:login), version.issues_count, version.closed_issues_count, version.percent] + end + end + p.workbook.add_worksheet(:name => 'issue') do |sheet| + sheet.add_row ['id', 'project_issues_index', 'subject', 'description', 'creator', 'created_on', 'changer', 'updated_on', 'status_id', 'assigners', 'priority_id', 'issue_tags', 'version_id'] + project.issues.issue_issue.each do |issue| + sheet.add_row [issue.id, issue.project_issues_index, issue.subject, issue.description, issue.user.try(:login), issue.created_on.strftime("%Y-%m-%d %H:%M:%S"), issue.changer.try(:login), issue.updated_on.strftime("%Y-%m-%d %H:%M:%S"), issue.status_id, issue.assigners.pluck(:login).join(","),issue.priority_id, issue.issue_tags.pluck(:name, :color).join(","), issue.fixed_version_id] + end + end + issue_ids = project.issues.issue_issue + p.workbook.add_worksheet(:name => 'journal') do |sheet| + sheet.add_row ['id', 'journalized_type', 'journalized_id', 'creator', 'notes', 'created_on', 'parent_id', 'comments_count', 'reply_id', 'updated_on', 'operate_by'] + Journal.where(journalized_type: 'Issue', journalized_id: issue_ids).where.not(notes: nil).each do |journal| + sheet.add_row [journal.id, journal.journalized_type, journal.journalized_id, journal.user.try(:login), journal.notes, journal.created_on.strftime("%Y-%m-%d %H:%M:%S"), journal.parent_id, journal.comments_count, journal.reply_id, journal.updated_on.strftime("%Y-%m-%d %H:%M:%S"), journal.operate_by] + end + end + p.serialize('public/version_issue_journal_data.xlsx') + end + end + + def find_or_create_by(login) + return nil unless login.present? + user = User.find_by(login: login) + return user if user.present? + + user = User.new(admin: false, login: login, mail: "#{login}@forge.com", nickname: login, platform: 'forge' , type: "User") + user.password = "12345678" + user.activate + interactor = Gitea::RegisterInteractor.call({username: login, email: "#{login}@forge.com", password: "12345678"}) + gitea_user = interactor.result + result = Gitea::User::GenerateTokenService.call(username, password) + user.gitea_token = result['sha1'] + user.gitea_uid = gitea_user[:body]['id'] + UserExtension.create!(user_id: user.id) if user.save! + + return user + rescue + return nil + end + + # 执行示例 bundle exec rake "import_from_another_forge:import[filepath, 365, ceshi_org]" + # RAILS_ENV=production bundle exec rake "import_from_another_forge:import[public/version_issue_journal_data.xlsx, 110]" + task :import, [:attachment_uuid, :project_id] => :environment do |t, args| + attachment_uuid = args.attachment_uuid + project_id = args.project_id + a =Attachment.find_by(uuid: attachment_uuid) + project = Project.find_by_id project_id + version_hash = {} + issue_hash = {} + journal_hash = {} + ActiveRecord::Base.transaction do + doc = SimpleXlsxReader.open("#{Rails.root}/tmp/files/#{a.relative_path_filename}") + doc.sheets.each do |sheet| + case sheet.name + when 'version' + sheet.rows.each.with_index do |row, index| + next if index == 0 + version = Version.new(project_id: project_id) + version.name = row[1] + version.description = row[2] + version.effective_date = row[3] + version.created_on = row[4] + version.updated_on = row[5] + version.status = row[6] + version.user = find_or_create_by(row[7]) + version.issues_count = row[8].to_i + version.closed_issues_count = row[9].to_i + version.percent = row[10].to_f + version.save! + version_hash["#{row[0]}"] = version.id + end + when 'issue' + sheet.rows.each.with_index do |row, index| + next if index == 0 + issue = Issue.new(issue_classify: "issue", project_id: project_id, tracker_id: Tracker.first.id) + issue.project_issues_index = row[1] + issue.subject = row[2] + issue.description = row[3] + issue.user = find_or_create_by(row[4]) + issue.created_on = row[5] + issue.changer = find_or_create_by(row[6]) + issue.updated_on = row[7] + issue.status_id = row[8] + if row[9].present? + row[9].split(',').each do |a| + u = find_or_create_by(a) + next unless u.present? + issue.assigners << u + end + end + issue.priority_id = row[10] + issue.issue_tags + if row[11].present? + row[11].split(',').each_slice(2).to_a.each do |t| + tag = IssueTag.find_by(project_id: project_id, name: t[0]) + if tag.present? + issue.issue_tags << tag + else + tag = IssueTag.create(project_id: project_id, name: t[0], color: t[1]) + issue.issue_tags << tag + end + end + end + issue.fixed_version_id = row[12] + issue.save! + issue_hash["#{row[0]}"] = issue.id + when 'journal' + sheet.rows.each.with_index do |row, index| + next if index == 0 + next if row[6].present? || row[8].present? + journal = Journal.new + journal.journalized_type = row[1] + journal.journalized_id = row[2] + journal.user = find_or_create_by(row[3]) + journal.notes = row[4] + journal.created_on = row[5] + journal.updated_on = row[9] + journal.save! + journal_hash["#{row[0]}"] = journal.id + end + end + end + end + +end \ No newline at end of file