diff --git a/app/services/grade_service.ts b/app/services/grade_service.ts index 09b0b21..59e7db1 100644 --- a/app/services/grade_service.ts +++ b/app/services/grade_service.ts @@ -56,6 +56,14 @@ export class GradeService { return colles.length ? this.calculateAverage(colles) : 0 } + private serializeGrades(colles: Colle[]) { + return colles.map((colle) => ({ + date: colle.date.toMillis(), + subject: colle.subject.name, + grade: colle.grade, + })) + } + public async getMonthGrade(userId: number, startDate: DateTime) { const colles = await this.getColles(userId, startDate, 1) const subjects = this.getSubjects(colles) @@ -87,7 +95,7 @@ export class GradeService { periodStartDate = periodEndDate } - return { grades: results, subjects } + return { averages: results, subjects, grades: this.serializeGrades(colles) } } public async getPeriodGrade(userId: number, startDate: DateTime, months: number = 0) { @@ -124,7 +132,7 @@ export class GradeService { index++ } - return { grades: results, subjects } + return { averages: results, subjects, grades: this.serializeGrades(colles) } } private reduce(subjectAverages: SubjectPerformance[]) { diff --git a/build.sh b/build.sh index 521dd51..bbc8a07 100755 --- a/build.sh +++ b/build.sh @@ -1,2 +1,2 @@ docker build -t git.lamy-charrier.fr/khollise/api:v1.0 . -# docker push git.lamy-charrier.fr/khollise/api:v1.0 \ No newline at end of file +docker push git.lamy-charrier.fr/khollise/api:v1.0 \ No newline at end of file