Skip to content

Commit

Permalink
Merge pull request #629 from tutors-sdk/development
Browse files Browse the repository at this point in the history
fetch latest user name if not present in time
  • Loading branch information
edeleastar committed Jan 18, 2024
2 parents b8728ae + d6cafba commit 0ad4d86
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
3 changes: 1 addition & 2 deletions app/src/hooks.server.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { createServerClient } from "@supabase/ssr";
import type { Handle } from "@sveltejs/kit";
import { sequence } from "@sveltejs/kit/hooks";
import { PUBLIC_SUPABASE_ANON_KEY, PUBLIC_SUPABASE_URL } from '$env/static/public';

import { PUBLIC_SUPABASE_ANON_KEY, PUBLIC_SUPABASE_URL } from "$env/static/public";

const createSupabaseClient: Handle = async ({ event, resolve }) => {
event.locals.supabase = createServerClient(PUBLIC_SUPABASE_URL, PUBLIC_SUPABASE_ANON_KEY, {
Expand Down
15 changes: 10 additions & 5 deletions app/src/routes/(time)/time/[courseid]/+page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@ export const load: PageLoad = async ({ parent, params, fetch }) => {
const user: UserMetric = await fetchUserById(params.courseid, data.session, allLabs);
const users: Map<string, UserMetric> = await fetchAllUsers(params.courseid, allLabs);
const enrolledUsers: Map<string, UserMetric> = new Map<string, UserMetric>();
if (course.hasEnrollment) {
course.enrollment?.forEach((studentId) => {
const enrolledUser = users.get(studentId);
if (course.hasEnrollment && course.enrollment) {
for (let i = 0; i < course.enrollment.length; i++) {
const enrolledUser = users.get(course.enrollment[i]);
if (enrolledUser) {
enrolledUsers.set(studentId, enrolledUser);
if (!enrolledUser.name) {
const response = await fetch(`https://api.github.com/users/${enrolledUser.nickname}`);
const latestProfile = await response.json();
enrolledUser.name = latestProfile.name;
}
enrolledUsers.set(course.enrollment[i], enrolledUser);
}
});
}
}
return {
user: user,
Expand Down

0 comments on commit 0ad4d86

Please sign in to comment.