Moving assignement transformation away

a2br · Dec 26, 2020 · 3363094 · 3363094
1 parent d2fe6a6
commit 3363094
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 38 deletions.
diff --git a/lib/account_types/Student.ts b/lib/account_types/Student.ts
@@ -9,7 +9,12 @@ import {
 	isStudentAccount,
 	isFailure,
 } from "../types";
-import { getMainAccount, getTextbookPage, toISODate } from "../functions";
+import {
+	cleanAssignements,
+	getMainAccount,
+	getTextbookPage,
+	toISODate,
+} from "../functions";
 import { APIError } from "../errors";
 
 export class Student extends Account {
@@ -36,35 +41,13 @@ export class Student extends Account {
 
 	async getHomework(date: Date | string | string) {
 		const d = toISODate(date);
-
 		const textbook = await getTextbookPage(this.account.id, this.token, d);
 		if (isFailure(textbook))
 			throw new APIError(`${textbook.code} | ${textbook.message}`);
-		const homework = textbook.data.matieres;
-		return homework.map((v) => ({
-			id: v.id,
-			interro: v.interrogation,
-			matiere: {
-				nom: v.matiere,
-				code: v.codeMatiere,
-			},
-			prof: v.nomProf.startsWith(" par ") ? v.nomProf.substr(5) : v.nomProf,
-			contenuDeSeance: {
-				idDevoir: v.contenuDeSeance.idDevoir,
-				contenu: {
-					original: v.contenuDeSeance.contenu,
-					html: Buffer.from(v.contenuDeSeance.contenu, "base64").toString(),
-					text: htmlToText(
-						Buffer.from(v.contenuDeSeance.contenu, "base64").toString(),
-						{
-							wordwrap: false,
-						}
-					),
-				},
-				documents: v.contenuDeSeance.documents,
-			},
-			_raw: v,
-		}));
+
+		const homework = textbook.data;
+		const cleaned = cleanAssignements(homework);
+		return cleaned;
 	}
 
 	async getMessages(direction: "received" | "sent" = "received") {}

diff --git a/lib/functions/index.ts b/lib/functions/index.ts
@@ -1,14 +1,18 @@
 import { login, getMainAccount } from "./login";
 import { toISODate } from "./util";
 
+export { login, getMainAccount };
+export { toISODate };
+
+//! TEXTBOOK
+
 import { getTextbook, getTextbookPage } from "./student/textbook";
+import { cleanAssignements } from "./student/textbook";
+
+export { getTextbook, getTextbookPage, cleanAssignements };
+
+//! MAILBOX
+
 import { getMessages } from "./student/mailbox";
 
-export {
-	login,
-	toISODate,
-	getMainAccount,
-	getTextbook,
-	getTextbookPage,
-	getMessages,
-};
+export { getMessages };
diff --git a/lib/functions/student/textbook.ts b/lib/functions/student/textbook.ts
@@ -1,6 +1,9 @@
 import fetch from "node-fetch";
+import { htmlToText } from "html-to-text";
 
 import { _textbookRes, _textbookDateRes } from "../../types";
+import { _textbookDateAssignement, assignement } from "../../types";
+import { toISODate } from "../util";
 
 /**
  * @param id Account id
@@ -49,3 +52,37 @@ export async function getTextbookPage(id: number, token: string, date: string) {
 	let body: _textbookDateRes = await edRes.json();
 	return body;
 }
+
+export function cleanAssignements(data: {
+	date: string;
+	matieres: _textbookDateAssignement[];
+}) {
+	const assignements = data.matieres;
+	const date = toISODate(data.date); // Should not make any change
+	const cleaned: assignement[] = assignements.map((v) => ({
+		id: v.id,
+		date: date,
+		interro: v.interrogation,
+		matiere: {
+			nom: v.matiere,
+			code: v.codeMatiere,
+		},
+		prof: v.nomProf.startsWith(" par ") ? v.nomProf.substr(5) : v.nomProf,
+		contenuDeSeance: {
+			idDevoir: v.contenuDeSeance.idDevoir,
+			contenu: {
+				original: v.contenuDeSeance.contenu,
+				html: Buffer.from(v.contenuDeSeance.contenu, "base64").toString(),
+				text: htmlToText(
+					Buffer.from(v.contenuDeSeance.contenu, "base64").toString(),
+					{
+						wordwrap: false,
+					}
+				),
+			},
+			documents: v.contenuDeSeance.documents,
+		},
+		_raw: v,
+	}));
+	return cleaned;
+}
diff --git a/lib/types/index.ts b/lib/types/index.ts
@@ -17,9 +17,10 @@ export { teacherAccount, isTeacherAccount };
 //! TEXTBOOK
 
 import { _textbookRes, _textbookDateRes } from "./student/textbook";
-import { assignement } from "./student/textbook";
+import { _textbookDateAssignement, assignement } from "./student/textbook";
 
-export { _textbookRes, _textbookDateRes, assignement };
+export { _textbookRes, _textbookDateRes };
+export { _textbookDateAssignement, assignement };
 
 //! MAILBOX
 

diff --git a/lib/types/student/textbook.ts b/lib/types/student/textbook.ts
@@ -36,7 +36,7 @@ export type _textbookDateResSuccess = {
 	};
 };
 
-type _textbookDateAssignement = {
+export type _textbookDateAssignement = {
 	entityCode: string;
 	entityLibelle: string;
 	entityType: string;