ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor cockpit user loading

This commit is contained in:
Daniel Egger 2023-01-09 18:14:53 +01:00
parent 47770bde90
commit 1b87aa5bac
4 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/stores/cockpit.ts
View File

@ -2,6 +2,7 @@ import { itGetCached } from "@/fetchHelpers";
import type { CourseSessionUser, ExpertSessionUser } from "@/types"; import type { CourseSessionUser, ExpertSessionUser } from "@/types";
import log from "loglevel"; import log from "loglevel";
import { useUserStore } from "@/stores/user";
import { defineStore } from "pinia"; import { defineStore } from "pinia";
export type CockpitStoreState = { export type CockpitStoreState = {
@ -29,15 +30,18 @@ export const useCockpitStore = defineStore({
actions: { actions: {
async loadCourseSessionUsers(courseSlug: string, reload = false) { async loadCourseSessionUsers(courseSlug: string, reload = false) {
log.debug("loadCockpitData called"); log.debug("loadCockpitData called");
const { users, cockpit_user: cockpitUser } = await itGetCached( const users = (await itGetCached(`/api/course/sessions/${courseSlug}/users/`, {
`/api/course/sessions/${courseSlug}/users/`,
{
reload: reload, reload: reload,
} })) as CourseSessionUser[];
);
this.courseSessionUsers = users; this.courseSessionUsers = users.filter((user) => user.role === "MEMBER");
this.cockpitSessionUser = cockpitUser;
const userStore = useUserStore();
const currentUser = users.find((user) => user.user_id === userStore.id);
if (currentUser && currentUser.role === "EXPERT") {
this.cockpitSessionUser = currentUser as ExpertSessionUser;
}
if (this.cockpitSessionUser && this.cockpitSessionUser.circles?.length > 0) { if (this.cockpitSessionUser && this.cockpitSessionUser.circles?.length > 0) {
this.selectedCircles = [this.cockpitSessionUser.circles[0].translation_key]; this.selectedCircles = [this.cockpitSessionUser.circles[0].translation_key];

3
client/src/stores/user.ts
View File

@ -80,9 +80,6 @@ export const useUserStore = defineStore({
this.$state = data; this.$state = data;
this.loggedIn = true; this.loggedIn = true;
appStore.userLoaded = true; appStore.userLoaded = true;
// todo: why?
// const courseSessionsStore = useCourseSessionsStore();
// await courseSessionsStore.loadCourseSessionsData();
}, },
}, },
}); });

3
server/vbv_lernwelt/course/models.py
View File

@ -236,6 +236,9 @@ class CourseSessionUser(models.Model):
"email": self.user.email, "email": self.user.email,
"avatar_url": self.user.avatar_url, "avatar_url": self.user.avatar_url,
"role": self.role, "role": self.role,
"circles": self.expert.all().values(
"id", "title", "slug", "translation_key"
),
} }

19
server/vbv_lernwelt/course/views.py
View File

@ -144,24 +144,9 @@ def get_course_session_users(request, course_slug):
course__slug=course_slug course__slug=course_slug
) )
qs = CourseSessionUser.objects.filter(course_session__in=course_sessions) qs = CourseSessionUser.objects.filter(course_session__in=course_sessions)
cockpit_user_csu = qs.filter(user_id=request.user.id)
if len(cockpit_user_csu) == 0: user_data = [csu.to_dict() for csu in qs]
return Response({"error": "User not found"}, status=404) return Response(status=200, data=user_data)
user_data = [csu.to_dict() for csu in qs.exclude(user_id=request.user.id)]
data = {
"cockpit_user": cockpit_user_csu[0].to_dict()
| {
"circles": cockpit_user_csu[0]
.expert.all()
.values("id", "title", "slug", "translation_key")
},
"users": user_data,
}
return Response(status=200, data=data)
except PermissionDenied as e: except PermissionDenied as e:
raise e raise e
except Exception as e: except Exception as e: