From 50db13a7efb7aedcb0de05c00bdc406d2b481dcc Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 27 Apr 2022 18:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../competition_infos_controller.rb           |  2 +-
 app/models/competition_info.rb                |  2 ++
 .../competition_infos/show.json.jbuilder      |  3 +++
 app/views/users/_user_small.json.jbuilder     | 19 ++++++++++---------
 ...220427100715_add_competition_info_admin.rb |  5 +++++
 5 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20220427100715_add_competition_info_admin.rb

diff --git a/app/controllers/competition_infos_controller.rb b/app/controllers/competition_infos_controller.rb
index da0abb1ef..81b58df86 100644
--- a/app/controllers/competition_infos_controller.rb
+++ b/app/controllers/competition_infos_controller.rb
@@ -221,7 +221,7 @@ class CompetitionInfosController < ApplicationController
 
   def competition_info_params
     params.require(:competition_info).permit(:title, :zones, :zones_local, :sub_competitions, :identifier, :content,
-                                             :video_url, :is_local, :manager_ids, :upload_date, :enroll_date, :guide, :about_us, :banner_url, :enroll_template)
+                                             :video_url, :is_local, :manager_ids, :upload_date, :enroll_date, :guide, :about_us, :banner_url, :enroll_template, :admin_data)
   end
 
   def find_competition
diff --git a/app/models/competition_info.rb b/app/models/competition_info.rb
index 6f285bb47..b5c3500c7 100644
--- a/app/models/competition_info.rb
+++ b/app/models/competition_info.rb
@@ -28,6 +28,8 @@
 class CompetitionInfo < ApplicationRecord
   has_many :competition_users
 
+  serialize :admin_data, JSON
+
   def competition_zones
     self.is_local? ? self.zones_local.to_s.split(",") : self.zones.to_s.split(",")
   end
diff --git a/app/views/competition_infos/show.json.jbuilder b/app/views/competition_infos/show.json.jbuilder
index 5237ab910..0aaf41f9a 100644
--- a/app/views/competition_infos/show.json.jbuilder
+++ b/app/views/competition_infos/show.json.jbuilder
@@ -6,4 +6,7 @@ json.data do
   json.sub_competitions @competition_info.sub_competitions.to_s.split(",")
   json.is_manager @competition_info.is_manager?(current_user)
   json.manager_zones @competition_info.manager_zones(current_user)
+  if current_user.admin?
+    json.admin_data @competition_info.admin_data
+  end
 end
\ No newline at end of file
diff --git a/app/views/users/_user_small.json.jbuilder b/app/views/users/_user_small.json.jbuilder
index b8033ba77..202bdecba 100644
--- a/app/views/users/_user_small.json.jbuilder
+++ b/app/views/users/_user_small.json.jbuilder
@@ -1,9 +1,10 @@
-# 单表存储的信息可以放里面
-json.array! users do |user|
-  json.username user.full_name
-  json.login user.login
-  json.user_id user.id
-  json.image_url url_to_avatar(user)
-  json.profile_completed user.profile_completed
-end
-
+# 单表存储的信息可以放里面
+json.array! users do |user|
+  json.username user.full_name
+  json.login user.login
+  json.phone user.phone
+  json.user_id user.id
+  json.image_url url_to_avatar(user)
+  json.profile_completed user.profile_completed
+end
+
diff --git a/db/migrate/20220427100715_add_competition_info_admin.rb b/db/migrate/20220427100715_add_competition_info_admin.rb
new file mode 100644
index 000000000..53fce75b9
--- /dev/null
+++ b/db/migrate/20220427100715_add_competition_info_admin.rb
@@ -0,0 +1,5 @@
+class AddCompetitionInfoAdmin < ActiveRecord::Migration[5.2]
+  def change
+    add_column :competition_infos, :admin_data, :text
+  end
+end