@htlkg/data 0.0.23 → 0.0.25

package/src/mutations/contacts.ts

@@ -14,70 +14,16 @@ import {
 import { getContact } from "../queries/contacts";
 import type { CreateAuditFields, UpdateWithSoftDeleteFields } from "./common";
 
-// ============================================
-//  Added Zod Validation Schemas
-// ============================================
-
-/**
- * Zod schema for creating a contact 
- */
-export const createContactSchema = z.object({
-	brandId: z.string().min(1, "Brand ID is required"),
-	email: z.string().email("Invalid email address"),
-	phone: z.string().optional(),
-	firstName: z.string().min(1, "First name is required"),
-	lastName: z.string().min(1, "Last name is required"),
-	locale: z.string().optional(),
-	gdprConsent: z.boolean(),
-	gdprConsentDate: z.string().optional(),
-	marketingOptIn: z.boolean().optional(),
-	preferences: z.record(z.any()).optional(),
-	tags: z.array(z.string()).optional(),
-	totalVisits: z.number().int().min(0).optional(),
-	lastVisitDate: z.string().optional(),
-	firstVisitDate: z.string().optional(),
-	legacyId: z.string().optional(),
-	// Audit fields
-	createdAt: z.string().optional(),
-	createdBy: z.string().optional(),
-	updatedAt: z.string().optional(),
-	updatedBy: z.string().optional(),
-});
-
-/**
- * Zod schema for updating a contact
- */
-export const updateContactSchema = z.object({
-	id: z.string().min(1, "Contact ID is required"),
-	brandId: z.string().min(1).optional(),
-	email: z.string().email("Invalid email address").optional(),
-	phone: z.string().optional(),
-	firstName: z.string().min(1).optional(),
-	lastName: z.string().min(1).optional(),
-	locale: z.string().optional(),
-	gdprConsent: z.boolean().optional(),
-	gdprConsentDate: z.string().optional(),
-	marketingOptIn: z.boolean().optional(),
-	preferences: z.record(z.any()).optional(),
-	tags: z.array(z.string()).optional(),
-	totalVisits: z.number().int().min(0).optional(),
-	lastVisitDate: z.string().optional(),
-	firstVisitDate: z.string().optional(),
-	legacyId: z.string().optional(),
-	// Audit fields
-	updatedAt: z.string().optional(),
-	updatedBy: z.string().optional(),
-	deletedAt: z.string().nullable().optional(),
-	deletedBy: z.string().nullable().optional(),
-});
+// Import comprehensive validation schemas from validation module
+import {
+	createContactSchema,
+	updateContactSchema,
+	mergeContactsSchema,
+	formatValidationErrors,
+} from "../validation/contact.schemas";
 
-/**
- * Zod schema for merging contacts
- */
-export const mergeContactsSchema = z.object({
-	primaryId: z.string().min(1, "Primary contact ID is required"),
-	duplicateIds: z.array(z.string().min(1)).min(1, "At least one duplicate ID is required"),
-});
+// Re-export validation schemas for backwards compatibility
+export { createContactSchema, updateContactSchema, mergeContactsSchema };
 
 // ============================================
 // Validation Error Class
@@ -195,11 +141,8 @@ export async function createContact<TClient = any>(
 		const validationResult = createContactSchema.safeParse(input);
 
 		if (!validationResult.success) {
-			const errorMessage = validationResult.error.issues
-				.map((issue) => `${issue.path.join(".")}: ${issue.message}`)
-				.join(", ");
 			throw new ContactValidationError(
-				`Validation failed: ${errorMessage}`,
+				`Validation failed: ${formatValidationErrors(validationResult.error)}`,
 				validationResult.error.issues
 			);
 		}
@@ -249,11 +192,8 @@ export async function updateContact<TClient = any>(
 		const validationResult = updateContactSchema.safeParse(input);
 
 		if (!validationResult.success) {
-			const errorMessage = validationResult.error.issues
-				.map((issue) => `${issue.path.join(".")}: ${issue.message}`)
-				.join(", ");
 			throw new ContactValidationError(
-				`Validation failed: ${errorMessage}`,
+				`Validation failed: ${formatValidationErrors(validationResult.error)}`,
 				validationResult.error.issues
 			);
 		}
@@ -444,11 +384,8 @@ export async function mergeContacts<TClient = any>(
 		const validationResult = mergeContactsSchema.safeParse(input);
 
 		if (!validationResult.success) {
-			const errorMessage = validationResult.error.issues
-				.map((issue) => `${issue.path.join(".")}: ${issue.message}`)
-				.join(", ");
 			throw new ContactValidationError(
-				`Validation failed: ${errorMessage}`,
+				`Validation failed: ${formatValidationErrors(validationResult.error)}`,
 				validationResult.error.issues
 			);
 		}

package/src/mutations/index.ts

@@ -93,3 +93,4 @@ export {
 	type MergeContactsInput,
 	type MergeContactsResult,
 } from "./contacts";
+

package/src/queries/activityLogs.ts

@@ -0,0 +1,87 @@
+/**
+ * ActivityLog Query Functions
+ *
+ * Provides query functions for fetching activity log data.
+ * ActivityLogs are immutable — no updates or deletes.
+ */
+
+import type { ActivityLog } from "@htlkg/core/types";
+
+/**
+ * List activity logs with optional filtering
+ */
+export async function listActivityLogs<TClient = any>(
+	client: TClient,
+	options?: {
+		filter?: any;
+		limit?: number;
+		nextToken?: string;
+	},
+): Promise<{ items: ActivityLog[]; nextToken?: string }> {
+	try {
+		const { data, errors, nextToken } = await (
+			client as any
+		).models.ActivityLog.list(options);
+
+		if (errors) {
+			console.error("[listActivityLogs] GraphQL errors:", errors);
+			return { items: [], nextToken: undefined };
+		}
+
+		return {
+			items: (data || []) as ActivityLog[],
+			nextToken,
+		};
+	} catch (error) {
+		console.error("[listActivityLogs] Error:", error);
+		throw error;
+	}
+}
+
+/**
+ * List activity logs by account ID (for Account Admins)
+ */
+export async function listActivityLogsByAccount<TClient = any>(
+	client: TClient,
+	accountId: string,
+	options?: { limit?: number; nextToken?: string },
+): Promise<{ items: ActivityLog[]; nextToken?: string }> {
+	return listActivityLogs(client, {
+		filter: { accountId: { eq: accountId } },
+		...options,
+	});
+}
+
+/**
+ * List activity logs by brand ID (for Brand Admins)
+ */
+export async function listActivityLogsByBrand<TClient = any>(
+	client: TClient,
+	brandId: string,
+	options?: { limit?: number; nextToken?: string },
+): Promise<{ items: ActivityLog[]; nextToken?: string }> {
+	return listActivityLogs(client, {
+		filter: { brandId: { eq: brandId } },
+		...options,
+	});
+}
+
+/**
+ * List recent activity logs sorted by createdAt descending
+ */
+export async function listRecentActivityLogs<TClient = any>(
+	client: TClient,
+	options?: {
+		filter?: any;
+		limit?: number;
+	},
+): Promise<ActivityLog[]> {
+	const { items } = await listActivityLogs(client, {
+		filter: options?.filter,
+		limit: options?.limit || 20,
+	});
+
+	return items.sort(
+		(a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+	);
+}

package/src/queries/index.ts

@@ -73,3 +73,11 @@ export {
 	getContactByPhone,
 	searchContacts,
 } from "./contacts";
+
+// ActivityLog queries
+export {
+	listActivityLogs,
+	listActivityLogsByAccount,
+	listActivityLogsByBrand,
+	listRecentActivityLogs,
+} from "./activityLogs";