mirror of
https://github.com/xtr-dev/payload-billing.git
synced 2025-12-10 10:53:23 +00:00
fix: Address type safety and error handling concerns
🔧 Type Safety Improvements: - Add missing ProviderData import to fix compilation errors - Create toPayloadId utility for safe ID type conversion - Replace all 'as any' casts with typed utility function - Improve type safety while maintaining PayloadCMS compatibility 🛡️ Error Handling Enhancements: - Add try-catch for version check in payment hooks - Handle missing documents gracefully with fallback to version 1 - Add detailed logging for debugging race conditions - Prevent hook failures from blocking payment operations ⚡ Version Logic Improvements: - Distinguish between webhook updates and manual admin updates - Only auto-increment version for manual updates, not webhook updates - Check for webhook-specific fields to determine update source - Reduce race condition risks with explicit update type detection 🔍 Code Quality: - Centralized type casting in utility function - Better error messages and logging context - More explicit logic flow for version handling - Improved maintainability and debugging capabilities 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import type { AccessArgs, CollectionBeforeChangeHook, CollectionConfig, CollectionSlug, Field } from 'payload'
|
||||
import type { BillingPluginConfig} from '@/plugin/config';
|
||||
import { defaults } from '@/plugin/config'
|
||||
import { extractSlug } from '@/plugin/utils'
|
||||
import { extractSlug, toPayloadId } from '@/plugin/utils'
|
||||
import { Payment } from '@/plugin/types/payments'
|
||||
import { initProviderPayment } from '@/collections/hooks'
|
||||
|
||||
@@ -156,13 +156,29 @@ export function createPaymentsCollection(pluginConfig: BillingPluginConfig): Col
|
||||
|
||||
await initProviderPayment(req.payload, data)
|
||||
} else if (operation === 'update') {
|
||||
// Auto-increment version for updates (if not already set by optimistic locking)
|
||||
if (!data.version) {
|
||||
const currentDoc = await req.payload.findByID({
|
||||
collection: extractSlug(pluginConfig.collections?.payments || defaults.paymentsCollection),
|
||||
id: req.id as any
|
||||
})
|
||||
data.version = (currentDoc.version || 1) + 1
|
||||
// Handle version incrementing for manual updates
|
||||
// Webhook updates from providers should already set the version via optimistic locking
|
||||
if (!data.version && req.id) {
|
||||
// Check if this is a webhook update by looking for webhook-specific fields
|
||||
const isWebhookUpdate = data.providerData &&
|
||||
(data.providerData.webhookProcessedAt ||
|
||||
(typeof data.providerData === 'object' && 'webhookProcessedAt' in data.providerData))
|
||||
|
||||
if (!isWebhookUpdate) {
|
||||
// This is a manual admin update, safely increment version
|
||||
try {
|
||||
const currentDoc = await req.payload.findByID({
|
||||
collection: extractSlug(pluginConfig.collections?.payments || defaults.paymentsCollection),
|
||||
id: toPayloadId(req.id)
|
||||
})
|
||||
data.version = (currentDoc?.version || 1) + 1
|
||||
} catch (error) {
|
||||
// If we can't find the current document, start with version 1
|
||||
console.warn(`[Payment Hook] Could not fetch current version for payment ${req.id}, defaulting to version 1:`, error)
|
||||
data.version = 1
|
||||
}
|
||||
}
|
||||
// If it's a webhook update without a version, let it proceed (optimistic locking already handled it)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user