Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit a78e1c9

Browse files
committed
chore: format
1 parent ee951ba commit a78e1c9

File tree

26 files changed

+1339
-150
lines changed

26 files changed

+1339
-150
lines changed

Cargo.lock

Lines changed: 1142 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ edition = "2021"
99
aes = "0.8.4"
1010
axum = "0.7.5"
1111
axum-core = "0.4.3"
12-
axum-extra = { version = "0.9.3", features = ["form", "query", "typed-header", "typed-routing", "multipart"] }
12+
axum-extra = { version = "0.9.3", features = [
13+
"form",
14+
"query",
15+
"typed-header",
16+
"typed-routing",
17+
"multipart",
18+
] }
1319
b2-client = { version = "0.1.3", features = ["with_surf"] }
1420
base64 = "0.22.0"
1521
bcrypt = "0.15.1"
@@ -22,19 +28,32 @@ jsonwebtoken = "9.3.0"
2228
mongodb = { version = "2.8.2", features = ["async-std"] }
2329
once_cell = "1.19.0"
2430
pem = { version = "3.0.4", features = ["serde"] }
31+
polars = "0.39.2"
2532
rand = "0.8.5"
2633
reqwest = "0.12.3"
2734
rsa = "0.9.6"
2835
serde = "1.0.198"
2936
serde_json = "1.0.116"
3037
serde_qs = { version = "0.13.0", features = ["axum"] }
31-
socketioxide = { version = "0.12.0", features = ["state", "extensions", "tracing"] }
38+
socketioxide = { version = "0.12.0", features = [
39+
"state",
40+
"extensions",
41+
"tracing",
42+
] }
3243
tokio = { version = "1.37.0", features = ["full"] }
3344
tower = "0.4.13"
3445
tower-http = "0.5.2"
3546
tracing = { version = "0.1.40", features = ["log"] }
36-
tracing-subscriber = { version = "0.3.18", features = ["tracing", "time", "serde", "serde_json", "json", "regex"] }
47+
tracing-subscriber = { version = "0.3.18", features = [
48+
"tracing",
49+
"time",
50+
"serde",
51+
"serde_json",
52+
"json",
53+
"regex",
54+
] }
3755
uuid = "1.8.0"
56+
xlsxwriter = "0.6.0"
3857
zerocopy = "0.7.32"
3958

4059
[profile.release]

src/calc/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

src/launch.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
use crate::utils::{
2+
aes::generate_aes256_key,
3+
rsa::{generate_keypair, save_keypair},
4+
};
15
use tokio::fs::{try_exists, write};
2-
use crate::utils::{rsa::{generate_keypair, save_keypair}, aes::generate_aes256_key};
36

47
pub async fn generate_rsa_keypair() {
58
let private_exists = try_exists("private.pem").await.unwrap();

src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
extern crate chrono;
2+
mod calc;
23
mod database;
34
mod launch;
45
mod models;
@@ -78,7 +79,7 @@ async fn main() {
7879
)
7980
.route(
8081
"/activity/:id/member/:member_id",
81-
get(routers::activities::members::read::read_member)
82+
get(routers::activities::members::read::read_member),
8283
)
8384
.route(
8485
"/activity/:id/member",

src/models/activities.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ pub enum SpecialActivityCategory {
5454

5555
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
5656
pub struct ActivityMember {
57-
#[serde(serialize_with = "objectid_to_string", deserialize_with = "string_to_objectid")]
57+
#[serde(
58+
serialize_with = "objectid_to_string",
59+
deserialize_with = "string_to_objectid"
60+
)]
5861
pub _id: ObjectId, // ObjectId
5962
pub status: ActivityMemberStatus,
6063
pub impression: Option<String>,
@@ -69,7 +72,10 @@ pub struct ActivityMemberHistory {
6972
pub impression: String,
7073
pub duration: f64,
7174
pub time: String,
72-
#[serde(serialize_with = "objectid_to_string", deserialize_with = "string_to_objectid")]
75+
#[serde(
76+
serialize_with = "objectid_to_string",
77+
deserialize_with = "string_to_objectid"
78+
)]
7379
pub actioner: ObjectId, // ObjectId
7480
pub action: ActivityMemberStatus,
7581
}
@@ -132,7 +138,10 @@ pub struct Activity {
132138
pub created_at: u64,
133139
#[serde(deserialize_with = "datetime_or_u64")]
134140
pub updated_at: u64,
135-
#[serde(serialize_with = "objectid_to_string", deserialize_with = "string_to_objectid")]
141+
#[serde(
142+
serialize_with = "objectid_to_string",
143+
deserialize_with = "string_to_objectid"
144+
)]
136145
pub creator: ObjectId, // ObjectId
137146
pub status: ActivityStatus,
138147
pub members: Option<Vec<ActivityMember>>,

src/models/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub mod activities;
22
pub mod groups;
3+
pub mod notifications;
34
pub mod response;
45
pub mod users;
5-
pub mod notifications;

src/models/notifications.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use crate::models::activities::datetime_or_u64;
12
use bson::oid::ObjectId;
23
use serde::{Deserialize, Serialize};
3-
use crate::models::activities::datetime_or_u64;
44

55
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
66
#[serde(rename_all = "kebab-case")]

src/models/users.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ impl UserTrait for User {
8383
}
8484
}
8585
}
86-
let token =
87-
generate_token(&user._id.to_string(), term, permissions);
86+
let token = generate_token(&user._id.to_string(), term, permissions);
8887
Ok(token)
8988
}
9089
Ok(None) => Err("User not found".to_string()),

src/routers/activities/insert.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
use crate::{models::{
2-
activities::{Activity, ActivityStatus, ActivityType}, groups::GroupPermission, response::{ResponseStatus, SuccessResponse, create_error}
3-
}, utils::jwt::UserData};
1+
use crate::{
2+
models::{
3+
activities::{Activity, ActivityStatus, ActivityType},
4+
groups::GroupPermission,
5+
response::{create_error, ResponseStatus, SuccessResponse},
6+
},
7+
utils::jwt::UserData,
8+
};
49
use axum::{
510
extract::{Extension, Query},
611
http::StatusCode,
@@ -37,7 +42,9 @@ pub async fn insert_activity(
3742
return create_error(StatusCode::FORBIDDEN, "Permission denied".to_string());
3843
}
3944
} else {
40-
if activity.activity_type == ActivityType::Social || activity.activity_type == ActivityType::Scale {
45+
if activity.activity_type == ActivityType::Social
46+
|| activity.activity_type == ActivityType::Scale
47+
{
4148
activity.status = ActivityStatus::Pending;
4249
} else {
4350
return create_error(StatusCode::FORBIDDEN, "Permission denied".to_string());

0 commit comments

Comments
 (0)