refactor: update imports and enhance route setup for better database management

Author: aeltorio

cloudflare-worker/eslint.config.js

@@ -9,6 +9,7 @@ export default [
   eslint.configs.recommended,
   {
     files: ['**/*.{js,ts}'],
+    
     languageOptions: {
       ecmaVersion: 2021,
       sourceType: 'module',
@@ -99,6 +100,7 @@ export default [
   },
   {
     ignores: [
+      'jest.config.ts',
       '.now/*',
       '*.css',
       '.changeset',

cloudflare-worker/src/auth0.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /**
  * MIT License
  *

cloudflare-worker/src/db/d1-db.ts

@@ -42,7 +42,7 @@ import {
 	PurchasesRepository,
 	RefundsRepository,
 	TestersRepository,
-} from "./db-type";
+} from "./db";
 
 /**
  * Database implementation for the Cloudflare D1 database
@@ -783,7 +783,7 @@ export class CloudflareD1DB implements FeedbackFlowDB {
 	 *
 	 * @throws {Error} Always throws an error as this operation is not supported in Cloudflare D1
 	 */
-	async reset(newData: any): Promise<void> {
+	async reset(_newData: any): Promise<void> {
 		throw new Error(
 			"Not implemented for Cloudflare D1. Use database migrations instead.",
 		);

cloudflare-worker/src/db/db-type.ts cloudflare-worker/src/db/db.tscloudflare-worker/src/db/db-type.ts renamed to cloudflare-worker/src/db/db.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /**
  * MIT License
  *
@@ -22,6 +23,7 @@
  * SOFTWARE.
  */
 
+import { mockData } from "../test/mock-data";
 import {
 	Feedback,
 	IdMapping,
@@ -31,6 +33,9 @@ import {
 	Tester,
 } from "../types/data";
 
+import { CloudflareD1DB } from "./d1-db";
+import { InMemoryDB } from "./in-memory-db";
+
 /**
  * Interface for database structure
  */
@@ -225,3 +230,26 @@ export abstract class FeedbackFlowDB {
 	 */
 	abstract restoreFromJson?(backup: string): Promise<void>;
 }
+
+/**
+ * Singleton instance of the database
+ */
+let dbInstance: FeedbackFlowDB | null = null;
+
+/**
+ * Get the database instance based on the environment configuration
+ * @param env Environment configuration
+ */
+export function getDatabase(env: Env): FeedbackFlowDB {
+	if (dbInstance === null) {
+		// Initialiser la base de données en fonction de ENV.DB_BACKEND
+		dbInstance =
+			env.DB_BACKEND !== "memory"
+				? new CloudflareD1DB(env.FeedbackFlowDB)
+				: new InMemoryDB(mockData);
+
+		console.log(`Database initialized with backend: ${env.DB_BACKEND}`);
+	}
+
+	return dbInstance;
+}

cloudflare-worker/src/db/in-memory-db.ts

@@ -28,7 +28,7 @@ import { v4 as uuidv4 } from "uuid";
 
 import { Feedback, Publication, Purchase, Refund, Tester } from "../types/data";
 
-import { DATABASESCHEMA, FeedbackFlowDB } from "./db-type";
+import { DATABASESCHEMA, FeedbackFlowDB } from "./db";
 
 /**
  * In-memory database class for testing purposes
@@ -308,7 +308,8 @@ export class InMemoryDB implements FeedbackFlowDB {
 		 * @param {function} fn - Predicate function to filter purchases
 		 * @returns {Purchase|undefined} The first matching purchase or undefined if not found
 		 */
-		find: async (fn: (purchase: Purchase) => boolean) => this.data.purchases.find(fn),
+		find: async (fn: (purchase: Purchase) => boolean) =>
+			this.data.purchases.find(fn),
 
 		/**
 		 * Filter purchases based on the provided condition
@@ -373,7 +374,8 @@ export class InMemoryDB implements FeedbackFlowDB {
 		 * @param {function} fn - Predicate function to filter feedback
 		 * @returns {Feedback|undefined} The first matching feedback or undefined if not found
 		 */
-		find: async (fn: (feedback: Feedback) => boolean) => this.data.feedbacks.find(fn),
+		find: async (fn: (feedback: Feedback) => boolean) =>
+			this.data.feedbacks.find(fn),
 
 		/**
 		 * Filter feedback based on the provided condition
@@ -457,7 +459,8 @@ export class InMemoryDB implements FeedbackFlowDB {
 		 * @param {function} fn - Predicate function to filter refunds
 		 * @returns {Refund[]} Array of refunds matching the condition
 		 */
-		filter: async (fn: (refund: Refund) => boolean) => this.data.refunds.filter(fn),
+		filter: async (fn: (refund: Refund) => boolean) =>
+			this.data.refunds.filter(fn),
 
 		/**
 		 * Add a new refund to the database and mark the associated purchase as refunded

cloudflare-worker/src/routes/index.ts

@@ -35,20 +35,18 @@ import {
 	TesterSortCriteria,
 	PurchaseSortCriteria,
 } from "../types/data";
-import { mockData } from "../test/mock-data";
 import { InMemoryDB } from "../db/in-memory-db";
+import { getDatabase } from "../db/db";
 
 import { Router } from "./router";
 
-// Use the inMemory database with mock data
-const db = new InMemoryDB(mockData);
-
 // Tester Management
 const testerRoutes = (router: Router, env: Env) => {
 	// Get all testers with pagination and sort, requires admin permission
 	router.get(
 		"/api/testers",
 		async (request) => {
+			const db = getDatabase(env);
 			const url = new URL(request.url);
 			const page = parseInt(url.searchParams.get("page") || "1");
 			const limit = parseInt(url.searchParams.get("limit") || "10");
@@ -101,6 +99,8 @@ const testerRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/tester",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const { name, ids: _ids } =
 					(await request.json()) as TesterCreateRequest;
@@ -198,6 +198,8 @@ const testerRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/tester/ids",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const testerId = router.jwtPayload.sub;
 
@@ -311,6 +313,8 @@ const testerRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/tester",
 		async () => {
+			const db = getDatabase(env);
+
 			// Get user ID from authenticated user
 			const userId = router.jwtPayload.sub;
 
@@ -370,6 +374,8 @@ const purchaseRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/purchase",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const data = (await request.json()) as PurchaseCreateRequest;
 				const { date, order, description, amount, screenshot } = data;
@@ -444,6 +450,8 @@ const purchaseRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/purchase/:id",
 		async (request) => {
+			const db = getDatabase(env);
+
 			const { id } = request.params;
 
 			// Find purchase in the database
@@ -490,6 +498,7 @@ const purchaseRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/purchases/not-refunded",
 		async (request) => {
+			const db = getDatabase(env);
 			const url = new URL(request.url);
 			const page = parseInt(url.searchParams.get("page") || "1");
 			const limit = parseInt(url.searchParams.get("limit") || "10");
@@ -579,6 +588,7 @@ const purchaseRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/purchases/refunded",
 		async (request) => {
+			const db = getDatabase(env);
 			const url = new URL(request.url);
 			const page = parseInt(url.searchParams.get("page") || "1");
 			const limit = parseInt(url.searchParams.get("limit") || "10");
@@ -671,6 +681,8 @@ const feedbackRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/feedback",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const { date, purchase, feedback } =
 					(await request.json()) as FeedbackCreateRequest;
@@ -727,6 +739,8 @@ const feedbackRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/publish",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const { date, purchase, screenshot } =
 					(await request.json()) as PublishCreateRequest;
@@ -782,6 +796,7 @@ const feedbackRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/publish/:id",
 		async (request) => {
+			const db = getDatabase(env);
 			const { id } = request.params;
 
 			// Find publication in the database
@@ -828,6 +843,8 @@ const refundRoutes = (router: Router, env: Env) => {
 	router.post(
 		"/api/refund",
 		async (request) => {
+			const db = getDatabase(env);
+
 			try {
 				const { date, purchase, refunddate, amount } =
 					(await request.json()) as RefundCreateRequest;
@@ -891,6 +908,7 @@ const refundRoutes = (router: Router, env: Env) => {
 	router.get(
 		"/api/refund/:id",
 		async (request) => {
+			const db = getDatabase(env);
 			const { id } = request.params;
 
 			// Find refund in the database
@@ -930,6 +948,20 @@ const refundRoutes = (router: Router, env: Env) => {
 		},
 		env.READ_PERMISSION,
 	);
+};
+
+/**
+ * Setup routes
+ * @param router The router
+ * @param env The environment variables
+ */
+export const setupRoutes = (router: Router, env: Env) => {
+	const db = getDatabase(env);
+
+	testerRoutes(router, env);
+	purchaseRoutes(router, env);
+	feedbackRoutes(router, env);
+	refundRoutes(router, env);
 
 	// Only allow backup route for in-memory database
 	if (db instanceof InMemoryDB) {
@@ -963,15 +995,3 @@ const refundRoutes = (router: Router, env: Env) => {
 		});
 	}
 };
-
-/**
- * Setup routes
- * @param router The router
- * @param env The environment variables
- */
-export const setupRoutes = (router: Router, env: Env) => {
-	testerRoutes(router, env);
-	purchaseRoutes(router, env);
-	feedbackRoutes(router, env);
-	refundRoutes(router, env);
-};

cloudflare-worker/src/test/mock-data.ts

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { DATABASESCHEMA } from "../db/db-type";
+import { DATABASESCHEMA } from "../db/db";
 import {
 	Feedback,
 	IdMapping,

cloudflare-worker/worker-configuration.d.ts

@@ -1,5 +1,5 @@
-// Generated by Wrangler by running `wrangler types` (hash: 5adb303b69023bce94383df6d0cfccef)
-// Runtime types generated with workerd@1.20250320.0 2025-03-19 
+// Generated by Wrangler by running `wrangler types` (hash: e9d63e061b37eb883724673694175c51)
+// Runtime types generated with workerd@1.20250320.0 2025-03-19
 declare namespace Cloudflare {
 	interface Env {
 		AUTH0_CLIENT_ID: string;
@@ -15,7 +15,8 @@ declare namespace Cloudflare {
 		ADMIN_PERMISSION: string;
 		CRYPTOKEN: string;
 		AUTH0_TOKEN: string;
-		FeedbackFlowD1DB: D1Database;
+		DB_BACKEND: string;
+		FeedbackFlowDB: D1Database;
 		RATE_LIMITER: RateLimit;
 	}
 }
@@ -3874,7 +3875,7 @@ type AIGatewayHeaders = {
     [key: string]: string | number | boolean | object;
 };
 type AIGatewayUniversalRequest = {
-    provider: AIGatewayProviders | string; // eslint-disable-line
+    provider: AIGatewayProviders | string;  
     endpoint: string;
     headers: Partial<AIGatewayHeaders>;
     query: unknown;
@@ -3887,7 +3888,7 @@ declare abstract class AiGateway {
     patchLog(logId: string, data: AiGatewayPatchLog): Promise<void>;
     getLog(logId: string): Promise<AiGatewayLog>;
     run(data: AIGatewayUniversalRequest | AIGatewayUniversalRequest[]): Promise<Response>;
-    getUrl(provider?: AIGatewayProviders | string): Promise<string>; // eslint-disable-line
+    getUrl(provider?: AIGatewayProviders | string): Promise<string>;  
 }
 interface AutoRAGInternalError extends Error {
 }