flibusta-apps/users_settings_server
1
0
Fork 0
mirror of https://github.com/flibusta-apps/users_settings_server.git synced 2025-12-06 06:35:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix
Some checks failed
Build docker image / Build-Docker-Image (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Bulat Kurbanov
2024-12-26 02:31:07 +01:00
parent 7469fad5ad
commit f24a1dbec8
8 changed files with 275 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/users/mod.rs
View File

@@ -39,12 +39,12 @@ async fn get_users(pagination: Query<Pagination>, db: Database) -> impl IntoResp
user_settings.username,
user_settings.source,
COALESCE(
JSON_AGG(JSON_BUILD_OBJECT(
'id', languages.id,
'label', languages.label,
'code', languages.code
)),
'[]'::JSON
ARRAY_AGG(ROW(
languages.id,
languages.label,
languages.code
)::user_language_type),
ARRAY[]::user_language_type[]
) AS "allowed_langs!: Vec<UserLanguage>"
FROM user_settings
LEFT JOIN users_languages ON user_settings.id = users_languages.user
@@ -76,12 +76,12 @@ async fn get_user(Path(user_id): Path<i64>, db: Database) -> impl IntoResponse {
user_settings.username,
user_settings.source,
COALESCE(
JSON_AGG(JSON_BUILD_OBJECT(
'id', languages.id,
'label', languages.label,
'code', languages.code
)),
'[]'::JSON
ARRAY_AGG(ROW(
languages.id,
languages.label,
languages.code
)::user_language_type),
ARRAY[]::user_language_type[]
) AS "allowed_langs!: Vec<UserLanguage>"
FROM user_settings
LEFT JOIN users_languages ON user_settings.id = users_languages.user
@@ -138,12 +138,12 @@ async fn create_or_update_user(
user_settings.username,
user_settings.source,
COALESCE(
JSON_AGG(JSON_BUILD_OBJECT(
'id', languages.id,
'label', languages.label,
'code', languages.code
)),
'[]'::JSON
ARRAY_AGG(ROW(
languages.id,
languages.label,
languages.code
)::user_language_type),
ARRAY[]::user_language_type[]
) AS "allowed_langs!: Vec<UserLanguage>"
FROM user_settings
LEFT JOIN users_languages ON user_settings.id = users_languages.user

1
src/views/users/serializers.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
#[derive(sqlx::FromRow, sqlx::Type, Serialize)]
#[sqlx(type_name = "user_language_type")]
pub struct UserLanguage {
pub id: i32,
pub label: String,