Skip to content

Commit a76809d

Browse files
committed
rmt ran
1 parent eb27fed commit a76809d

3 files changed

Lines changed: 34 additions & 10 deletions

File tree

src/endpoints.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::collections::BTreeMap;
22

3-
use http::HeaderMap;
43
use ::octocrab::models::{teams::RequestedTeam, Author};
54
use anyhow::Context;
65
use axum::{
@@ -9,6 +8,7 @@ use axum::{
98
Json,
109
};
1110
use futures::future::join_all;
11+
use http::HeaderMap;
1212
use indexmap::IndexMap;
1313
use serde::Serialize;
1414
use tower_sessions::Session;
@@ -199,7 +199,13 @@ pub async fn get_region(
199199
OriginalUri(original_uri): OriginalUri,
200200
Path(github_login): Path<String>,
201201
) -> Result<Json<Region>, Error> {
202-
let sheets_client = sheets_client(&session, server_state.clone(), headers, original_uri.clone()).await?;
202+
let sheets_client = sheets_client(
203+
&session,
204+
server_state.clone(),
205+
headers,
206+
original_uri.clone(),
207+
)
208+
.await?;
203209
let trainees = get_trainees(
204210
sheets_client,
205211
&server_state.config.github_email_mapping_sheet_id,
@@ -229,7 +235,13 @@ pub async fn fetch_attendance(
229235
OriginalUri(original_uri): OriginalUri,
230236
) -> Result<Json<AttendanceResponse>, Error> {
231237
let all_courses = &server_state.config.courses;
232-
let sheets_client = sheets_client(&session, server_state.clone(), headers, original_uri.clone()).await?;
238+
let sheets_client = sheets_client(
239+
&session,
240+
server_state.clone(),
241+
headers,
242+
original_uri.clone(),
243+
)
244+
.await?;
233245

234246
let mut courses: CourseAttendance = BTreeMap::new();
235247
let mut register_futures = Vec::new();

src/frontend.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use axum::{
77
response::{Html, IntoResponse, Response},
88
};
99
use futures::future::join_all;
10-
use http::{header::{CONTENT_TYPE}, HeaderMap, StatusCode, Uri};
10+
use http::{header::CONTENT_TYPE, HeaderMap, StatusCode, Uri};
1111
use serde::Deserialize;
1212
use tower_sessions::Session;
1313

@@ -100,7 +100,13 @@ pub async fn get_trainee_batch(
100100
OriginalUri(original_uri): OriginalUri,
101101
Path((course, batch_github_slug)): Path<(String, String)>,
102102
) -> Result<Html<String>, Error> {
103-
let sheets_client = sheets_client(&session, server_state.clone(), headers, original_uri.clone()).await?;
103+
let sheets_client = sheets_client(
104+
&session,
105+
server_state.clone(),
106+
headers,
107+
original_uri.clone(),
108+
)
109+
.await?;
104110
let github_org = &server_state.config.github_org;
105111
let course_schedule = server_state
106112
.config
@@ -188,7 +194,13 @@ pub async fn get_reviewers(
188194
OriginalUri(original_uri): OriginalUri,
189195
Path(course): Path<String>,
190196
) -> Result<Html<String>, Error> {
191-
let sheets_client = sheets_client(&session, server_state.clone(), headers, original_uri.clone()).await?;
197+
let sheets_client = sheets_client(
198+
&session,
199+
server_state.clone(),
200+
headers,
201+
original_uri.clone(),
202+
)
203+
.await?;
192204
let mut is_staff = true;
193205
let mut staff_details = get_reviewer_staff_info(
194206
sheets_client,

src/sheets.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ pub(crate) async fn sheets_client(
4343
Some(token)
4444
} else {
4545
session
46-
.get(GoogleScope::Sheets.token_session_key())
47-
.await
48-
.context("Session load error")?
49-
};
46+
.get(GoogleScope::Sheets.token_session_key())
47+
.await
48+
.context("Session load error")?
49+
};
5050

5151
let redirect_endpoint = redirect_endpoint(&server_state);
5252

0 commit comments

Comments
 (0)