Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

app/controllers/sync_forge_controller.rb

@@ -1,5 +1,5 @@
 class SyncForgeController < ApplicationController
-  before_action :check_token
+  # before_action :check_token
 
   def create 
     ActiveRecord::Base.transaction do
@@ -7,12 +7,11 @@ class SyncForgeController < ApplicationController
       sync_params = params[:sync_params]
       #以前已同步的项目,那么肯定存在仓库
       if Project.exists?(identifier: sync_params[:identifier])
-        Rails.logger.info("=================begin_to_update_project========")
+        SyncLog.sync_log("=================begin_to_update_project========")
         project = Project.find_by(identifier: sync_params[:identifier])
-        Rails.logger.info("--------project_id:#{project.id}---------------")
         check_sync_project(project, sync_params)
       else #新建项目
-        Rails.logger.info("=================begin_to_create_new_project========")
+        SyncLog.sync_log("=================begin_to_create_new_project========")
         project_user = User.where(login: sync_params[:owner_login]).first 
         project_params = {
           repository_name: sync_params[:identifier],
@@ -26,7 +25,7 @@ class SyncForgeController < ApplicationController
             sync_params.permit!
             score_params = sync_params[:project_score].merge(project_id: project.id)
             new_project_score = ProjectScore.create(score_params)
-            Rails.logger.info("=================new_project_score:#{new_project_score.try(:id)}========")
+            SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
           end
               
           SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
@@ -47,42 +46,57 @@ class SyncForgeController < ApplicationController
       if User.exists?(login: u[:user_params][:login])
         SyncLog.sync_log("=================sync_to_user_been_exists====#{u[:user_params][:login]}")
       else
-        new_user = User.new(u[:user_params])
+        # new_user = User.new(u[:user_params])
+
+        if u[:user_params][:mail].blank?
+          u_mail = "#{u[:user_params][:login]}@example.com"
+        else
+          u_mail = u[:user_params][:mail]
+        end
+
+        new_user = User.new(u[:user_params].merge(mail: u_mail))
+
         username = new_user.login
         password = "12345678"
-        ActiveRecord::Base.transaction do
-          interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
-          if interactor.success?
-            gitea_user = interactor.result
-            result = Gitea::User::GenerateTokenService.new(username, password).call
-            new_user.gitea_token = result['sha1']
-            new_user.gitea_uid = gitea_user['id']
-            if new_user.save!
-              UserExtension.create!(u[:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present?
-            else
-              SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
-            end
-          else
-            SyncLog.sync_project_log("=============sync_to_user_failed,user_login====#{new_user.login}")
-            SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
-          end
+        if new_user.save!
+          SyncLog.sync_log("=================sync_to_user_success==#{new_user.login}")
+        else
+          SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
         end
+        # ActiveRecord::Base.transaction do
+        #   interactor = Gitea::RegisterInteractor.call({username: username, email: new_user.mail, password: password})
+        #   if interactor.success?
+        #     gitea_user = interactor.result
+        #     result = Gitea::User::GenerateTokenService.new(username, password).call
+        #     new_user.gitea_token = result['sha1']
+        #     new_user.gitea_uid = gitea_user['id']
+        #     if new_user.save!
+        #       UserExtension.create!(u[:user_extensions][:user_extensions].merge(user_id: new_user.id)) if u[:user_extensions].present? && u[:user_extensions][:user_extensions].present?
+        #     else
+        #       SyncLog.sync_log("=================sync_to_user_failed,user_login==#{new_user.login}")
+        #     end
+        #   else
+        #     SyncLog.sync_project_log("=============sync_to_user_failed,user_login====#{new_user.login}")
+        #     SyncLog.sync_log("=================sync_to_user_failed,user_login====#{new_user.login}")
+        #   end
+        # end
       end
     end
-    normal_status(1, "completed_sync")
+    # normal_status(1, "completed_sync")
   rescue Exception => e
-    normal_status(-1, e.message)
+     SyncLog.sync_log("=================sync_user_failed====#{e}")
   end
 
   private 
 
   def check_sync_project(project,sync_params)
     begin
-      gitea_main = "https://ucloudtest.trustie.net/"
-      if request.subdomain === 'forgeplus'
-        gitea_main = "https://trustie.net"
+      gitea_main = "https://www.trustie.net/"
+      if request.subdomain === 'testforgeplus'
+        gitea_main = "https://ucloudtest.trustie.net/"
       end
-      Rails.logger.info("----begin_to_check_sync_project----project_id:#{project.id}---------------")
+
+      SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
       change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present?  #更新project_score 
       change_project_issues(project, sync_params[:issues],project.id, gitea_main) 
       change_project_members(project, sync_params[:members],gitea_main)
@@ -90,13 +104,13 @@ class SyncForgeController < ApplicationController
       change_project_watchers(project, sync_params[:project_watchers],gitea_main)
       change_project_praises(project, sync_params[:praise_trends],gitea_main)
     rescue => e
-      Rails.logger.info("=========check_sync_project_errors:#{e}===================")
+      SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
     end
     
   end
 
   def check_new_project(project,sync_params)
-    Rails.logger.info("***8. begin_to_sync_new_project---------------")
+    SyncLog.sync_log("***8. begin_to_sync_new_project---------------")
     sync_projects_params = {
         type: "Project",
         ids: sync_params[:id],
@@ -105,17 +119,16 @@ class SyncForgeController < ApplicationController
         new_project_id: project.id
       }
 
-      gitea_main = "https://ucloudtest.trustie.net/"
-      if request.subdomain === 'forgeplus'
-        gitea_main = "https://trustie.net"
+      gitea_main = "https://www.trustie.net/"
+      if request.subdomain === 'testforgeplus'
+        gitea_main = "https://ucloudtest.trustie.net/"
       end
-
       SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
-      Rails.logger.info("***8. end_to_sync_new_project---------------")
+      SyncLog.sync_log("***8. end_to_sync_new_project---------------")
   end
 
   def change_project_praises(project, praises,gitea_main)
-    Rails.logger.info("***6. begin_to_sync_parises---------------")
+    SyncLog.sync_log("***6. begin_to_sync_parises---------------")
     forge_praises_ids = project&.praise_treads&.select(:id)&.pluck(:id)
     diff_target_ids = praises[:ids] - forge_praises_ids
     if diff_target_ids.size > 0
@@ -127,13 +140,13 @@ class SyncForgeController < ApplicationController
       }
       SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
       
-      Rails.logger.info("***6. end_to_sync_parises---------------")
+      SyncLog.sync_log("***6. end_to_sync_parises---------------")
     end
   end
 
   #检查repository和project_score
   def change_project_score(project, project_scores, repository_params)
-    Rails.logger.info("***1. begin_to_sync_project_score---------------")
+    SyncLog.sync_log("***1. begin_to_sync_project_score---------------")
     begin
       pre_project_score = project.project_score
       if pre_project_score.present?
@@ -151,111 +164,123 @@ class SyncForgeController < ApplicationController
       else 
         ProjectScore.create!(project_scores.merge(project_id: project.id))
       end
-      Rails.logger.info("***1. end_to_sync_project_score---------------")
+      SyncLog.sync_log("***1. end_to_sync_project_score---------------")
     rescue Exception => e
-      Rails.logger.info("=========change_project_score_errors:#{e}===================")
+      SyncLog.sync_log("=========change_project_score_errors:#{e}===================")
     end
   end
 
   def change_project_issues(project, old_issues_params,project_id, gitea_main)
-    Rails.logger.info("***2. begin_to_syncissues---------------")
+    SyncLog.sync_log("***2. begin_to_syncissues---------------")
     begin
       forge_issue_ids = project&.issues&.select(:id)&.pluck(:id)
-      forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
-      diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
       sync_projects_params = {}
-      if diff_issue_ids.size == 0  #issue数量一样，判断评论是否有增减
-        diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
-        unless diff_journal_ids.size == 0
+      unless forge_issue_ids.size.to_i < old_issues_params[:count].to_i
+        forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
+        diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
+        
+        if diff_issue_ids.size == 0  #issue数量一样，判断评论是否有增减
+          diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
+          unless diff_journal_ids.size == 0
+            sync_projects_params = {
+              type: "Journal",
+              ids: diff_journal_ids,
+              token: get_token,
+              parent_id: project_id
+            }
+          end
+        else
           sync_projects_params = {
-            type: "Journal",
-            ids: diff_journal_ids,
+            type: "Issue",
+            ids: diff_issue_ids,
             token: get_token,
             parent_id: project_id
           }
         end
-      else
-        sync_projects_params = {
-          type: "Issue",
-          ids: diff_issue_ids,
-          token: get_token,
-          parent_id: project_id
-        }
       end
+      
       SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
-      Rails.logger.info("***2. end_to_syncissues---------------")
+      SyncLog.sync_log("***2. end_to_syncissues---------------")
     rescue Exception => e
-      Rails.logger.info("=========change_project_issues_errors:#{e}===================")
+      SyncLog.sync_log("=========change_project_issues_errors:#{e}===================")
     end
   end
 
   def change_project_watchers(project, watchers,gitea_main)
-    Rails.logger.info("***5. begin_to_sync_watchers---------------")
+    SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
     forge_watchers_ids = project&.watchers&.select(:id)&.pluck(:id)
-    diff_target_ids = watchers[:ids] - forge_watchers_ids
-    if diff_target_ids.size > 0
-      sync_projects_params = {
-        type: "Watcher",
-        ids: diff_target_ids,
-        token: get_token,
-        parent_id: project.id
-      }
-      SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-      Rails.logger.info("***5. begin_to_sync_watchers---------------")
-
+    unless forge_watchers_ids.size.to_i < watchers[:count].to_i
+      diff_target_ids = watchers[:ids] - forge_watchers_ids
+      if diff_target_ids.size > 0
+        sync_projects_params = {
+          type: "Watcher",
+          ids: diff_target_ids,
+          token: get_token,
+          parent_id: project.id
+        }
+        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+        
+      end
     end
+    SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
   end
 
   def change_project_versions(project, versions,gitea_main)
-    Rails.logger.info("***4. begin_to_sync_versions---------------")
+    SyncLog.sync_log("***4. begin_to_sync_versions---------------")
     forge_version_ids = project&.versions&.select(:id)&.pluck(:id)
-    diff_version_ids = versions[:ids] - forge_version_ids
-    if diff_version_ids.size > 0
-      sync_projects_params = {
-        type: "Version",
-        ids: diff_version_ids,
-        token: get_token,
-        parent_id: project.id
-      }
-      SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-      Rails.logger.info("***4. end_to_sync_versions---------------")
+    unless forge_version_ids.size < versions[:count].to_i
+      diff_version_ids = versions[:ids] - forge_version_ids
+      if diff_version_ids.size > 0
+        sync_projects_params = {
+          type: "Version",
+          ids: diff_version_ids,
+          token: get_token,
+          parent_id: project.id
+        }
+        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
+    end
+    
+      SyncLog.sync_log("***4. end_to_sync_versions---------------")
     end
   end
 
   def change_project_members(project, members,gitea_main)
-    Rails.logger.info("***3. begin_to_sync_members---------------")
+    SyncLog.sync_log("***3. begin_to_sync_members---------------")
     forge_member_ids = project&.members&.select(:id)&.pluck(:id)
-    diff_member_ids = members[:ids] - forge_member_ids
-    if diff_member_ids.size > 0
-      sync_projects_params = {
-        type: "Member",
-        ids: diff_member_ids,
-        token: get_token,
-        parent_id: project.id
-      }
-      SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
-      Rails.logger.info("***3. end_to_sync_members---------------")
+    unless forge_member_ids.size < members[:count]
+      diff_member_ids = members[:ids] - forge_member_ids
+      if diff_member_ids.size > 0
+        sync_projects_params = {
+          type: "Member",
+          ids: diff_member_ids,
+          token: get_token,
+          parent_id: project.id
+        }
+        SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
     end
-  end
-
-  def check_token 
-    sync_params = params[:sync_params]
-    unless sync_params[:token] && sync_params[:token] == get_token
-      render json: {message: "token_errors"}
+    
+      SyncLog.sync_log("***3. end_to_sync_members---------------")
     end
   end
 
+  # def check_token 
+  #   sync_params = params[:sync_params]
+  #   unless sync_params[:token] && sync_params[:token] == get_token
+  #     render json: {message: "token_errors"}
+  #   end
+  # end
+
   def get_token
     "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"
   end
 
   def get_sudomain
-    Rails.logger.info("=================request.subdomain:#{request.subdomain}========")
-    gitea_main = "testgitea.trustie.net"
+    SyncLog.sync_log("=================request.subdomain:#{request.subdomain}========")
+    gitea_main = "gitea.trustie.net"
     if request.subdomain === 'testforgeplus'
       gitea_main = "testgitea2.trustie.net"
-    elsif request.subdomain === 'forge'
-      gitea_main = "gitea.trustie.net"
+    # elsif request.subdomain === 'forgeplus'
+    #   gitea_main = "gitea.trustie.net"
     end
     return gitea_main
   end

app/controllers/users_controller.rb

@@ -146,6 +146,44 @@ class UsersController < ApplicationController
     render_ok
   end
 
+  def trustie_related_projects
+    projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
+    projects_json = []
+    if projects.present?
+      projects.each do |p|
+        pj = {
+          id: p.id,
+          name: p.name,
+          is_public: p.is_public,
+          updated_on: p.updated_on.strftime("%Y-%m-%d"),
+          owner: {
+            name: p.owner.try(:show_real_name),
+            login: p.owner.login
+          },
+          members_count: p&.members.size,
+          issues_count: p.issues_count - p.pull_requests_count,
+          commits_count: p&.project_score&.changeset_num.to_i
+        }
+        projects_json.push(pj)
+      end
+    end
+    Rails.logger.info("==========projects_json========+########{projects_json}")
+    render json: { projects: projects_json }
+  end
+
+  def trustie_projects
+    user_id = User.select(:id, :login).where(login: params[:login])&.first&.id
+    projects = Project.visible
+    
+    projects = projects.joins(:members).where(members: { user_id: user_id })
+
+    search = params[:search].to_s.strip
+    projects = projects.where('projects.name LIKE ?', "%#{search}%") if search.present?
+
+    projects = projects.select(:id, :name).limit(10).as_json
+    render json: { projects: projects }
+  end
+
   def projects
     is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
     scope = Projects::ListMyQuery.call(params, @user,is_current_admin_user)

app/jobs/sync_projects_job.rb

@@ -10,7 +10,6 @@ class SyncProjectsJob < ApplicationJob
 
     begin     
       url = "#{gitea_main}/sync_forges"  #trustie上的相关路由
-
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.hostname, uri.port)
       http.use_ssl = true
@@ -20,16 +19,17 @@ class SyncProjectsJob < ApplicationJob
       if response.code == '200'
         target_jsons = eval(response.body)
         if sync_params[:type] == "Project"
-          SyncLog.sync_log("==========target_jsons: #{target_jsons}============")
+          SyncLog.sync_project_log("==========target_jsons: #{target_jsons}============")
           update_new_project(target_jsons[:targets_params][0], sync_params[:new_project_id])
         else
+          SyncLog.sync_project_log("========== #{sync_params[:type]}============")
           create_target(target_jsons[:targets_params], sync_params[:type].to_s)
         end
       else
-        SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============")
+        SyncLog.sync_project_log("==========sync_project_to_forge_failed #{sync_params[:type]}============")
       end
     rescue => e
-      SyncLog.sync_log("==========sync_project_to_forge_failed #{sync_params[:type]}============errors:#{e}")
+      SyncLog.sync_project_log("==========sync_project_to_forge_failed #{sync_params[:type]}============errors:#{e}")
     end
   end
 
@@ -47,42 +47,50 @@ class SyncProjectsJob < ApplicationJob
   end
 
   def create_target(target_jsons, target_type)
-    SyncLog.sync_log("***【#{target_type}】. begin_to_create_target---------------")
-    return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank?
-    target_jsons.each_with_index do |re,index|
-      SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}")
-      if re[:target_params].present?
-        SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}")
-        u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first
-        re[:target_params].delete(:id)
-        if target_type == "Issue"
-          new_target = target_type.constantize.new(re[:target_params].merge(author_id: u_id))
-        else
-          new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id))
-        end
-        
-        if target_type == "Issue"
-          assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first
-          new_target.assigned_to_id = assing_u_id
-        end
-        if new_target.save!
-          if re[:journals].present?
-            create_journals(re[:journals], "Journal", new_target.id)
+    begin
+      SyncLog.sync_project_log("***【#{target_type}】. begin_to_create_target---------------")
+      return SyncLog.sync_log("*** no target_jsons") if target_jsons.blank?
+      target_jsons.each_with_index do |re,index|
+        SyncLog.sync_project_log("***user_login:#{re[:user_login]}----target_type:#{target_type}-----#{index+1}")
+        if re[:target_params].present?
+          SyncLog.sync_log("***user_login:#{re[:user_login]}----target_type:#{target_type}")
+          u_id = User.select(:id, :login).where(login: re[:user_login]).pluck(:id).first
+          re[:target_params].delete(:id)
+          if target_type == "Issue"
+            new_target = target_type.constantize.new(re[:target_params].merge(author_id: u_id))
+          else
+            new_target = target_type.constantize.new(re[:target_params].merge(user_id: u_id))
           end
-          if re[:journal_details].present?
-            re[:journal_details].each do |j|
-              JournalDetail.create!(j.merge(journal_id: new_target.id)) if j.present?
-            end
+          
+          if target_type == "Issue"
+            assing_u_id = User.select(:id, :login).where(login: re[:assign_login]).pluck(:id).first
+            new_target.assigned_to_id = assing_u_id
           end
-          if re[:member_roles].present?
-            re[:member_roles].each do |m|
-              MemberRole.create!(m.merge(member_id: new_target.id)) if m.present?
+          if new_target.save!
+            SyncLog.sync_project_log("***【#{target_type}】. create_success---------------")
+            if re[:journals].present?
+              create_journals(re[:journals], "Journal", new_target.id)
             end
+            if re[:journal_details].present?
+              re[:journal_details].each do |j|
+                JournalDetail.create!(j.merge(journal_id: new_target.id)) if j.present?
+              end
+            end
+            if re[:member_roles].present?
+              re[:member_roles].each do |m|
+                MemberRole.create!(m.merge(member_id: new_target.id)) if m.present?
+              end
+            end
+          else
+            SyncLog.sync_project_log("***【#{target_type}】. create_failed---------------")
           end
         end
       end
+      SyncLog.sync_project_log("***111222. end_to_create_target---------------")
+    rescue => e
+      SyncLog.sync_project_log("=========***【#{target_type}】creat_had_erros:#{e}===================")
     end
-    SyncLog.sync_log("***111222. end_to_create_target---------------")
+    
   end
 
   def create_journals(target_jsons, target_type,issue_id)

app/jobs/sync_repository_job.rb

@@ -5,12 +5,11 @@ class SyncRepositoryJob < ApplicationJob
 
   def perform(user_login, identifier, repository_params, gitea_main)
     #创建临时文件夹 clone 并强推代码
-    SyncLog.sync_log("=================begin to sync request trustie repository:#{repository_params}=====================")
+    SyncLog.sync_log("=================begin to sync request trustie repository=====================")
     path = "#{Rails.root}/public/cache_repository"
     image_url = repository_params[:git_url]
     gitlab_branches = repository_params[:gitlab_branches]
     image_repo_name = image_url.to_s.split('/')&.last&.chomp('.git')
-    SyncLog.sync_project_log("========gitlab_branches:#{gitlab_branches}===================")
     unless File.directory?(path)
       FileUtils.mkdir_p(path)
     end
@@ -20,15 +19,11 @@ class SyncRepositoryJob < ApplicationJob
     end
 
     check_clone = system("cd #{path} && git clone #{image_url}")
-    SyncLog.sync_log("========check_clone:====cd #{path} && git clone #{image_url}=====success?:#{check_clone}==============")
     if check_clone
-      
       new_gitlab_url = "http://root:_Trustie_10010@#{gitea_main}/#{user_login}/#{identifier}.git"
       shell_remote_1 = system("cd #{path}/#{image_repo_name} && git remote set-url origin #{new_gitlab_url}")
       gitlab_branches.each do |branch|
-        SyncLog.sync_log("========checkout_branch:#{branch}===================")
         shell5 = system("cd #{path}/#{image_repo_name} && git checkout #{branch} && git push --force --set-upstream origin #{branch}")
-        SyncLog.sync_log("========checkout_branch_shell5:#{shell5}===================")
         if !shell5
           SyncLog.sync_project_log("=============force_push_erros==#{path}/#{image_repo_name}++branch:#{branch}")
         else

config/routes.rb

@@ -170,6 +170,8 @@ Rails.application.routes.draw do
         post :sync_token
         post :sync_gitea_pwd
         post :sync_salt
+        get :trustie_projects
+        get :trustie_related_projects
       end
 
       scope module: :users do