From 8309532b784311429f3e70107ae0e231d2dee8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Tue, 9 Sep 2025 15:27:13 +0800 Subject: [PATCH] sca update --- .../api/v1/projects/sca_controller.rb | 25 +++---------------- app/helpers/projects_helper.rb | 1 + .../v1/projects/sca/create_project_service.rb | 4 ++- .../v1/projects/sca/show_project_service.rb | 1 - .../api/v1/projects/sca/index.json.jbuilder | 1 + .../api/v1/projects/sca/show.json.jbuilder | 1 + config/routes/api.rb | 1 + 7 files changed, 11 insertions(+), 23 deletions(-) create mode 100644 app/views/api/v1/projects/sca/index.json.jbuilder create mode 100644 app/views/api/v1/projects/sca/show.json.jbuilder diff --git a/app/controllers/api/v1/projects/sca_controller.rb b/app/controllers/api/v1/projects/sca_controller.rb index 5f348025b..a13ce5757 100644 --- a/app/controllers/api/v1/projects/sca_controller.rb +++ b/app/controllers/api/v1/projects/sca_controller.rb @@ -1,26 +1,9 @@ class Api::V1::Projects::ScaController < Api::V1::BaseController before_action :require_public_and_member_above, only: [:index, :show] - + def index + @result = Api::V1::Projects::Sca::ShowProjectService.call(@project) + end def create - @result_object = Api::V1::Projects::Sca::CreateProjectService.call(@project) - end - - def show - @result_object = Api::V1::Projects::Tags::GetService.call(@project, params[:name], current_user&.gitea_token) - end - - def policies - - end - - before_action :require_operate_above, only: [:destroy] - - def destroy - @result_object = Api::V1::Projects::Tags::DeleteService.call(@project, params[:name], current_user&.gitea_token) - if @result_object - return render_ok - else - return render_error('删除标签失败!') - end + @result = Api::V1::Projects::Sca::CreateProjectService.call(@project) end end \ No newline at end of file diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 60cded236..7261c4df2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -76,6 +76,7 @@ module ProjectsHelper open_portrait: project.open_portrait, ignore_id: project.ignore_id, has_project_visitor: project.project_visitors.find_by(user_id: user.id).present?, + sca_project_id: project.sca_project_id }).compact render json: tmp_json diff --git a/app/services/api/v1/projects/sca/create_project_service.rb b/app/services/api/v1/projects/sca/create_project_service.rb index bd3873e5d..946ec4554 100644 --- a/app/services/api/v1/projects/sca/create_project_service.rb +++ b/app/services/api/v1/projects/sca/create_project_service.rb @@ -15,7 +15,9 @@ class Api::V1::Projects::Sca::CreateProjectService < Api::V1::Projects::Sca::Ba "description": @project.description } data = sca_post_request("projects/", params) - @project.update(sca_project_id:data[:json]["id"]) + if @project.update(sca_project_id:data[:json]["id"]) + Api::V1::Projects::Sca::ShowProjectService.call(@project) + end end end \ No newline at end of file diff --git a/app/services/api/v1/projects/sca/show_project_service.rb b/app/services/api/v1/projects/sca/show_project_service.rb index d81a89125..2c02432ac 100644 --- a/app/services/api/v1/projects/sca/show_project_service.rb +++ b/app/services/api/v1/projects/sca/show_project_service.rb @@ -5,7 +5,6 @@ class Api::V1::Projects::Sca::ShowProjectService < Api::V1::Projects::Sca::Base def call #projects/18748/list-branches/?branch_name_query=&page=1&limit=5 - # { auth_token:login_token, "url": base_url + "org/#{sca_user_info["default_org"]}/projects/#{@project.sca_project_id}?engine=sca" , diff --git a/app/views/api/v1/projects/sca/index.json.jbuilder b/app/views/api/v1/projects/sca/index.json.jbuilder new file mode 100644 index 000000000..86a3f08fd --- /dev/null +++ b/app/views/api/v1/projects/sca/index.json.jbuilder @@ -0,0 +1 @@ +json.data @result \ No newline at end of file diff --git a/app/views/api/v1/projects/sca/show.json.jbuilder b/app/views/api/v1/projects/sca/show.json.jbuilder new file mode 100644 index 000000000..86a3f08fd --- /dev/null +++ b/app/views/api/v1/projects/sca/show.json.jbuilder @@ -0,0 +1 @@ +json.data @result \ No newline at end of file diff --git a/config/routes/api.rb b/config/routes/api.rb index d8f6c98c2..66296d18b 100644 --- a/config/routes/api.rb +++ b/config/routes/api.rb @@ -223,6 +223,7 @@ defaults format: :json do end end end + resources :sca, only: [:index,:create] resources :pipelines do post :build_yaml, on: :collection post :save_yaml, on: :collection