tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes

Browse source
This commit is contained in:
Gabriellvl 2025-04-03 11:00:56 +02:00
commit 7374511e31
7 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/data/classes/class-join-request-repository.ts
View file

@ -2,7 +2,7 @@ import { DwengoEntityRepository } from '../dwengo-entity-repository.js';
import { Class } from '../../entities/classes/class.entity.js';
import { ClassJoinRequest } from '../../entities/classes/class-join-request.entity.js';
import { Student } from '../../entities/users/student.entity.js';
import {ClassJoinRequestStatus} from "@dwengo-1/common/util/class-join-request";
import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
export class ClassJoinRequestRepository extends DwengoEntityRepository<ClassJoinRequest> {
public async findAllRequestsBy(requester: Student): Promise<ClassJoinRequest[]> {

2
backend/src/data/themes.ts
View file

@ -1,4 +1,4 @@
import {Theme} from "@dwengo-1/common/interfaces/theme";
import { Theme } from '@dwengo-1/common/interfaces/theme';
export const themes: Theme[] = [
{

4
backend/src/interfaces/student-request.ts
View file

@ -3,8 +3,8 @@ import { ClassJoinRequest } from '../entities/classes/class-join-request.entity.
import { getClassJoinRequestRepository } from '../data/repositories.js';
import { Student } from '../entities/users/student.entity.js';
import { Class } from '../entities/classes/class.entity.js';
import {ClassJoinRequestDTO} from "@dwengo-1/common/interfaces/class-join-request";
import {ClassJoinRequestStatus} from "@dwengo-1/common/util/class-join-request";
import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
import { ClassJoinRequestStatus } from '@dwengo-1/common/util/class-join-request';
export function mapToStudentRequestDTO(request: ClassJoinRequest): ClassJoinRequestDTO {
return {

2
backend/src/services/students.ts
View file

@ -22,7 +22,7 @@ import { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
import { GroupDTO } from '@dwengo-1/common/interfaces/group';
import { SubmissionDTO, SubmissionDTOId } from '@dwengo-1/common/interfaces/submission';
import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
import {ClassJoinRequestDTO} from '@dwengo-1/common/interfaces/class-join-request';
import { ClassJoinRequestDTO } from '@dwengo-1/common/interfaces/class-join-request';
export async function getAllStudents(full: boolean): Promise<StudentDTO[] | string[]> {
const studentRepository = getStudentRepository();

1
backend/tests/controllers/students.test.ts
View file

@ -22,7 +22,6 @@ import { ConflictException } from '../../src/exceptions/conflict-exception.js';
import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js';
import { StudentDTO } from '@dwengo-1/common/interfaces/student';
describe('Student controllers', () => {
let req: Partial<Request>;
let res: Partial<Response>;

2
common/src/interfaces/class-join-request.ts
View file

@ -1,5 +1,5 @@
import { StudentDTO } from './student';
import {ClassJoinRequestStatus} from "../util/class-join-request";
import { ClassJoinRequestStatus } from '../util/class-join-request';
export interface ClassJoinRequestDTO {
requester: StudentDTO;

2
frontend/src/queries/themes.ts
View file

@ -1,7 +1,7 @@
import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
import { type MaybeRefOrGetter, toValue } from "vue";
import type { Theme } from "@dwengo-1/interfaces/theme";
import {getThemeController} from "@/controllers/controllers.ts";
import { getThemeController } from "@/controllers/controllers.ts";
const themeController = getThemeController();