more flexible type import

Author: aeltorio

client/src/types/db.ts

@@ -1 +1 @@
-../../../cloudflare-worker/src/db/db.ts
+../../../cloudflare-worker/src/types/db-types.ts

cloudflare-worker/src/db/db.ts

@@ -24,351 +24,12 @@
  */
 
 import { mockData } from "../test/mock-data";
-import {
-	Feedback,
-	IdMapping,
-	Publication,
-	Purchase,
-	PurchasesStatisticsData,
-	Refund,
-	Tester,
-} from "../types/data";
-
 import { CloudflareD1DB } from "./d1-db";
 import { InMemoryDB } from "./in-memory-db";
+import { FeedbackFlowDB } from "../types/db-types";
 
-export const DEFAULT_PAGINATION = {
-	page: 1,
-	limit: 10,
-	sort: "date",
-	order: "desc",
-};
-
-/**
- * Interface for database structure
- */
-export interface DATABASESCHEMA {
-	ids: IdMapping[];
-	testers: Tester[];
-	purchases: Purchase[];
-	feedbacks: Feedback[];
-	publications: Publication[];
-	refunds: Refund[];
-}
-
-export interface PurchaseStatusResponse { results: PurchaseStatus[]; pageInfo: { totalCount: number; totalPages: number; currentPage: number; hasNextPage: boolean; hasPreviousPage: boolean; nextPage: number | null; previousPage: number | null; }; }
-export interface PurchaseStatus {
-	purchase: string;
-	testerUuid: string;
-	date: string;
-	order: string;
-	description: string;
-	amount: number;
-	refunded: boolean;
-	hasFeedback: boolean;
-	hasPublication: boolean;
-	hasRefund: boolean;
-	purchaseScreenshot?: string;
-	publicationScreenshot?: string;
-	screenshotSummary?: string;
-}
-/**
- * IdMappings repository interface (async version)
- */
-export interface IdMappingsRepository {
-	/**
-	 * Check if an ID exists in the database
-	 * @param id The OAuth ID to check
-	 */
-	exists(id: string): Promise<boolean>;
-
-	/**
-	 * Check if multiple IDs exist in the database
-	 * @param ids Array of OAuth IDs to check
-	 */
-	existsMultiple(ids: string[]): Promise<string[]>;
-
-	/**
-	 * Get the tester UUID associated with an ID
-	 * @param id The OAuth ID to look up
-	 */
-	getTesterUuid(id: string): Promise<string | undefined>;
-
-	/**
-	 * Add a new ID to tester mapping
-	 * @param id The OAuth ID
-	 * @param testerUuid The associated tester UUID
-	 */
-	put(id: string, testerUuid: string): Promise<boolean>;
-
-	/**
-	 * Add multiple ID to tester mappings
-	 * @param ids Array of OAuth IDs
-	 * @param testerUuid The associated tester UUID
-	 */
-	putMultiple(ids: string[], testerUuid: string): Promise<string[]>;
-
-	/**
-	 * Delete an ID mapping
-	 * @param id The OAuth ID to delete
-	 */
-	delete(id: string): Promise<boolean>;
-
-	/**
-	 * Get all ID mappings
-	 */
-	getAll(): Promise<IdMapping[]>;
-}
-
-/**
- * Testers repository interface (async version)
- */
-export interface TestersRepository {
-	/**
-	 * Find a tester that matches the provided condition
-	 * @param fn Predicate function to filter testers
-	 */
-	find(fn: (tester: Tester) => boolean): Promise<Tester | undefined>;
-
-	/**
-	 * Filter testers based on the provided condition
-	 * @param fn Predicate function to filter testers
-	 */
-	filter(fn: (tester: Tester) => boolean): Promise<Tester[]>;
-
-	/**
-	 * Add or update a tester in the database
-	 * @param newTester The tester object to add or update
-	 */
-	put(newTester: Tester): Promise<string[]>;
-
-	/**
-	 * Get all testers from the database
-	 */
-	getAll(): Promise<Tester[]>;
-
-	/**
-	 * Find a tester by their authentication ID
-	 * @param id Authentication ID to search for
-	 */
-	getTesterWithId(id: string): Promise<Tester | undefined>;
-
-	/**
-	 * Find a tester by their UUID
-	 * @param uuid UUID to search for
-	 */
-	getTesterWithUuid(uuid: string): Promise<Tester | undefined>;
-
-	/**
-	 * Add IDs to an existing tester
-	 * @param uuid UUID of the tester to update
-	 * @param ids IDs to add to the tester
-	 */
-	addIds(uuid: string, ids: string[]): Promise<string[] | undefined>;
-}
-
-export interface PaginatedResult<T> {
-	results: T[];
-	totalCount: number;
-}
-
-// Define PurchaseWithFeedback type that extends Purchase with feedback and publication data
-export interface PurchaseWithFeedback extends Purchase {
-	/**
-	 * The feedback content associated with this purchase
-	 */
-	feedback: string;
-	
-	/**
-	 * The date when the feedback was submitted
-	 */
-	feedbackDate: string;
-	
-	/**
-	 * The publication screenshot, if available
-	 */
-	publicationScreenshot?: string;
-	
-	/**
-	 * The date when the feedback was published, if available
-	 */
-	publicationDate?: string;
-}
-
-// Convertir également PurchasesRepository, FeedbacksRepository, PublicationsRepository, RefundsRepository
-// de manière similaire (toutes les méthodes retournent des Promises)
-export interface PurchasesRepository {
-	/**
-	 * Find a purchase that matches the provided condition
-	 * @param fn Predicate function to filter purchases
-	 */
-	find(fn: (purchase: Purchase) => boolean): Promise<Purchase | undefined>;
-	/**
-	 * Filter purchases based on the provided condition
-	 * @param fn Predicate function to filter purchases
-	 */
-	filter(fn: (purchase: Purchase) => boolean): Promise<Purchase[]>;
-	/**
-	 * Add or update a purchase in the database
-	 * @param newPurchase The purchase object to add or update
-	 */
-	refunded(testerUuid: string, pagination?: typeof DEFAULT_PAGINATION): Promise<PaginatedResult<Purchase>>;
-	/**
-	 * Get the total number of refunded purchases for a tester
-	 * @param testerUuid UUID of the tester
-	 */
-	refundedAmount(testerUuid: string): Promise<number>;
-	/**
-	 * Get all purchases for a tester that are not refunded
-	 * @param testerUuid UUID of the tester
-	 * @param pagination Optional pagination parameters
-	 */
-	notRefunded(testerUuid: string, pagination?: typeof DEFAULT_PAGINATION): Promise<PaginatedResult<Purchase>>;
-	/**
-	 * Get all purchases for a tester ready for refund (not refunded and with feedback)
-	 * @param testerUuid UUID of the tester
-	 * @param pagination Optional pagination parameters
-	 */
-	readyForRefund(
-		testerUuid: string,
-		pagination?: typeof DEFAULT_PAGINATION,
-	): Promise<PaginatedResult<PurchaseWithFeedback>>;
-	/**
-	 * Get the total number of purchases for a tester that are not refunded
-	 * @param testerUuid UUID of the tester
-	 */
-	notRefundedAmount(testerUuid: string): Promise<number>;
-	/**
-	 * Get all purchases for a tester
-	 * @param testerUuid UUID of the tester
-	 * @param pagination Optional pagination parameters
-	 */
-	delete(id: string): Promise<boolean>;
-	/**
-	 * Add a new purchase for a tester
-	 * @param testerUuid UUID of the tester
-	 * @param newPurchase The purchase object to add
-	 */
-	put(testerUuid: string, newPurchase: Purchase): Promise<string>;
-	/**
-	 * Update an existing purchase
-	 * @param id The ID of the purchase to update
-	 * @param updates The updates to apply to the purchase
-	 */
-	update(id: string, updates: Partial<Purchase>): Promise<boolean>;
-	/**
-	 * Get all purchases for a tester
-	 * @param testerUuid UUID of the tester
-	 * @param pagination Optional pagination parameters
-	 */
-	getAll(): Promise<Purchase[]>;
-
-	/**
-	 * Get all purchases for a tester with full status
-	 * @param testerUuid UUID of the tester
-	 * @param limitToNotRefunded Optional flag to limit to not refunded purchases
-	 * @param page Optional page number for pagination
-	 * @param limit Optional limit for number of results per page
-	 * @param sort Optional sorting field
-	 * @param order Optional sorting order (asc/desc)
-	 */
-	getPurchaseStatus(
-		testerUuid: string,
-		limitToNotRefunded?: boolean,
-		page?: number,
-		limit?: number,
-		sort?: string,
-		order?: string,
-	): Promise<PurchaseStatusResponse>;
-
-	/**
-	 * Get some statistics of purchases for a tester
-	 * @param testerUuid UUID of the tester
-	 * @returns Promise<PurchasesStatisticsData> Statistics data for the tester's purchases
-	 */
-	getPurchaseStatistics(
-		testerUuid: string): Promise<PurchasesStatisticsData>;
-}
-
-export interface FeedbacksRepository {
-	find(fn: (feedback: Feedback) => boolean): Promise<Feedback | undefined>;
-	filter(fn: (feedback: Feedback) => boolean): Promise<Feedback[]>;
-	put(testerId: string, newFeedback: Feedback): Promise<string>;
-	getAll(): Promise<Feedback[]>;
-}
-
-export interface PublicationsRepository {
-	find(
-		fn: (publication: Publication) => boolean,
-	): Promise<Publication | undefined>;
-	filter(fn: (publication: Publication) => boolean): Promise<Publication[]>;
-	put(testerId: string, newPublication: Publication): Promise<string>;
-	getAll(): Promise<Publication[]>;
-}
-
-export interface RefundsRepository {
-	find(fn: (refund: Refund) => boolean): Promise<Refund | undefined>;
-	filter(fn: (refund: Refund) => boolean): Promise<Refund[]>;
-	put(testerId: string, newRefund: Refund): Promise<string>;
-	getAll(): Promise<Refund[]>;
-}
-
-/**
- * Abstract database class that defines the interface for all database implementations
- */
-export abstract class FeedbackFlowDB {
-	/**
-	 * ID mappings operations
-	 */
-	abstract idMappings: IdMappingsRepository;
-
-	/**
-	 * Tester-related database operations
-	 */
-	abstract testers: TestersRepository;
-
-	/**
-	 * Purchase-related database operations
-	 */
-	abstract purchases: PurchasesRepository;
-
-	/**
-	 * Feedback-related database operations
-	 */
-	abstract feedbacks: FeedbacksRepository;
-
-	/**
-	 * Publication-related database operations
-	 */
-	abstract publications: PublicationsRepository;
-
-	/**
-	 * Refund-related database operations
-	 */
-	abstract refunds: RefundsRepository;
-
-	/**
-	 * Reset the database with new data (optional)
-	 */
-	abstract reset?(newData: DATABASESCHEMA): Promise<void>;
-
-	/**
-	 * Get a copy of the raw database data (optional)
-	 */
-	abstract getRawData?(): Promise<DATABASESCHEMA>;
-
-	/**
-	 * Backup the database to JSON string (optional)
-	 */
-	abstract backupToJson?(): Promise<string>;
-
-	/**
-	 * Restore the database from JSON string (optional)
-	 */
-	abstract restoreFromJsonString?(
-		backup: string,
-	): Promise<{ success: boolean; message?: string }>;
-}
+// Export all types from the shared db-types file
+export * from "../types/db-types";
 
 /**
  * Singleton instance of the database
@@ -381,7 +42,7 @@ let dbInstance: FeedbackFlowDB | null = null;
  */
 export function getDatabase(env: Env): FeedbackFlowDB {
 	if (dbInstance === null) {
-		 // Initialize the database based on env.DB_BACKEND
+		// Initialize the database based on env.DB_BACKEND
 		dbInstance =
 			env.DB_BACKEND !== "memory"
 				? (new CloudflareD1DB(env.FeedbackFlowDB) as FeedbackFlowDB)