GW_MC/YANPM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/proxy-service #14

Merged
GW_MC merged 8 commits from feature/proxy-service into master 2026-01-12 11:56:39 +08:00
Conversation 0 Commits 8 Files Changed 41 +5 -4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83e02acb22 - Show all commits

9
apps/api/src/services/nginx/upstream.rs
View File

@@ -173,7 +173,7 @@ impl UpstreamService for UpstreamServiceImpl {
let count_info = with_conn!(&*self.connection, tx, conn, { let count_info = with_conn!(&*self.connection, tx, conn, {
upstream::Entity::find() upstream::Entity::find()
.select_only() .select_only()
.column_as(upstream::Column::Id, "count") .column_as(upstream::Column::Id.count(), "count")
.into_model::<CountResult>() .into_model::<CountResult>()
.one(*conn) .one(*conn)
.await? .await?
@@ -199,9 +199,10 @@ impl UpstreamService for UpstreamServiceImpl {
)))?; )))?;
let targets = upstream_target::Entity::find() let targets = upstream_target::Entity::find()
.filter(upstream_target::Column::UpstreamId.eq(upstream_id)) .filter(upstream_target::Column::UpstreamId.eq(upstream_id))
.apply_if(Some(concrete_options.filter_by_enabled), |query, _v| { .apply_if(
query.filter(upstream_target::Column::Enabled.eq(true)) concrete_options.filter_by_enabled.then_some(true),
}) |query, _v| query.filter(upstream_target::Column::Enabled.eq(true)),
)
.all(*conn) .all(*conn)
.await?; .await?;
(up, targets) (up, targets)