Merge branch 'pre_trustie_server' into trustie_server

app/controllers/admins/organizations_controller.rb

@@ -31,6 +31,7 @@ class Admins::OrganizationsController < Admins::BaseController
   def destroy
     @org.destroy!
     Admins::DeleteOrganizationService.call(@org.login)
+    UserAction.create(action_id: @org.id, action_type: "DestroyOrganization", user_id: current_user.id, :ip => request.remote_ip, data_bank: @org.attributes.to_json)
     render_delete_success
   end
 

app/controllers/admins/projects_controller.rb

@@ -35,6 +35,7 @@ class Admins::ProjectsController < Admins::BaseController
       Gitea::Repository::DeleteService.new(project.owner, project.identifier).call
       project.destroy!
       # render_delete_success
+      UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json)
       redirect_to admins_projects_path
       flash[:success] = "删除成功"
     end

app/controllers/admins/users_controller.rb

@@ -25,15 +25,16 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def destroy
+    UserAction.create(action_id: @user.id, action_type: "DestroyUser", user_id: current_user.id, :ip => request.remote_ip, data_bank: @user.attributes.to_json)
     @user.destroy!
     Gitea::User::DeleteService.call(@user.login)
-
+    
     render_delete_success
   end
 
   def lock
     @user.lock!
-
+    UserAction.create(action_id: @user.id, action_type: "LockUser", user_id: current_user.id, :ip => request.remote_ip)
     render_ok
   end
 

app/controllers/organizations/organization_users_controller.rb

@@ -1,6 +1,7 @@
 class Organizations::OrganizationUsersController < Organizations::BaseController
   before_action :load_organization
-  before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy]
+  before_action :load_operate_user, :load_organization_user, only: [:destroy, :pm_check_user]
+  before_action :check_user_can_edit_org, only: [:destroy]
 
   def index
     @organization_users = @organization.organization_users.includes(:user)
@@ -16,6 +17,10 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
     @organization_users = kaminari_paginate(@organization_users)
   end
 
+  def pm_check_user
+    render_ok
+  end
+
   def destroy
     tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id)
     ActiveRecord::Base.transaction do

app/controllers/organizations/team_users_controller.rb

@@ -1,8 +1,8 @@
 class Organizations::TeamUsersController < Organizations::BaseController
   before_action :load_organization, :load_team
-  before_action :load_operate_user, only: [:create, :destroy]
+  before_action :load_operate_user, only: [:create, :destroy, :pm_check_user]
   before_action :check_user_profile_completed, only: [:create]
-  before_action :load_team_user, only: [:destroy]
+  before_action :load_team_user, only: [:destroy, :pm_check_user]
   before_action :check_user_can_edit_org, only: [:create, :destroy]
 
   def index
@@ -14,6 +14,10 @@ class Organizations::TeamUsersController < Organizations::BaseController
     @team_users = kaminari_paginate(@team_users)
   end
 
+  def pm_check_user
+    render_ok
+  end
+
   def create
     ActiveRecord::Base.transaction do
       @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)

app/models/attachment.rb

@@ -26,6 +26,8 @@
 #  cloud_url                 :string(255)      default("")
 #  course_second_category_id :integer          default("0")
 #  delay_publish             :boolean          default("0")
+#  memo_image                :boolean          default("0")
+#  extra_type                :integer          default("0")
 #
 # Indexes
 #

app/models/identity_verification.rb

@@ -17,7 +17,7 @@
 #
 # Indexes
 #
-#  index_identity_verifications_on_number  (number)
+#  index_identity_verifications_on_user_id  (user_id)
 #
 
 class IdentityVerification < ApplicationRecord

app/models/issue.rb

@@ -51,7 +51,7 @@
 
 class Issue < ApplicationRecord
   #issue_type 1为普通，2为悬赏
-  belongs_to :project, counter_cache: true, touch: true
+  belongs_to :project, counter_cache: true, touch: true, optional: true
   belongs_to :tracker,optional: true
   has_many :project_trends, as: :trend, dependent: :destroy
   has_one :pull_request

app/models/license.rb

@@ -7,6 +7,7 @@
 #  content    :text(65535)
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  is_secret  :boolean          default("0")
 #
 
 class License < ApplicationRecord

app/models/member.rb

@@ -11,6 +11,7 @@
 #  course_group_id     :integer          default("0")
 #  is_collect          :integer          default("1")
 #  graduation_group_id :integer          default("0")
+#  is_apply_signature  :boolean          default("0")
 #  team_user_id        :integer
 #
 # Indexes

app/models/organization_user.rb

@@ -5,6 +5,7 @@
 #  id              :integer          not null, primary key
 #  user_id         :integer
 #  organization_id :integer
+#  is_creator      :boolean          default("0")
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #

app/models/project.rb

@@ -62,6 +62,7 @@
 #
 # Indexes
 #
+#  index_projects_on_forked_count            (forked_count)
 #  index_projects_on_forked_from_project_id  (forked_from_project_id)
 #  index_projects_on_identifier              (identifier)
 #  index_projects_on_invite_code             (invite_code)
@@ -71,6 +72,7 @@
 #  index_projects_on_license_id              (license_id)
 #  index_projects_on_name                    (name)
 #  index_projects_on_platform                (platform)
+#  index_projects_on_praises_count           (praises_count)
 #  index_projects_on_project_category_id     (project_category_id)
 #  index_projects_on_project_language_id     (project_language_id)
 #  index_projects_on_project_type            (project_type)
@@ -78,6 +80,7 @@
 #  index_projects_on_rgt                     (rgt)
 #  index_projects_on_status                  (status)
 #  index_projects_on_updated_on              (updated_on)
+#  index_projects_on_user_id                 (user_id)
 #
 
 class Project < ApplicationRecord

app/models/project_category.rb

@@ -15,6 +15,7 @@
 # Indexes
 #
 #  index_project_categories_on_ancestry  (ancestry)
+#  index_project_categories_on_id        (id)
 #
 
 class ProjectCategory < ApplicationRecord

app/models/project_language.rb

@@ -9,6 +9,10 @@
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #
+# Indexes
+#
+#  index_project_languages_on_id  (id)
+#
 
 class ProjectLanguage < ApplicationRecord
   include Projectable

app/models/repository.rb

@@ -27,6 +27,7 @@
 #
 # Indexes
 #
+#  index_name                        (project_id)
 #  index_repositories_on_identifier  (identifier)
 #  index_repositories_on_project_id  (project_id)
 #  index_repositories_on_user_id     (user_id)

app/models/user_action.rb

@@ -9,6 +9,7 @@
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  ip          :string(255)
+#  data_bank   :text(65535)
 #
 # Indexes
 #

app/models/user_extension.rb

@@ -22,9 +22,9 @@
 #  school_id              :integer
 #  description            :string(255)
 #  department_id          :integer
-#  province               :string(255)
-#  city                   :string(255)
+#  province               :text(65535)
 #  custom_department      :string(255)
+#  city                   :string(255)
 #  show_email             :boolean          default("0")
 #  show_location          :boolean          default("0")
 #  show_department        :boolean          default("0")

app/services/api/v1/issues/list_service.rb

@@ -76,7 +76,7 @@ class Api::V1::Issues::ListService < ApplicationService
     end
 
     # keyword
-    issues = issues.ransack(id_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
+    issues = issues.ransack(id_or_project_issues_index_eq: keyword).result.or(issues.ransack(subject_or_description_cont: keyword).result) if keyword.present?
 
     @total_issues_count = issues.distinct.size
     @closed_issues_count = issues.closed.distinct.size 

config/routes.rb

@@ -146,6 +146,7 @@ Rails.application.routes.draw do
         resources :organization_users, only: [:index, :destroy] do
           collection do
             delete :quit
+            get :pm_check_user
           end
         end
         resources :clas
@@ -156,6 +157,7 @@ Rails.application.routes.draw do
           resources :team_users, only: [:index, :create, :destroy] do
             collection do
               delete :quit
+              get :pm_check_user
             end
           end
           resources :team_projects, only: [:index, :create, :destroy] do 

db/migrate/20231010030020_add_data_bank_to_user_actions.rb

@@ -0,0 +1,5 @@
+class AddDataBankToUserActions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_actions, :data_bank, :text
+  end
+end