devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solved a problem with the assignees stuff related to the query

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-11-07 12:51:14 +00:00
parent fae7b729fe
commit 78cf011bf7
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/pages/official-exam.tsx
View File

@@ -4,34 +4,34 @@ import Layout from "@/components/High/Layout";
import Button from "@/components/Low/Button"; import Button from "@/components/Low/Button";
import Separator from "@/components/Low/Separator"; import Separator from "@/components/Low/Separator";
import ProfileSummary from "@/components/ProfileSummary"; import ProfileSummary from "@/components/ProfileSummary";
import {Session} from "@/hooks/useSessions"; import { Session } from "@/hooks/useSessions";
import {Grading} from "@/interfaces"; import { Grading } from "@/interfaces";
import {EntityWithRoles} from "@/interfaces/entity"; import { EntityWithRoles } from "@/interfaces/entity";
import {Exam} from "@/interfaces/exam"; import { Exam } from "@/interfaces/exam";
import { InviteWithEntity } from "@/interfaces/invite"; import { InviteWithEntity } from "@/interfaces/invite";
import {Assignment} from "@/interfaces/results"; import { Assignment } from "@/interfaces/results";
import {Stat, User} from "@/interfaces/user"; import { Stat, User } from "@/interfaces/user";
import {sessionOptions} from "@/lib/session"; import { sessionOptions } from "@/lib/session";
import useExamStore from "@/stores/examStore"; import useExamStore from "@/stores/examStore";
import {findBy, mapBy, redirect, serialize} from "@/utils"; import { findBy, mapBy, redirect, serialize } from "@/utils";
import { requestUser } from "@/utils/api"; import { requestUser } from "@/utils/api";
import {activeAssignmentFilter} from "@/utils/assignments"; import { activeAssignmentFilter } from "@/utils/assignments";
import {getAssignmentsByAssignee} from "@/utils/assignments.be"; import { getAssignmentsByAssignee } from "@/utils/assignments.be";
import {getEntitiesWithRoles} from "@/utils/entities.be"; import { getEntitiesWithRoles } from "@/utils/entities.be";
import {getExamsByIds} from "@/utils/exams.be"; import { getExamsByIds } from "@/utils/exams.be";
import {sortByModule} from "@/utils/moduleUtils"; import { sortByModule } from "@/utils/moduleUtils";
import {checkAccess} from "@/utils/permissions"; import { checkAccess } from "@/utils/permissions";
import {getSessionsByUser} from "@/utils/sessions.be"; import { getSessionsByUser } from "@/utils/sessions.be";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
import {withIronSessionSsr} from "iron-session/next"; import { withIronSessionSsr } from "iron-session/next";
import {uniqBy} from "lodash"; import { uniqBy } from "lodash";
import moment from "moment"; import moment from "moment";
import Head from "next/head"; import Head from "next/head";
import {useRouter} from "next/router"; import { useRouter } from "next/router";
import { useMemo, useState } from "react"; import { useMemo, useState } from "react";
import {BsArrowRepeat} from "react-icons/bs"; import { BsArrowRepeat } from "react-icons/bs";
import {ToastContainer} from "react-toastify"; import { ToastContainer } from "react-toastify";
interface Props { interface Props {
user: User; user: User;
@@ -44,7 +44,7 @@ interface Props {
grading: Grading; grading: Grading;
} }
export const getServerSideProps = withIronSessionSsr(async ({req, res}) => { export const getServerSideProps = withIronSessionSsr(async ({ req, res }) => {
const user = await requestUser(req, res) const user = await requestUser(req, res)
const destination = Buffer.from(req.url || "/").toString("base64") const destination = Buffer.from(req.url || "/").toString("base64")
if (!user) return redirect(`/login?destination=${destination}`) if (!user) return redirect(`/login?destination=${destination}`)
@@ -55,21 +55,21 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
const entityIDS = mapBy(user.entities, "id") || []; const entityIDS = mapBy(user.entities, "id") || [];
const entities = await getEntitiesWithRoles(entityIDS); const entities = await getEntitiesWithRoles(entityIDS);
const assignments = await getAssignmentsByAssignee(user.id, {archived: {$ne: true}}); const assignments = await getAssignmentsByAssignee(user.id, { archived: { $ne: true } });
const sessions = await getSessionsByUser(user.id, 0, { "assignment.id": { $in: mapBy(assignments, 'id') } }); const sessions = await getSessionsByUser(user.id, 0, { "assignment.id": { $in: mapBy(assignments, 'id') } });
const examIDs = uniqBy( const examIDs = uniqBy(
assignments.flatMap((a) => assignments.flatMap((a) =>
a.exams.filter((e) => e.assignee === user.id).map((e) => ({module: e.module, id: e.id, key: `${e.module}_${e.id}`})), a.exams.filter((e) => e.assignee === user.id).map((e) => ({ module: e.module, id: e.id, key: `${e.module}_${e.id}` })),
), ),
"key", "key",
); );
const exams = await getExamsByIds(examIDs); const exams = await getExamsByIds(examIDs);
return {props: serialize({user, entities, assignments, exams, sessions})}; return { props: serialize({ user, entities, assignments, exams, sessions }) };
}, sessionOptions); }, sessionOptions);
export default function OfficialExam({user, entities, assignments, sessions, exams}: Props) { export default function OfficialExam({ user, entities, assignments, sessions, exams }: Props) {
const [isLoading, setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false)
const router = useRouter(); const router = useRouter();
@@ -98,7 +98,7 @@ export default function OfficialExam({user, entities, assignments, sessions, exa
}; };
const loadSession = async (session: Session) => { const loadSession = async (session: Session) => {
state.setShuffles(session.userSolutions.map((x) => ({exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : []}))); state.setShuffles(session.userSolutions.map((x) => ({ exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : [] })));
state.setSelectedModules(session.selectedModules); state.setSelectedModules(session.selectedModules);
state.setExam(session.exam); state.setExam(session.exam);
state.setExams(session.exams); state.setExams(session.exams);
@@ -115,11 +115,11 @@ export default function OfficialExam({user, entities, assignments, sessions, exa
router.push("/exam"); router.push("/exam");
}; };
const logout = async () => { const logout = async () => {
axios.post("/api/logout").finally(() => { axios.post("/api/logout").finally(() => {
setTimeout(() => router.reload(), 500); setTimeout(() => router.reload(), 500);
}); });
}; };
const studentAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]); const studentAssignments = useMemo(() => assignments.filter(activeAssignmentFilter), [assignments]);
const assignmentSessions = useMemo(() => sessions.filter(s => mapBy(studentAssignments, 'id').includes(s.assignment?.id || "")), [sessions, studentAssignments]) const assignmentSessions = useMemo(() => sessions.filter(s => mapBy(studentAssignments, 'id').includes(s.assignment?.id || "")), [sessions, studentAssignments])

30
src/utils/assignments.be.ts
View File

@@ -1,19 +1,19 @@
import client from "@/lib/mongodb"; import client from "@/lib/mongodb";
import {Assignment} from "@/interfaces/results"; import { Assignment } from "@/interfaces/results";
import {getAllAssignersByCorporate} from "@/utils/groups.be"; import { getAllAssignersByCorporate } from "@/utils/groups.be";
import {Type} from "@/interfaces/user"; import { Type } from "@/interfaces/user";
const db = client.db(process.env.MONGODB_DB); const db = client.db(process.env.MONGODB_DB);
export const getAssignmentsByAssigner = async (id: string, startDate?: Date, endDate?: Date) => { export const getAssignmentsByAssigner = async (id: string, startDate?: Date, endDate?: Date) => {
let query: any = {assigner: id}; let query: any = { assigner: id };
if (startDate) { if (startDate) {
query.startDate = {$gte: startDate.toISOString()}; query.startDate = { $gte: startDate.toISOString() };
} }
if (endDate) { if (endDate) {
query.endDate = {$lte: endDate.toISOString()}; query.endDate = { $lte: endDate.toISOString() };
} }
return await db.collection("assignments").find<Assignment>(query).toArray(); return await db.collection("assignments").find<Assignment>(query).toArray();
@@ -24,39 +24,39 @@ export const getAssignments = async () => {
}; };
export const getAssignment = async (id: string) => { export const getAssignment = async (id: string) => {
return await db.collection("assignments").findOne<Assignment>({id}); return await db.collection("assignments").findOne<Assignment>({ id });
}; };
export const getAssignmentsByAssignee = async (id: string, filter?: {[key in keyof Partial<Assignment>]: any}) => { export const getAssignmentsByAssignee = async (id: string, filter?: { [key in keyof Partial<Assignment>]: any }) => {
return await db return await db
.collection("assignments") .collection("assignments")
.find<Assignment>({assignees: [id], ...(!filter ? {} : filter)}) .find<Assignment>({ assignees: id, ...(!filter ? {} : filter) })
.toArray(); .toArray();
}; };
export const getAssignmentsByAssignerBetweenDates = async (id: string, startDate: Date, endDate: Date) => { export const getAssignmentsByAssignerBetweenDates = async (id: string, startDate: Date, endDate: Date) => {
return await db.collection("assignments").find<Assignment>({assigner: id}).toArray(); return await db.collection("assignments").find<Assignment>({ assigner: id }).toArray();
}; };
export const getAssignmentsByAssigners = async (ids: string[], startDate?: Date, endDate?: Date) => { export const getAssignmentsByAssigners = async (ids: string[], startDate?: Date, endDate?: Date) => {
return await db return await db
.collection("assignments") .collection("assignments")
.find<Assignment>({ .find<Assignment>({
assigner: {$in: ids}, assigner: { $in: ids },
...(!!startDate ? {startDate: {$gte: startDate.toISOString()}} : {}), ...(!!startDate ? { startDate: { $gte: startDate.toISOString() } } : {}),
...(!!endDate ? {endDate: {$lte: endDate.toISOString()}} : {}), ...(!!endDate ? { endDate: { $lte: endDate.toISOString() } } : {}),
}) })
.toArray(); .toArray();
}; };
export const getEntityAssignments = async (id: string) => { export const getEntityAssignments = async (id: string) => {
return await db.collection("assignments").find<Assignment>({entity: id}).toArray(); return await db.collection("assignments").find<Assignment>({ entity: id }).toArray();
}; };
export const getEntitiesAssignments = async (ids: string[]) => { export const getEntitiesAssignments = async (ids: string[]) => {
return await db return await db
.collection("assignments") .collection("assignments")
.find<Assignment>({entity: {$in: ids}}) .find<Assignment>({ entity: { $in: ids } })
.toArray(); .toArray();
}; };