@axova/shared 1.0.2 → 1.1.0

package/src/lib/authOrganization.ts

@@ -1,153 +1,153 @@
-import { createId } from "@paralleldrive/cuid2";
-import { APIError } from "../utils/errorHandler";
-
-export interface AuthOrganizationCreateRequest {
-	name: string;
-	slug: string;
-	logo?: string;
-	metadata?: Record<string, unknown>;
-	userId?: string;
-	keepCurrentActiveOrganization?: boolean;
-}
-
-export interface AuthOrganizationResponse {
-	id: string;
-	name: string;
-	slug: string;
-	logo?: string;
-	metadata?: Record<string, unknown>;
-	createdAt: Date;
-	updatedAt?: Date;
-}
-
-/**
- * Creates an organization using the auth service
- * @param organizationData Organization data to create
- * @param headers Authentication headers to forward
- * @returns Promise resolving to created organization data
- */
-export const createAuthOrganization = async (
-	organizationData: AuthOrganizationCreateRequest,
-	headers?: Record<string, string>,
-): Promise<AuthOrganizationResponse> => {
-	try {
-		console.log("Creating organization:", {
-			name: organizationData.name,
-			slug: organizationData.slug,
-			userId: organizationData.userId,
-			hasHeaders: !!headers,
-		});
-
-		// Prepare payload matching auth service expectations
-		const payload = {
-			name: organizationData.name,
-			slug: organizationData.slug,
-			...(organizationData.logo && { logo: organizationData.logo }),
-			...(organizationData.metadata && { metadata: organizationData.metadata }),
-		};
-
-		// Make direct HTTP request to auth service
-		const authBaseUrl =
-			process.env.NEXT_PUBLIC_AUTH_URL || "http://localhost:4000";
-		const url = `${authBaseUrl}/api/auth/organization/create`;
-
-		const fetchOptions: RequestInit = {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-				...headers,
-			},
-			body: JSON.stringify(payload),
-		};
-
-		console.log("Sending request to auth service:", url);
-		const response = await fetch(url, fetchOptions);
-
-		console.log("Auth service response:", {
-			status: response.status,
-			statusText: response.statusText,
-			ok: response.ok,
-			headers: Object.fromEntries(response.headers.entries()),
-		});
-
-		// Check HTTP response status
-		if (!response.ok) {
-			const errorText = await response.text();
-			console.error("Auth service HTTP error:", {
-				status: response.status,
-				statusText: response.statusText,
-				body: errorText,
-			});
-
-			throw new APIError(
-				`Auth service error: ${response.status} ${response.statusText}`,
-				response.status,
-				{ code: "AUTH_HTTP_ERROR", response: errorText },
-			);
-		}
-
-		// Parse JSON response
-		let responseData: any;
-		try {
-			responseData = await response.json();
-		} catch (parseError) {
-			console.error("Failed to parse auth service response:", parseError);
-			throw new APIError("Invalid response format from auth service", 500, {
-				code: "JSON_PARSE_ERROR",
-				originalError: parseError,
-			});
-		}
-
-		// Auth service returns organization data directly
-		// Check if response has the required organization fields
-		if (responseData.id && responseData.name) {
-			console.log("Organization created successfully:", {
-				id: responseData.id,
-				name: responseData.name,
-				slug: responseData.slug,
-			});
-		} else {
-			console.error("Invalid organization response:", responseData);
-			throw new APIError(
-				"Invalid organization data format from auth service",
-				500,
-				{ code: "INVALID_ORGANIZATION_DATA", response: responseData },
-			);
-		}
-
-		// Return structured organization data (responseData contains the org data directly)
-		return {
-			id: responseData.id,
-			name: responseData.name,
-			slug: responseData.slug,
-			logo: responseData.logo || undefined,
-			metadata: responseData.metadata,
-			createdAt: new Date(responseData.createdAt),
-			updatedAt: undefined,
-		};
-	} catch (error: any) {
-		console.error("Organization creation failed:", {
-			message: error.message,
-			status: error.status || error.statusCode,
-			code: error.code,
-		});
-
-		// Handle different error types
-		if (error instanceof APIError) {
-			throw error;
-		}
-
-		if (error.message && error.message.includes("JSON")) {
-			throw new APIError("Invalid response format from auth service", 500, {
-				code: "JSON_PARSE_ERROR",
-				originalError: error.message,
-			});
-		}
-
-		throw new APIError(
-			error.message || "Failed to create organization",
-			error.status || error.statusCode || 500,
-			{ code: "ORGANIZATION_CREATION_FAILED", originalError: error },
-		);
-	}
-};
+import { createId } from "@paralleldrive/cuid2";
+import { APIError } from "../utils/errorHandler";
+
+export interface AuthOrganizationCreateRequest {
+	name: string;
+	slug: string;
+	logo?: string;
+	metadata?: Record<string, unknown>;
+	userId?: string;
+	keepCurrentActiveOrganization?: boolean;
+}
+
+export interface AuthOrganizationResponse {
+	id: string;
+	name: string;
+	slug: string;
+	logo?: string;
+	metadata?: Record<string, unknown>;
+	createdAt: Date;
+	updatedAt?: Date;
+}
+
+/**
+ * Creates an organization using the auth service
+ * @param organizationData Organization data to create
+ * @param headers Authentication headers to forward
+ * @returns Promise resolving to created organization data
+ */
+export const createAuthOrganization = async (
+	organizationData: AuthOrganizationCreateRequest,
+	headers?: Record<string, string>,
+): Promise<AuthOrganizationResponse> => {
+	try {
+		console.log("Creating organization:", {
+			name: organizationData.name,
+			slug: organizationData.slug,
+			userId: organizationData.userId,
+			hasHeaders: !!headers,
+		});
+
+		// Prepare payload matching auth service expectations
+		const payload = {
+			name: organizationData.name,
+			slug: organizationData.slug,
+			...(organizationData.logo && { logo: organizationData.logo }),
+			...(organizationData.metadata && { metadata: organizationData.metadata }),
+		};
+
+		// Make direct HTTP request to auth service
+		const authBaseUrl =
+			process.env.NEXT_PUBLIC_AUTH_URL || "http://localhost:4000";
+		const url = `${authBaseUrl}/api/auth/organization/create`;
+
+		const fetchOptions: RequestInit = {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				...headers,
+			},
+			body: JSON.stringify(payload),
+		};
+
+		console.log("Sending request to auth service:", url);
+		const response = await fetch(url, fetchOptions);
+
+		console.log("Auth service response:", {
+			status: response.status,
+			statusText: response.statusText,
+			ok: response.ok,
+			headers: Object.fromEntries(response.headers.entries()),
+		});
+
+		// Check HTTP response status
+		if (!response.ok) {
+			const errorText = await response.text();
+			console.error("Auth service HTTP error:", {
+				status: response.status,
+				statusText: response.statusText,
+				body: errorText,
+			});
+
+			throw new APIError(
+				`Auth service error: ${response.status} ${response.statusText}`,
+				response.status,
+				{ code: "AUTH_HTTP_ERROR", response: errorText },
+			);
+		}
+
+		// Parse JSON response
+		let responseData: any;
+		try {
+			responseData = await response.json();
+		} catch (parseError) {
+			console.error("Failed to parse auth service response:", parseError);
+			throw new APIError("Invalid response format from auth service", 500, {
+				code: "JSON_PARSE_ERROR",
+				originalError: parseError,
+			});
+		}
+
+		// Auth service returns organization data directly
+		// Check if response has the required organization fields
+		if (responseData.id && responseData.name) {
+			console.log("Organization created successfully:", {
+				id: responseData.id,
+				name: responseData.name,
+				slug: responseData.slug,
+			});
+		} else {
+			console.error("Invalid organization response:", responseData);
+			throw new APIError(
+				"Invalid organization data format from auth service",
+				500,
+				{ code: "INVALID_ORGANIZATION_DATA", response: responseData },
+			);
+		}
+
+		// Return structured organization data (responseData contains the org data directly)
+		return {
+			id: responseData.id,
+			name: responseData.name,
+			slug: responseData.slug,
+			logo: responseData.logo || undefined,
+			metadata: responseData.metadata,
+			createdAt: new Date(responseData.createdAt),
+			updatedAt: undefined,
+		};
+	} catch (error: any) {
+		console.error("Organization creation failed:", {
+			message: error.message,
+			status: error.status || error.statusCode,
+			code: error.code,
+		});
+
+		// Handle different error types
+		if (error instanceof APIError) {
+			throw error;
+		}
+
+		if (error.message && error.message.includes("JSON")) {
+			throw new APIError("Invalid response format from auth service", 500, {
+				code: "JSON_PARSE_ERROR",
+				originalError: error.message,
+			});
+		}
+
+		throw new APIError(
+			error.message || "Failed to create organization",
+			error.status || error.statusCode || 500,
+			{ code: "ORGANIZATION_CREATION_FAILED", originalError: error },
+		);
+	}
+};

package/src/lib/db.ts

@@ -1,64 +1,84 @@
-import * as dotenv from "dotenv";
-import { drizzle } from "drizzle-orm/node-postgres";
-import { Pool } from "pg";
-
-// Load environment variables from .env file
-dotenv.config();
-
-// Configure PostgreSQL connection
-const connectionString = process.env.DATABASE_URL;
-
-if (!connectionString) {
-	throw new Error("DATABASE_URL environment variable is not set");
-}
-
-// Configure PostgreSQL to handle timestamps and dates properly
-const pool = new Pool({
-	connectionString,
-	ssl:
-		process.env.NODE_ENV === "production"
-			? { rejectUnauthorized: false }
-			: false,
-	// Connection pool configuration to prevent "Connection is closed" errors
-	max: 20, // Maximum number of clients in the pool
-	min: 2, // Minimum number of clients in the pool
-	idleTimeoutMillis: 30000, // Close idle clients after 30 seconds
-	connectionTimeoutMillis: 10000, // Wait 10 seconds for a connection
-	// Keep connections alive
-	keepAlive: true,
-	keepAliveInitialDelayMillis: 10000,
-	// Add parsing configuration for timestamps
-	types: {
-		getTypeParser: (typeId: number, _format?: string) => {
-			// Handle dates and timestamps to ensure they're properly converted to JavaScript Date objects
-			if (
-				typeId === 1082 ||
-				typeId === 1083 ||
-				typeId === 1114 ||
-				typeId === 1184
-			) {
-				return (val: string) => (val === null ? null : new Date(val));
-			}
-			return undefined;
-		},
-	},
-});
-
-// Add error handler to the pool
-pool.on("error", (err) => {
-	console.error("❌ Unexpected database pool error:", err);
-});
-
-pool.on("connect", () => {
-	if (process.env.NODE_ENV === "development") {
-		console.log("✅ Database pool connection established");
-	}
-});
-
-// Create a Drizzle ORM instance
-export const db = drizzle(pool, {
-	logger: process.env.NODE_ENV === "development",
-});
-
-// Exported for testing
-export { pool };
+import * as dotenv from "dotenv";
+import { drizzle } from "drizzle-orm/node-postgres";
+import { Pool } from "pg";
+import * as storeSchema from "../schemas/store/store-schema";
+import * as storeAuditSchema from "../schemas/store/store-audit-schema";
+import * as storeSettingsSchema from "../schemas/store/store-settings-schema";
+import * as storefrontConfigSchema from "../schemas/store/storefront-config-schema";
+import * as orderSchema from "../schemas/order/order-schema";
+import * as cartSchema from "../schemas/order/cart-schema";
+import * as productSchema from "../schemas/product/product-schema";
+import * as inventorySchema from "../schemas/inventory/inventory-tables";
+import * as customerSchema from "../schemas/customer/customer-schema";
+
+// Load environment variables from .env file
+dotenv.config();
+
+// Configure PostgreSQL connection
+const connectionString = process.env.DATABASE_URL;
+
+if (!connectionString) {
+	throw new Error("DATABASE_URL environment variable is not set");
+}
+
+// Configure PostgreSQL to handle timestamps and dates properly
+const pool = new Pool({
+	connectionString,
+	ssl:
+		process.env.NODE_ENV === "production"
+			? { rejectUnauthorized: false }
+			: false,
+	// Connection pool configuration to prevent "Connection is closed" errors
+	max: 20, // Maximum number of clients in the pool
+	min: 2, // Minimum number of clients in the pool
+	idleTimeoutMillis: 30000, // Close idle clients after 30 seconds
+	connectionTimeoutMillis: 10000, // Wait 10 seconds for a connection
+	// Keep connections alive
+	keepAlive: true,
+	keepAliveInitialDelayMillis: 10000,
+	// Add parsing configuration for timestamps
+	types: {
+		getTypeParser: (typeId: number, _format?: string) => {
+			// Handle dates and timestamps to ensure they're properly converted to JavaScript Date objects
+			if (
+				typeId === 1082 ||
+				typeId === 1083 ||
+				typeId === 1114 ||
+				typeId === 1184
+			) {
+				return (val: string) => (val === null ? null : new Date(val));
+			}
+			return undefined;
+		},
+	},
+});
+
+// Add error handler to the pool
+pool.on("error", (err) => {
+	console.error("❌ Unexpected database pool error:", err);
+});
+
+pool.on("connect", () => {
+	if (process.env.NODE_ENV === "development") {
+		console.log("✅ Database pool connection established");
+	}
+});
+
+// Create a Drizzle ORM instance with all schemas registered
+export const db = drizzle(pool, {
+	schema: {
+		...storeSchema,
+		...storeAuditSchema,
+		...storeSettingsSchema,
+		...storefrontConfigSchema,
+		...orderSchema,
+		...cartSchema,
+		...productSchema,
+		...inventorySchema,
+		...customerSchema,
+	},
+	logger: process.env.NODE_ENV === "development",
+});
+
+// Exported for testing
+export { pool };