From d85075f951c016209a325d9df23828d741ee2c9a Mon Sep 17 00:00:00 2001 From: viletyy Date: Sat, 6 Feb 2021 11:33:20 +0800 Subject: [PATCH] [FIX]org sync gitea_uid [FIX] --- app/services/organizations/create_service.rb | 5 +++-- app/services/repositories/create_service.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/services/organizations/create_service.rb b/app/services/organizations/create_service.rb index 218fa2115..2d2b29e0f 100644 --- a/app/services/organizations/create_service.rb +++ b/app/services/organizations/create_service.rb @@ -14,7 +14,7 @@ class Organizations::CreateService < ApplicationService create_org_and_extension create_owner_info create_gitea_org - sync_owner_team_gtid + sync_gitea_info Rails.logger.info("######Organization create_service end######") end @@ -66,7 +66,8 @@ class Organizations::CreateService < ApplicationService @gitea_organization = Gitea::Organization::CreateService.call(@organization.gitea_token, organization) end - def sync_owner_team_gtid + def sync_gitea_info + organization.update!(gitea_uid: gitea_organization["id"]) owner_team.update!(gtid: gitea_organization["owner_team"]["id"]) end end \ No newline at end of file diff --git a/app/services/repositories/create_service.rb b/app/services/repositories/create_service.rb index 9da2fe94f..4c5519f2e 100644 --- a/app/services/repositories/create_service.rb +++ b/app/services/repositories/create_service.rb @@ -13,7 +13,6 @@ class Repositories::CreateService < ApplicationService ActiveRecord::Base.transaction do if repository.save! create_gitea_repository - create_manager_member sync_project sync_repository # if project.project_type == "common" @@ -49,6 +48,7 @@ class Repositories::CreateService < ApplicationService next unless team.includes_all_project TeamProject.build(project.user_id, team.id, project.id) end + create_manager_member end end