From 1ce55b27f410882481405dc94cd17901038a2355 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 20 Mar 2023 16:13:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=96=91?= =?UTF-8?q?=E4=BF=AE=E5=88=97=E8=A1=A8=E5=88=87=E6=8D=A2=E5=85=B3=E9=97=AD?= =?UTF-8?q?status=20count=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/api/v1/issues/list_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/api/v1/issues/list_service.rb b/app/services/api/v1/issues/list_service.rb index 9804d63c2..256ad222c 100644 --- a/app/services/api/v1/issues/list_service.rb +++ b/app/services/api/v1/issues/list_service.rb @@ -68,7 +68,7 @@ class Api::V1::Issues::ListService < ApplicationService issues = issues.joins(:assigners).where(users: {id: assigner_id}) if assigner_id.present? # status_id - issues = issues.where(status_id: status_id) if status_id.present? + issues = issues.where(status_id: status_id) if status_id.present? && category != 'closed' if begin_date&.present? || end_date&.present? issues = issues.where("issues.created_on between ? and ?", begin_date&.present? ? begin_date.to_time : Time.now.beginning_of_day, end_date&.present? ? end_date.to_time.end_of_day : Time.now.end_of_day) From 481a7fd6262535728de145fdb1eee69ab89996bc Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 22 Mar 2023 11:03:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?mindspore=E4=B8=89=E4=B8=AA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BC=80=E5=90=AF=E7=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 804e2aa46..5bd2f68f2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -149,6 +149,9 @@ module ProjectsHelper when 'vue' then "#{url}/v1/vue/entropy" when 'bootstrap' then "#{url}/v1/bootstrap/entropy" when 'tensorflow' then "#{url}/v1/tensorflow/entropy" + when 'openeuler' then "#{url}/v1/openeuler/entropy" + when 'opengauss' then "#{url}/v1/opengauss/entropy" + when 'mindspore' then "#{url}/v1/mindspore/entropy" else '' end end @@ -163,6 +166,9 @@ module ProjectsHelper when 'vue' then "#{url}/v2/getMediumData?repo_login=vuejs&repo_name=vue" when 'bootstrap' then "#{url}/v2/getMediumData?repo_login=twbs&repo_name=bootstrap" when 'tensorflow' then "#{url}/v2/getMediumData?repo_login=tensorflow&repo_name=tensorflow" + when 'openeuler' then "#{url}/v2/getMediumData?repo_login=openeuler&repo_name=openeuler" + when 'opengauss' then "#{url}/v2/getMediumData?repo_login=opengauss&repo_name=opengauss" + when 'mindspore' then "#{url}/v2/getMediumData?repo_login=mindspore&repo_name=mindspore" else '' end end @@ -177,6 +183,9 @@ module ProjectsHelper when 'vue' then "#{url}/v2/getIndexData?repo_login=vuejs&repo_name=vue" when 'bootstrap' then "#{url}/v2/getIndexData?repo_login=twbs&repo_name=bootstrap" when 'tensorflow' then "#{url}/v2/getIndexData?repo_login=tensorflow&repo_name=tensorflow" + when 'openeuler' then "#{url}/v2/getIndexData?repo_login=openeuler&repo_name=openeuler" + when 'opengauss' then "#{url}/v2/getIndexData?repo_login=opengauss&repo_name=opengauss" + when 'mindspore' then "#{url}/v2/getIndexData?repo_login=mindspore&repo_name=mindspore" else '' end end @@ -191,6 +200,9 @@ module ProjectsHelper when 'vue' then "#{url}/vue/entropy" when 'bootstrap' then "#{url}/bootstrap/entropy" when 'tensorflow' then "#{url}/tensorflow/entropy" + when 'openeuler' then "#{url}/openeuler/entropy" + when 'opengauss' then "#{url}/opengauss/entropy" + when 'mindspore' then "#{url}/mindspore/entropy" else '' end end From b65b920a1e6413c940d8e712276b3d6e86cfd51a Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 22 Mar 2023 11:13:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85bot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/installations/index.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/installations/index.json.jbuilder b/app/views/installations/index.json.jbuilder index b2f674f20..3d64a3323 100644 --- a/app/views/installations/index.json.jbuilder +++ b/app/views/installations/index.json.jbuilder @@ -2,6 +2,7 @@ json.status 0 json.message "success" json.data do json.array! @install_bots do |install_bot| + json.installation_id install_bot.id json.extract! install_bot.bot, :id, :name end end \ No newline at end of file From b127323589f06f7d3ad17e5939583fa3cab93fca Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 23 Mar 2023 10:41:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E3=80=81=E7=82=B9=E8=B5=9E=E3=80=81fork=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8Aissue=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=87=8C?= =?UTF-8?q?=E7=A8=8B=E7=A2=91ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/fork_user.rb | 2 ++ app/models/praise_tread.rb | 2 ++ app/models/watcher.rb | 2 ++ app/views/api/v1/issues/_simple_detail.json.jbuilder | 1 + 4 files changed, 7 insertions(+) diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb index 2d74af4a4..92040ad13 100644 --- a/app/models/fork_user.rb +++ b/app/models/fork_user.rb @@ -25,10 +25,12 @@ class ForkUser < ApplicationRecord def incre_project_common CacheAsyncSetJob.perform_later("project_common_service", {forks: 1}, self.project_id) + self.project.update_column(:updated_on, Time.now) end def decre_project_common CacheAsyncSetJob.perform_later("project_common_service", {forks: -1}, self.project_id) + self.project.update_column(:updated_on, Time.now) end def incre_user_statistic diff --git a/app/models/praise_tread.rb b/app/models/praise_tread.rb index 5d4ae0d80..0250f012e 100644 --- a/app/models/praise_tread.rb +++ b/app/models/praise_tread.rb @@ -26,10 +26,12 @@ class PraiseTread < ApplicationRecord def incre_project_common CacheAsyncSetJob.perform_later("project_common_service", {praises: 1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project" + self.praise_tread_object.update_column(:updated_on, Time.now) if self.praise_tread_object_type == "Project" end def decre_project_common CacheAsyncSetJob.perform_later("project_common_service", {praises: -1}, self.praise_tread_object_id) if self.praise_tread_object_type == "Project" + self.praise_tread_object.update_column(:updated_on, Time.now) if self.praise_tread_object_type == "Project" end def incre_user_statistic diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 5a2cd96fb..f9d646ca9 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -28,10 +28,12 @@ class Watcher < ApplicationRecord def incre_project_common CacheAsyncSetJob.perform_later("project_common_service", {watchers: 1}, self.watchable_id) if self.watchable_type == "Project" + self.watchable.update_column(:updated_on, Time.now) if self.watchable_type == "Project" end def decre_project_common CacheAsyncSetJob.perform_later("project_common_service", {watchers: -1}, self.watchable_id) if self.watchable_type == "Project" + self.watchable.update_column(:updated_on, Time.now) if self.watchable_type == "Project" end def incre_user_statistic diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index 7e0d6b11f..e5a1a2cdc 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -7,6 +7,7 @@ end json.status_name issue.issue_status&.name json.priority_name issue.priority&.name json.milestone_name issue.version&.name +json.milestone_id issue.fixed_version_id json.author do if issue.user.present? json.partial! "api/v1/users/simple_user", locals: {user: issue.user} From 243e2e2667abaf78fa8ee0e014585774f1298500 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 23 Mar 2023 16:32:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=BE=A4=E6=99=BA=E7=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5bd2f68f2..e50bd22d3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -149,8 +149,8 @@ module ProjectsHelper when 'vue' then "#{url}/v1/vue/entropy" when 'bootstrap' then "#{url}/v1/bootstrap/entropy" when 'tensorflow' then "#{url}/v1/tensorflow/entropy" - when 'openeuler' then "#{url}/v1/openeuler/entropy" - when 'opengauss' then "#{url}/v1/opengauss/entropy" + when 'kernel' then "#{url}/v1/openeuler/entropy" + when 'opengauss-server' then "#{url}/v1/opengauss/entropy" when 'mindspore' then "#{url}/v1/mindspore/entropy" else '' end @@ -166,9 +166,9 @@ module ProjectsHelper when 'vue' then "#{url}/v2/getMediumData?repo_login=vuejs&repo_name=vue" when 'bootstrap' then "#{url}/v2/getMediumData?repo_login=twbs&repo_name=bootstrap" when 'tensorflow' then "#{url}/v2/getMediumData?repo_login=tensorflow&repo_name=tensorflow" - when 'openeuler' then "#{url}/v2/getMediumData?repo_login=openeuler&repo_name=openeuler" - when 'opengauss' then "#{url}/v2/getMediumData?repo_login=opengauss&repo_name=opengauss" - when 'mindspore' then "#{url}/v2/getMediumData?repo_login=mindspore&repo_name=mindspore" + when 'kernel' then "#{url}/v2/getMediumData?repo_login=openeuler&repo_name=kernel" + when 'opengauss-server' then "#{url}/v2/getMediumData?repo_login=opengauss&repo_name=openGauss-server" + when 'mindspore' then "#{url}/v2/getMediumData?repo_login=mindspore&repo_name=mindspore" else '' end end @@ -183,9 +183,9 @@ module ProjectsHelper when 'vue' then "#{url}/v2/getIndexData?repo_login=vuejs&repo_name=vue" when 'bootstrap' then "#{url}/v2/getIndexData?repo_login=twbs&repo_name=bootstrap" when 'tensorflow' then "#{url}/v2/getIndexData?repo_login=tensorflow&repo_name=tensorflow" - when 'openeuler' then "#{url}/v2/getIndexData?repo_login=openeuler&repo_name=openeuler" - when 'opengauss' then "#{url}/v2/getIndexData?repo_login=opengauss&repo_name=opengauss" - when 'mindspore' then "#{url}/v2/getIndexData?repo_login=mindspore&repo_name=mindspore" + when 'kernel' then "#{url}/v2/getIndexData?repo_login=openeuler&repo_name=kernel" + when 'opengauss-server' then "#{url}/v2/getIndexData?repo_login=opengauss&repo_name=openGauss-server" + when 'mindspore' then "#{url}/v2/getIndexData?repo_login=mindspore&repo_name=mindspore" else '' end end @@ -199,9 +199,9 @@ module ProjectsHelper when 'paddle' then "#{url}/paddle/entropy" when 'vue' then "#{url}/vue/entropy" when 'bootstrap' then "#{url}/bootstrap/entropy" - when 'tensorflow' then "#{url}/tensorflow/entropy" - when 'openeuler' then "#{url}/openeuler/entropy" - when 'opengauss' then "#{url}/opengauss/entropy" + when 'tensorflow' then "#{url}/tensorflow/entropy" + when 'kernel' then "#{url}/openeuler/entropy" + when 'opengauss-server' then "#{url}/opengauss/entropy" when 'mindspore' then "#{url}/mindspore/entropy" else '' end