Skip to content
Snippets Groups Projects
Commit 563ed76a authored by michael.minelli's avatar michael.minelli
Browse files

ExerciseRoutes => Reformat code

parent 2ad95314
No related branches found
No related tags found
No related merge requests found
...@@ -32,21 +32,36 @@ import ExerciseResultsFile from '../shared/types/Dojo/ExerciseResults ...@@ -32,21 +32,36 @@ import ExerciseResultsFile from '../shared/types/Dojo/ExerciseResults
class ExerciseRoutes implements RoutesManager { class ExerciseRoutes implements RoutesManager {
private readonly exerciseValidator: ExpressValidator.Schema = { private readonly exerciseValidator: ExpressValidator.Schema = {
members: { members: {
trim: true, notEmpty: true, customSanitizer: DojoValidators.jsonSanitizer trim : true,
notEmpty : true,
customSanitizer: DojoValidators.jsonSanitizer
} }
}; };
private readonly resultValidator: ExpressValidator.Schema = { private readonly resultValidator: ExpressValidator.Schema = {
exitCode : { exitCode : {
isInt: true, toInt: true isInt: true,
}, commit : { toInt: true
trim: true, notEmpty: true, customSanitizer: DojoValidators.jsonSanitizer },
}, results : { commit : {
trim: true, notEmpty: true, custom: DojoValidators.exerciseResultsValidator, customSanitizer: DojoValidators.jsonSanitizer trim : true,
}, files : { notEmpty : true,
trim: true, notEmpty: true, customSanitizer: DojoValidators.jsonSanitizer customSanitizer: DojoValidators.jsonSanitizer
}, archiveBase64: { },
isBase64: true, notEmpty: true results : {
trim : true,
notEmpty : true,
custom : DojoValidators.exerciseResultsValidator,
customSanitizer: DojoValidators.jsonSanitizer
},
files : {
trim : true,
notEmpty : true,
customSanitizer: DojoValidators.jsonSanitizer
},
archiveBase64: {
isBase64: true,
notEmpty: true
} }
}; };
...@@ -130,12 +145,23 @@ class ExerciseRoutes implements RoutesManager { ...@@ -130,12 +145,23 @@ class ExerciseRoutes implements RoutesManager {
const exercise: Exercise = await db.exercise.create({ const exercise: Exercise = await db.exercise.create({
data: { data: {
id: exerciseId, assignmentName: assignment.name, name: repository.name, secret: secret, gitlabId: repository.id, gitlabLink: repository.web_url, gitlabCreationInfo: repository as unknown as Prisma.JsonObject, gitlabLastInfo: repository as unknown as Prisma.JsonObject, gitlabLastInfoDate: new Date(), members: { id : exerciseId,
assignmentName : assignment.name,
name : repository.name,
secret : secret,
gitlabId : repository.id,
gitlabLink : repository.web_url,
gitlabCreationInfo: repository as unknown as Prisma.JsonObject,
gitlabLastInfo : repository as unknown as Prisma.JsonObject,
gitlabLastInfoDate: new Date(),
members : {
connectOrCreate: [ ...params.members.map(gitlabUser => { connectOrCreate: [ ...params.members.map(gitlabUser => {
return { return {
create: { create: {
gitlabId: gitlabUser.id, firstname: gitlabUser.name gitlabId : gitlabUser.id,
}, where: { firstname: gitlabUser.name
},
where : {
gitlabId: gitlabUser.id gitlabId: gitlabUser.id
} }
}; };
...@@ -186,7 +212,9 @@ class ExerciseRoutes implements RoutesManager { ...@@ -186,7 +212,9 @@ class ExerciseRoutes implements RoutesManager {
})); }));
return req.session.sendResponse(res, StatusCodes.OK, { return req.session.sendResponse(res, StatusCodes.OK, {
assignment: (req.boundParams.exercise as Exercise).assignment, assignmentFile: dojoAssignmentFile, immutable: immutableFiles assignment : (req.boundParams.exercise as Exercise).assignment,
assignmentFile: dojoAssignmentFile,
immutable : immutableFiles
}); });
} }
...@@ -196,7 +224,12 @@ class ExerciseRoutes implements RoutesManager { ...@@ -196,7 +224,12 @@ class ExerciseRoutes implements RoutesManager {
const result = await db.result.create({ const result = await db.result.create({
data: { data: {
exerciseId: exercise.id, exitCode: params.exitCode, success: params.results.success, commit: params.commit, results: params.results as unknown as Prisma.JsonObject, files: params.files exerciseId: exercise.id,
exitCode : params.exitCode,
success : params.results.success!,
commit : params.commit,
results : params.results as unknown as Prisma.JsonObject,
files : params.files
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment