final

PalisadoesFoundation · Feb 26, 2025 · 13d618f · 13d618f
1 parent b08ad21
commit 13d618f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/scripts/dbManagement/helpers.ts b/scripts/dbManagement/helpers.ts
@@ -68,8 +68,14 @@ export async function askUserToContinue(question: string): Promise<boolean> {
 export async function formatDatabase(): Promise<boolean> {
 	const adminEmail = envConfig.API_ADMINISTRATOR_USER_EMAIL_ADDRESS;
 
-	type TableRow = { tablename: string };
+	if (!adminEmail) {
+		throw new Error(
+			"Missing adminEmail environment variable. Aborting to prevent accidental deletion of all users.",
+		);
+	}
 
+	type TableRow = { tablename: string };
+	const USERS_TABLE = "users";
 	try {
 		await db.transaction(async (tx) => {
 			const tables: TableRow[] = await tx.execute(sql`
@@ -78,7 +84,7 @@ export async function formatDatabase(): Promise<boolean> {
 		`);
 			const tableNames = tables
 				.map((row) => row.tablename)
-				.filter((name) => name !== "users");
+				.filter((name) => name !== USERS_TABLE);
 
 			if (tableNames.length > 0) {
 				await tx.execute(sql`
@@ -91,9 +97,9 @@ export async function formatDatabase(): Promise<boolean> {
 			}
 
 			await tx.execute(sql`
-		  DELETE FROM "users"
-		  WHERE "email_address" != ${adminEmail};
-		`);
+				DELETE FROM ${sql.identifier(USERS_TABLE)}
+				WHERE email != ${adminEmail};
+			  `);
 		});
 
 		return true;

diff --git a/scripts/dbManagement/resetData.ts b/scripts/dbManagement/resetData.ts
@@ -25,14 +25,13 @@ export async function main(): Promise<void> {
 		try {
 			await formatDatabase();
 			console.log("\n\x1b[32mSuccess:\x1b[0m Database formatted successfully");
-			console.log("\x1b[32mSuccess:\x1b[0m Administrator access preserved\n");
+			console.log("\x1b[32mSuccess:\x1b[0m Administrator preserved\n");
 		} catch (error: unknown) {
 			console.error(
 				"\n\x1b[31mError: Database formatting failed\n\x1b[0m",
 				error,
 			);
 			console.error("\n\x1b[33mRolled back to previous state\x1b[0m");
-			console.error("\n\x1b[33mPreserving administrator access\x1b[0m");
 		}
 		try {
 			await emptyMinioBucket();

diff --git a/test/scripts/dbManagement/addSampleData.test.ts b/test/scripts/dbManagement/addSampleData.test.ts
@@ -37,9 +37,6 @@ suite("addSampleData main function tests", () => {
 		expect(consoleLogSpy).toHaveBeenCalledWith(
 			expect.stringContaining("Database connected successfully"),
 		);
-		expect(consoleLogSpy).toHaveBeenCalledWith(
-			expect.stringContaining("Administrator setup complete"),
-		);
 		expect(consoleLogSpy).toHaveBeenCalledWith(
 			expect.stringContaining("Sample Data added to the database"),
 		);
@@ -57,7 +54,7 @@ suite("addSampleData main function tests", () => {
 	});
 
 	test("should throw an error when insertCollections fails", async () => {
-		// Arrange: pingDB and ensureAdministratorExists succeed, but insertCollections fails.
+		// Arrange: pingDB succeed, but insertCollections fails.
 		vi.spyOn(helpers, "pingDB").mockResolvedValue(true);
 		const errorMsg = "insert error";
 		vi.spyOn(helpers, "insertCollections").mockRejectedValue(

diff --git a/test/scripts/dbManagement/resetDB.test.ts b/test/scripts/dbManagement/resetDB.test.ts
@@ -32,7 +32,7 @@ suite("resetData main function tests", () => {
 		);
 	});
 
-	test("should log errors for failing formatDatabase, emptyMinioBucket, and ensureAdministratorExists, but not throw", async () => {
+	test("should log errors for failing formatDatabase, emptyMinioBucket but not throw", async () => {
 		// Arrange: simulate user confirming and pingDB succeeding.
 		vi.spyOn(helpers, "askUserToContinue").mockResolvedValue(true);
 		vi.spyOn(helpers, "pingDB").mockResolvedValue(true);
@@ -65,22 +65,10 @@ suite("resetData main function tests", () => {
 		expect(consoleErrorSpy).toHaveBeenCalledWith(
 			expect.stringContaining("Rolled back to previous state"),
 		);
-		expect(consoleErrorSpy).toHaveBeenCalledWith(
-			expect.stringContaining("Preserving administrator access"),
-		);
 		expect(consoleErrorSpy).toHaveBeenCalledWith(
 			expect.stringContaining("Error: Bucket formatting failed"),
 			expect.any(Error),
 		);
-		expect(consoleErrorSpy).toHaveBeenCalledWith(
-			expect.stringContaining("Error: Administrator creation failed"),
-			expect.any(Error),
-		);
-		expect(consoleErrorSpy).toHaveBeenCalledWith(
-			expect.stringContaining(
-				"Administrator access may be lost, try reformatting DB to restore access",
-			),
-		);
 	});
 
 	test("should log success messages when all operations succeed", async () => {