From 217dfc03b2cdecc9e9b8824c528c17408c2b0e51 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Thu, 10 Sep 2020 10:53:12 +0800
Subject: [PATCH] ADD ci namespace  modle associations

---
 app/models/ci/cloud_account.rb | 2 +-
 app/models/ci/log.rb           | 3 ++-
 app/models/ci/perm.rb          | 4 ++--
 app/models/ci/repo.rb          | 1 +
 app/models/ci/step.rb          | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/models/ci/cloud_account.rb b/app/models/ci/cloud_account.rb
index 25fe81609..b10ca7118 100644
--- a/app/models/ci/cloud_account.rb
+++ b/app/models/ci/cloud_account.rb
@@ -1,6 +1,6 @@
 class Ci::CloudAccount < Ci::LocalBase
   belongs_to :user
-  belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :ci_user_id
+  belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :ci_user_id, optional: true
 
   def drone_host
     [drone_ip, ":80"].join
diff --git a/app/models/ci/log.rb b/app/models/ci/log.rb
index e509425dd..b0c8e337e 100644
--- a/app/models/ci/log.rb
+++ b/app/models/ci/log.rb
@@ -1,4 +1,5 @@
 class Ci::Log < Ci::RemoteBase
-  self.primary_key = 'log_id'
+  self.primary_key = nil
 
+  belongs_to :step, class_name: 'Ci::Step', foreign_key: :log_id
 end
diff --git a/app/models/ci/perm.rb b/app/models/ci/perm.rb
index 8a238c2c6..65ee7ab4b 100644
--- a/app/models/ci/perm.rb
+++ b/app/models/ci/perm.rb
@@ -1,6 +1,6 @@
 class Ci::Perm < Ci::RemoteBase
   self.primary_key = nil
 
-  belongs_to :ci_user, class_name: 'Ci::User', foreign_key: :perm_user_id
-
+  belongs_to :user, class_name: 'Ci::User', foreign_key: :perm_user_id
+  belongs_to :repo, class_name: 'Ci::Repo', foreign_key: :perm_repo_uid
 end
diff --git a/app/models/ci/repo.rb b/app/models/ci/repo.rb
index 76237dd2e..b7d6473f9 100644
--- a/app/models/ci/repo.rb
+++ b/app/models/ci/repo.rb
@@ -2,6 +2,7 @@ class Ci::Repo < Ci::RemoteBase
   self.primary_key = 'repo_id'
 
   belongs_to :user, foreign_key: :repo_user_id
+  has_one :perm, foreign_key: :perm_repo_uid, dependent: :destroy
   has_many :builds, foreign_key: "build_repo_id", dependent: :destroy
 
   def self.find_with_namespace(namespace_path, identifier)
diff --git a/app/models/ci/step.rb b/app/models/ci/step.rb
index 23d540314..eed7d6a70 100644
--- a/app/models/ci/step.rb
+++ b/app/models/ci/step.rb
@@ -2,4 +2,5 @@ class Ci::Step < Ci::RemoteBase
   self.primary_key = 'step_id'
 
   belongs_to :stage, foreign_key: :step_stage_id
+  has_one :log, class_name: 'Ci::Log', foreign_key: :log_id
 end