alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: select correct columns with correct alias

Browse source
This commit is contained in:
əlemi 2025-01-15 01:24:44 +01:00
parent 3581dc54e1
commit 1aa7216601
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
upub/routes/src/activitypub/object/likes.rs
View file

@ -1,6 +1,6 @@
use apb::{BaseMut, CollectionMut, LD}; use apb::{BaseMut, CollectionMut, LD};
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect, RelationTrait}; use sea_orm::{ColumnTrait, EntityTrait, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns, Iden, EntityName};
use upub::{selector::{RichActivity, RichFillable}, Context}; use upub::{selector::{RichActivity, RichFillable}, Context};
use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity}; use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity};
@ -38,7 +38,7 @@ pub async fn page(
.ok_or_else(crate::ApiError::not_found)?; .ok_or_else(crate::ApiError::not_found)?;
let (limit, offset) = page.pagination(); let (limit, offset) = page.pagination();
let items = upub::model::like::Entity::find() let mut select = upub::model::like::Entity::find()
.distinct() .distinct()
.join(sea_orm::JoinType::InnerJoin, upub::model::like::Relation::Activities.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::like::Relation::Activities.def())
.join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def())
@ -47,6 +47,18 @@ pub async fn page(
.order_by_desc(upub::model::like::Column::Published) .order_by_desc(upub::model::like::Column::Published)
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.select_only();
for col in upub::model::activity::Column::iter() {
select = select.select_column_as(col, format!("{}{}", upub::model::activity::Entity.table_name(), col.to_string()));
}
select = select.select_column_as(
upub::model::addressing::Column::Published,
format!("{}{}", upub::model::addressing::Entity.table_name(), upub::model::addressing::Column::Published.to_string())
);
let items = select
.into_model::<RichActivity>() .into_model::<RichActivity>()
.all(ctx.db()) .all(ctx.db())
.await? .await?

16
upub/routes/src/activitypub/object/shares.rs
View file

@ -1,6 +1,6 @@
use apb::{BaseMut, CollectionMut, LD}; use apb::{BaseMut, CollectionMut, LD};
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, EntityTrait, QueryFilter, QueryOrder, QuerySelect, RelationTrait}; use sea_orm::{ColumnTrait, EntityName, EntityTrait, Iden, Iterable, QueryFilter, QueryOrder, QuerySelect, RelationTrait, SelectColumns};
use upub::{selector::{RichActivity, RichFillable}, Context}; use upub::{selector::{RichActivity, RichFillable}, Context};
use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity}; use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity};
@ -38,7 +38,7 @@ pub async fn page(
.ok_or_else(crate::ApiError::not_found)?; .ok_or_else(crate::ApiError::not_found)?;
let (limit, offset) = page.pagination(); let (limit, offset) = page.pagination();
let items = upub::model::announce::Entity::find() let mut select = upub::model::announce::Entity::find()
.distinct() .distinct()
.join(sea_orm::JoinType::InnerJoin, upub::model::announce::Relation::Activities.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::announce::Relation::Activities.def())
.join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def()) .join(sea_orm::JoinType::InnerJoin, upub::model::activity::Relation::Addressing.def())
@ -47,6 +47,18 @@ pub async fn page(
.order_by_desc(upub::model::announce::Column::Published) .order_by_desc(upub::model::announce::Column::Published)
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.select_only();
for col in upub::model::activity::Column::iter() {
select = select.select_column_as(col, format!("{}{}", upub::model::activity::Entity.table_name(), col.to_string()));
}
select = select.select_column_as(
upub::model::addressing::Column::Published,
format!("{}{}", upub::model::addressing::Entity.table_name(), upub::model::addressing::Column::Published.to_string())
);
let items = select
.into_model::<RichActivity>() .into_model::<RichActivity>()
.all(ctx.db()) .all(ctx.db())
.await? .await?