preserve scraping paths

Author: vis97c

functions/src/types/entities.ts

@@ -16,6 +16,11 @@ export interface FirebaseData extends Record<string, any> {
 	updatedByRef?: DocumentReference<UserData>;
 }
 
+/**
+ * Scraped with info
+ */
+export type ScrapedWith = [eSIALevel, eSIAPlace, uSIAFaculty?, uSIAProgram?, eSIATypology?];
+
 /**
  * Firebase log
  *
@@ -245,4 +250,9 @@ export interface CourseData extends FirebaseData {
 	scrapedAt?: Timestamp;
 	/** @automated Last scrape date with errors */
 	scrapedWithErrorsAt?: Timestamp;
+	/**
+	 * Scrapper was able to get the course with this info
+	 * @automation
+	 */
+	lastScrapedWith?: ScrapedWith;
 }

pages/administrar/cursos.vue

@@ -74,20 +74,12 @@
 		middleware: ["can-develop"],
 	});
 
-	function mapCourse({
-		updatedAt,
-		createdAt,
-		scrapedAt,
-		scrapedWithErrorsAt,
-		updatedBy,
-		createdBy,
-		...course
-	}: Course) {
+	function mapCourse(course: Course) {
 		return {
+			id: course.id,
 			code: course.code,
-			updatedAt,
-			scrapedAt,
-			updatedBy,
+			scrapedAt: course.scrapedAt,
+			updatedBy: course.updatedBy,
 			course,
 			logs: 1,
 		};

pages/cursos/[courseId].vue

@@ -26,7 +26,7 @@
 				<div v-if="withScrapingErrors" class="flx --flxColumn --flx-center --width-100">
 					<XamuBoxMessage :theme="eColors.DANGER">
 						<div class="txt --txtAlign-center">
-							<p>Nos ha sido imposible obtener datos de este curso.</p>
+							<p>Lo sentimos, nos ha sido imposible obtener datos de este curso.</p>
 							<p class="--txtSize-sm">
 								Aunque el curso esta reportado, su información parece ser inadecuada
 								y no nos permite encontrarlo en el SIA.
@@ -94,7 +94,8 @@
 											class="flx --flxColumn --flx-start-stretch --maxWidth-440"
 										>
 											<div class="txt">
-												<p>
+												<p>¡Gracias por ayudarnos a mejorar!</p>
+												<p class="--txtSize-sm">
 													*Idealmente, los datos deben coincidir con los
 													mismos pasos que seguirías para buscar el curso
 													en el SIA.
@@ -269,7 +270,6 @@
 	import type { EnrolledGroup } from "~/functions/src/types/entities";
 	import type { CourseValues } from "~/resources/types/values";
 	import { resolveSnapshotDefaults } from "~/resources/utils/firestore";
-	import { eSIALevel, eSIAPlace } from "~/functions/src/types/SIA";
 
 	import { TableTeachersList, TableEnroll, TableWeek } from "#components";
 
@@ -592,24 +592,11 @@
 
 		scraping.value = true;
 
-		const {
-			code = "",
-			level = eSIALevel.PREGRADO,
-			place = eSIAPlace.BOGOTÁ,
-			faculty,
-			faculties = [faculty],
-			programs = [],
-			typologies = [],
-		} = firebaseCourse;
+		const { code = "" } = firebaseCourse;
 
 		try {
 			// Scrape from old SIA. Do not refetch from hydration
 			await useFetchQuery<boolean>("/api/groups/scrape", {
-				level,
-				place,
-				faculties,
-				programs,
-				typologies,
 				code,
 			});
 		} catch (err) {
@@ -655,14 +642,18 @@
 				});
 			}
 
+			const firebaseCourse: Course = resolveSnapshotDefaults(
+				snapshot.ref.path,
+				snapshot.data()
+			);
 			const {
-				createdByRef,
-				updatedByRef,
+				name,
+				description,
+				alternativeNames = [name],
+				updatedAt,
 				scrapedAt,
 				scrapedWithErrorsAt,
-				...firebaseCourse
-			}: Course = resolveSnapshotDefaults(snapshot.ref.path, snapshot.data());
-			const { name, description, alternativeNames = [name], updatedAt } = firebaseCourse;
+			} = firebaseCourse;
 
 			// Update with hydration conditionally
 			if (course.value?.updatedAt !== updatedAt) {

resources/types/scraping.ts

@@ -1,8 +1,10 @@
+import type { ScrapedWith } from "~/functions/src/types/entities";
 import type { Group } from "./entities";
 
 export interface ScrapedCourse {
 	groups?: Group[];
 	name: string;
 	code: string;
 	description: string;
+	lastScrapedWith: ScrapedWith;
 }

resources/utils/promises.ts

@@ -16,10 +16,10 @@ export function TimedPromise<T>(executor: tPromiseExecutor<T>, fallback?: T, tim
 				if (fallback) {
 					console.warn("Timed out with fallback");
 
-					return resolve(fallback);
+					resolve(fallback);
+				} else {
+					reject("Timed out");
 				}
-
-				reject("Timed out");
 			}, timeoutSeconds * 1000);
 		}),
 	]);