From a6413da67a4579866f0fd0323ddb23a7b6b9654a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 18 Sep 2026 17:00:53 +0000
Subject: [PATCH] =Cleaning up the Integrations setup a bit, started the Helcim integration work too
---
inc/rest/routes/UploadRoutes.php | 1340 ++++-----------------------------------------------------
1 files changed, 107 insertions(+), 1,233 deletions(-)
diff --git a/inc/rest/routes/UploadRoutes.php b/inc/rest/routes/UploadRoutes.php
index f519fa7..6d0e1bf 100644
--- a/inc/rest/routes/UploadRoutes.php
+++ b/inc/rest/routes/UploadRoutes.php
@@ -1,17 +1,17 @@
<?php
namespace JVBase\rest\routes;
-use JVBase\managers\queue\executors\UploadExecutor;
-use JVBase\managers\queue\TypeConfig;
+use JVBase\Instance;
+use JVBase\managers\Errors;
+use JVBase\managers\queue\Queue;
+use JVBase\registrar\Registrar;
use JVBase\rest\PermissionHandler;
use JVBase\rest\Rest;
use JVBase\meta\Meta;
use JVBase\managers\UploadManager;
use JVBase\rest\Route;
-use JVBase\utility\Features;
use WP_REST_Request;
use WP_REST_Response;
-use WP_Error;
use Exception;
if (!defined('ABSPATH')) {
@@ -19,65 +19,15 @@
}
class UploadRoutes extends Rest
{
+ use Instance;
public function __construct()
{
parent::__construct();
- add_action('init', [$this, 'registerUploadExecutors'], 5);
}
- /**
- * Register upload operation types with the queue's TypeRegistry
- */
- public function registerUploadExecutors(): void
- {
- $registry = JVB()->queue()->registry();
- $executor = new UploadExecutor();
- // Image uploads - chunked at 5 files
- $registry->register('image_upload', new TypeConfig(
- executor: $executor,
- chunkKey: 'secured_files',
- chunkSize: 5
- ));
-
- // Video uploads - one at a time (heavy processing)
- $registry->register('video_upload', new TypeConfig(
- executor: $executor,
- chunkKey: 'secured_files',
- chunkSize: 1
- ));
-
- // Document uploads - chunked at 10
- $registry->register('document_upload', new TypeConfig(
- executor: $executor,
- chunkKey: 'secured_files',
- chunkSize: 10
- ));
-
- // Metadata updates
- $registry->register('update_image_meta', new TypeConfig(
- executor: $executor
- ));
-
- // Cleanup - chunked at 5
- $registry->register('temporary_cleanup', new TypeConfig(
- executor: $executor,
- chunkKey: 'files',
- chunkSize: 5
- ));
-
- // Attach to content (depends on upload completing)
- $registry->register('attach_upload_to_content', new TypeConfig(
- executor: $executor
- ));
-
- // Process upload groups into posts
- $registry->register('process_upload_groups', new TypeConfig(
- executor: $executor
- ));
- }
/**
* Registers upload routes
@@ -88,7 +38,9 @@
Route::for('uploads')
->post([$this, 'handleUpload'])
->auth(PermissionHandler::combine(['nonce']))
- ->rateLimit(30);
+ ->rateLimit(30)
+ ->register();
+
Route::for('uploads/groups')
->post([$this, 'handleGroupingRequest'])
->auth(PermissionHandler::combine(['nonce']))
@@ -96,34 +48,62 @@
->args([
'id' => 'string|required',
'content' => 'string|required',
- 'user' => 'int|required'
- ]);
+ ])
+ ->register();
Route::for('uploads/meta')
->post([$this, 'handleMetadataUpdate'])
->auth(PermissionHandler::combine(['nonce']))
->rateLimit(30)
->args([
- 'user' => 'int|required',
- 'items' => 'array|required'
- ]);
+ 'items' => 'array|required',
+ 'id' => 'string'
+ ])
+ ->register();
}
/**
* Build the main $context for UploadManager from the $request params
* @param WP_REST_Request $request
* @return array
+ * @throws Exception
+ * @throws Exception
*/
protected function buildUploadArgs(WP_REST_Request $request):array
{
$data = $request->get_params();
$args = [];
+ $registrar = Registrar::getInstance($data['content']??'');
+
foreach ($data as $key => $value) {
switch ($key) {
+ case 'depends_on':
+ if (is_string($value) && !empty($value)) {
+ $args['depends_on'] = sanitize_text_field($value);
+ }
+ break;
+ case 'item_id':
+ if (is_numeric($value)) {
+ $args['item_id'] = absint($value);
+ if ($registrar) {
+ switch ($registrar->getType()) {
+ case 'post':
+ $args['post_id'] = absint($value);
+ break;
+ case 'term':
+ $args['term_id'] = absint($value);
+ break;
+ case 'user':
+ $args['user_id'] = absint($value);
+ break;
+ }
+ }
+ }
+ break;
// Post Type/Taxonomy
case 'content':
- $key = str_replace('-', '_', $key);
- if ($value === 'options' || array_key_exists($value, JVB_CONTENT) || Features::forTaxonomy($key)->has('is_content')) {
+ $value = str_replace('-', '_', $value);
+ if ($value === 'options' || $registrar) {
$args['content'] = $value;
}
break;
@@ -137,12 +117,13 @@
break;
// User ID
case 'user':
- if ($this->userCheck($value)) {
- $args['user'] = (int) $value;
- if (!array_key_exists('post_id', $data) && !array_key_exists('term_id', $data)) {
- $args['post_id'] = (int)get_user_meta((int) $value, BASE.'link', true);
- }
+ if (!array_key_exists('post_id', $args) &&
+ !array_key_exists('post_id', $data) &&
+ !array_key_exists('term_id', $data) &&
+ !array_key_exists('item_id', $data)) {
+ $args['post_id'] = (int)get_user_meta((int) $value, BASE.'profile_link', true);
}
+
break;
// Operation ID
case 'id':
@@ -221,13 +202,13 @@
case 'field_key':
case 'field_type':
case 'subtype':
- case 'item_id':
case 'context':
if (is_string($value)) {
$args[$key] = sanitize_text_field($value);
}
break;
}
+ $args['user'] = get_current_user_id();
}
return $args;
}
@@ -246,8 +227,8 @@
$files = $request->get_file_params();
$args = $this->buildUploadArgs($request);
-
- if (!$args['user']) {
+ $userID = get_current_user_id();
+ if (!$userID) {
return $this->unauthorized();
}
if (!$args['content']) {
@@ -258,7 +239,7 @@
$secured_files = $this->secureFiles($files, $args);
if (empty($secured_files)) {
- $this->logError('No valid files to upload');
+ $this->logError('No valid files to upload', 'handleUpload');
return $this->error('No valid files to upload');
}
@@ -269,15 +250,7 @@
} catch (Exception $e) {
// Error handling...
- JVB()->error()->log(
- '[UploadRoutes]:handleUploadRequest',
- $e->getMessage(),
- [
- 'request_data' => $request->get_params(),
- 'files_info' => $this->getFilesInfo($_FILES),
- 'trace' => $e->getTraceAsString()
- ]
- );
+ $this->logError($e->getMessage(), 'handleUpload');
return $this->error($e->getMessage());
}
}
@@ -287,7 +260,7 @@
*/
protected function secureFiles(array $files, array $args): array
{
- $uploader = new UploadManager();
+ $uploader = UploadManager::getInstance();
$secured_files = [];
$errors = [];
@@ -373,9 +346,11 @@
$chunkSize = 10;
}
- JVB()->queue()->queueOperation(
+ error_log('Queueing Operation: '.print_r($operation_type, true));
+ error_log('With ID: '.print_r($args['upload'], true));
+ $queuedProcessing = Queue::getInstance()->queueOperation(
$operation_type,
- $args['user'],
+ get_current_user_id(),
array_merge(
['secured_files' => $secured_data['files']],
$args
@@ -387,33 +362,28 @@
]
);
- if ($args['mode'] !== 'selection') {
- JVB()->queue()->queueOperation(
- 'attach_upload_to_content',
- $args['user'],
- $args,
- [
- 'priority' => 'high',
- 'operation_id' => $args['id'],
- 'depends_on' => $args['upload']
- ]
- );
- }
+ error_log('queuedProcessing operation: '.print_r($queuedProcessing, true));
- JVB()->queue()->queueOperation(
- 'temporary_cleanup',
- $args['user'],
- [
- 'files' => $secured_data['files'],
- 'context' => $args,
- ],
- [
- 'priority' => 'low',
- 'chunk_size' => 5,
- 'chunk_key' => 'files',
- 'depends_on' => $args['upload']
- ]
- );
+ $uploadOpId = $queuedProcessing['operation_id'];
+
+ if ($args['mode'] !== 'selection') {
+
+ // Only create attach_upload_to_content if the upload was NOT merged.
+ // When merged, the original upload's attach_upload_to_content
+ // will handle all files after the merged image_upload completes.
+ if (!$queuedProcessing['updated_existing']) {
+ Queue::getInstance()->queueOperation(
+ 'attach_upload_to_content',
+ get_current_user_id(),
+ $args,
+ [
+ 'priority' => 'high',
+ 'operation_id' => $args['id'],
+ 'depends_on' => [$uploadOpId]
+ ]
+ );
+ }
+ }
return $args['id'];
}
@@ -432,128 +402,8 @@
};
}
- /**
- * Step 3: Process operation from queue
- * Called by OperationQueue
- * @param WP_Error|array $result
- * @param object $operation
- * @param array $data
- *
- * @return array|WP_Error
- */
- public function processOperation(array $result, object $operation, array $data): array
- {
- // Only handle our operation types
- $handled_types = [
- 'image_upload',
- 'video_upload',
- 'document_upload',
- 'update_metadata',
- 'temporary_cleanup',
- 'attach_upload_to_content',
- 'process_upload_groups'
- ];
- if (!in_array($operation->type, $handled_types)) {
- return $result; // Not our operation, pass through
- }
- try {
- // Route to appropriate handler
- $handler_result = match($operation->type) {
- 'image_upload' => $this->processImageUpload($operation, $data),
- 'video_upload' => $this->processVideoUpload($operation, $data),
- 'document_upload' => $this->processDocumentUpload($operation, $data),
- 'update_metadata' => $this->processUploadMeta($result, $operation, $data),
- 'temporary_cleanup' => $this->processTemporaryCleanup($result, $operation, $data),
- 'attach_upload_to_content' => $this->processAttachToContent($operation, $data),
- 'process_upload_groups' => $this->processUploadGroups($result, $operation, $data),
- default => new WP_Error('unknown_type', 'Unknown operation type')
- };
-
- // Handle WP_Error
- if (is_wp_error($handler_result)) {
- return [
- 'success' => false,
- 'result' => $handler_result->get_error_message()
- ];
- }
-
- return $handler_result;
-
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processOperation',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'operation_type' => $operation->type
- ]
- );
-
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
- /**
- * Standardize processing result
- */
- protected function standardizeResult(array $result): array
- {
- return [
- 'attachment_id' => $result['attachment_id'],
- 'url' => $result['url'],
- 'file' => $result['file'],
- 'upload_id' => $result['upload_id'] ?? null
- ];
- }
-
- protected function processAttachToContent(object $operation, array $data): array
- {
- try {
- // Get the results from the upload operation
- $upload_results = JVB()->queue()->getOperationValue($data['upload'], 'result', true);
-
- if (empty($upload_results)) {
- throw new Exception('No upload results found for operation: ' . $data['upload']);
- }
-
- // Now attach to the specified content
- if (!empty($data['field_name'])) {
- $this->updateFieldValue($data, $upload_results);
- }
-
- return [
- 'success' => true,
- 'result' => 'Attachments linked to content'
- ];
-
- } catch (Exception $e) {
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
-
- /**
- * Cleanup temporary files after processing
- */
- protected function cleanupTempFiles(array $secured_files, int $user_id): void
- {
- $uploader = new UploadManager();
-
- foreach ($secured_files as $secured) {
- if (!empty($secured['temp_path']) && file_exists($secured['temp_path'])) {
- @unlink($secured['temp_path']);
- }
- }
-
- // Clean up empty directories
- $uploader->cleanupEmptyTempDirs($user_id);
- }
/**
* Update field value with new attachment IDs
@@ -570,7 +420,7 @@
} elseif (array_key_exists('term_id', $data)) {
$meta = Meta::forTerm($data['term_id']);
} else {
- $link = (int)get_user_meta($data['user'], BASE.'link');
+ $link = (int)get_user_meta($data['user'], BASE.'profile_link');
$meta = Meta::forPost($link);
}
@@ -585,159 +435,6 @@
$meta->set($data['field_name'], implode(',', $all_ids));
}
- /**
- * Generic file upload processor - works for images, videos, documents
- */
- protected function processFileUpload(object $operation, array $data, string $file_type): WP_Error|array
- {
- try {
- $uploader = new UploadManager();
- $processed_results = [];
- $config = $this->getFieldConfig($data);
-
- $args = $data;
- unset($args['secured_files']);
-
- foreach ($data['secured_files'] as $secured_file) {
- $result = $uploader->processUpload(
- $secured_file['temp_path'],
- array_merge(
- $config,
- [
- 'file_type' => $file_type,
- 'user_id' => $operation->user_id,
- 'post_id' => (int)($data['post_id'] ?? 0),
- 'term_id' => (int)($data['term_id'] ?? 0),
- 'original_name' => $secured_file['original_name'],
- 'mime_type' => $secured_file['mime_type'],
- 'content' => $data['content'] ?? '',
- ]
- )
- );
-
- if (!is_wp_error($result)) {
- $standardized = $this->standardizeResult($result);
-
- // Use embedded upload_id from the secured file itself
- $standardized['upload_id'] = $secured_file['upload_id'] ?? null;
-
- if ($standardized['upload_id']) {
- $processed_results[$standardized['upload_id']] = $standardized;
- } else {
- $processed_results[] = $standardized;
- }
-
- // Apply frontend metadata if provided
- if (!empty($secured_file['metadata'])) {
- $this->applyMeta($standardized['attachment_id'], $secured_file['metadata']);
- }
- }
- }
-
- $this->handleUploadDestination($data, $processed_results);
-
- // Cleanup temporary files
- $this->cleanupTempFiles($data['secured_files'], $operation->user_id);
-
- return [
- 'success' => true,
- 'result' => $processed_results
- ];
-
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processFileUpload',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'file_type' => $file_type,
- 'user_id' => $operation->user_id
- ]
- );
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
-
- /**
- * Process image uploads
- */
- protected function processImageUpload(object $operation, array $data): WP_Error|array
- {
- return $this->processFileUpload($operation, $data, 'image');
- }
-
- /**
- * Process video uploads
- */
- protected function processVideoUpload(object $operation, array $data): WP_Error|array
- {
- return $this->processFileUpload($operation, $data, 'video');
- }
-
- /**
- * Process document uploads
- */
- protected function processDocumentUpload(object $operation, array $data): WP_Error|array
- {
- return $this->processFileUpload($operation, $data, 'document');
- }
-
- /**
- * Process temporary cleanup operation
- * Called by OperationQueue for 'temporary_cleanup' operations
- *
- * @param array $result
- * @param object $operation
- * @param array $data
- * @return array
- */
- protected function processTemporaryCleanup(array $result, object $operation, array $data): array
- {
- try {
- // Cleanup temporary files if they exist
- if (!empty($data['secured_files'])) {
- $this->cleanupTempFiles($data['secured_files'], $operation->user_id);
- }
-
- // If specific temp paths provided
- if (!empty($data['temp_paths']) && is_array($data['temp_paths'])) {
- foreach ($data['temp_paths'] as $temp_path) {
- if (file_exists($temp_path)) {
- @unlink($temp_path);
- }
- }
- }
-
- // Cleanup empty temp directories for this user
- if (!empty($operation->user_id)) {
- $uploader = new UploadManager();
- $uploader->cleanupEmptyTempDirs($operation->user_id);
- }
-
- return [
- 'success' => true,
- 'result' => 'Temporary files cleaned up successfully'
- ];
-
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processTemporaryCleanup',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'user_id' => $operation->user_id
- ]
- );
-
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
/**
* Handle metadata update requests
@@ -767,10 +464,12 @@
if (!empty($attachments)) {
error_log('Attachments: '.print_r($attachments, true));
- return $this->queueMetaUpdate($attachments, $data['user']);
+ return $this->queueMetaUpdate($attachments, absint($data['user']), sanitize_text_field($data['id']??''));
}
+
+
return $this->sendResponse(
false,
['error_code' => 'missing_identifiers'],
@@ -778,14 +477,7 @@
);
} catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:handleMetadataUpdate',
- $e->getMessage(),
- [
- 'request_data' => $request->get_params(),
- 'trace' => $e->getTraceAsString()
- ]
- );
+ $this->logError($e->getMessage(), 'handleMetadataUpdate');
return $this->sendResponse(
false,
@@ -837,9 +529,9 @@
/**
* Queue metadata update with dependency on upload operation
*/
- protected function queueMetaUpdate(array $data, int $user): WP_REST_Response
+ protected function queueMetaUpdate(array $data, int $user, ?string $operationId = null): WP_REST_Response
{
- $queue = JVB()->queue();
+ $queue = Queue::getInstance();
$depends_on = [];
$errors = [];
$original = count($data);
@@ -848,95 +540,30 @@
$depends_on[] = $info['depends_on'];
}
}
+ $queueData = [
+ 'depends_on' => $depends_on,
+ ];
+ if ($operationId) {
+ $queueData['operation_id'] = $operationId;
+ }
$operationID = $queue->queueOperation(
'update_image_meta',
$user,
$data,
- [
- 'depends_on' => $depends_on,
- ]
+ $queueData
);
return $this->sendResponse(
true,
[
- 'operation_id' => $operationID,
+ 'operation_id' => $operationID['operation_id']??$operationId,
'message' => "Successfully queued ".count($data)." of {$original} meta updates"
],
'Metadata update queued - will apply after upload completes'
);
}
- /**
- * Process metadata update operation (called by queue processor)
- */
- public function processUploadMeta(WP_Error|array $result, object $operation, array $data): WP_Error|array
- {
- try {
- if (!is_array($operation->depends_on)) {
- $operation->depends_on = [$operation->depends_on];
- }
- $updated_count = 0;
- $errors = [];
- foreach ($operation->depends_on as $dependency) {
- $operationData = JVB()->queue()->getOperation($dependency);
- if (!$operationData || $operationData->state !== 'completed') {
- throw new Exception('Original upload operation not found or not completed');
- }
- $uploadResults = json_decode($operationData->result, true);
- if (!$uploadResults || !$uploadResults['success']) {
- throw new Exception('Original upload operation failed');
- }
- $attachmentsToUpdate = array_filter($data, function ($item) use ($dependency) {
- return $item['depends_on'] === $dependency;
- });
-
- $uploadIDToAttachment = $this->buildUploadToAttachmentMapping(
- array_keys($attachmentsToUpdate),
- $uploadResults['data']
- );
-
- if (empty($uploadIDToAttachment)) {
- throw new Exception('No valid upload ID to attachment ID mappings found');
- }
-
- foreach ($uploadIDToAttachment as $uploadId => $attachmentId) {
- try {
- $this->applyMeta($attachmentId, $attachmentsToUpdate[$uploadId]);
- $updated_count++;
- } catch (Exception $e) {
- $errors[] = "Upload {$uploadId} (Attachment {$attachmentId}): " . $e->getMessage();
- }
- }
- }
-
- return [
- 'success' => $updated_count > 0,
- 'result' => [
- 'updated_count' => $updated_count,
- 'mappings' => $uploadIDToAttachment,
- 'errors' => $errors,
- 'message' => "Applied metadata to {$updated_count} attachment(s)"
- ]
- ];
-
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processUploadMeta',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'original_operation_id' => $data['original_operation_id'] ?? 'unknown'
- ]
- );
-
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
protected function applyMeta(int $attachment_id, array $metadata): void
{
@@ -962,31 +589,9 @@
}
/**
- * Build mapping from frontend upload IDs to WordPress attachment IDs
- */
- protected function buildUploadToAttachmentMapping(array $upload_ids, array $results): array
- {
- $mapping = [];
-
- foreach ($results as $result) {
- if (!isset($result['upload_id']) || !isset($result['attachment_id'])) {
- continue;
- }
-
- $upload_id = $result['upload_id'];
- $attachment_id = $result['attachment_id'];
-
- // Validate that this upload_id was requested
- if (in_array($upload_id, $upload_ids)) {
- $mapping[$upload_id] = $attachment_id;
- }
- }
-
- return $mapping;
- }
-
- /**
- * Verify user has access to attachment
+ * @param int $attachment_id
+ * @param int $user_id
+ * @return bool
*/
protected function verifyAttachmentAccess(int $attachment_id, int $user_id): bool
{
@@ -1001,59 +606,9 @@
}
/**
- * Get field configuration for upload processing
- */
- protected function getFieldConfig(array $data): array
- {
- static $config_cache = [];
-
- $cache_key = md5(json_encode([
- $args['content'] ?? '',
- $args['field_name'] ?? ''
- ]));
-
- if (isset($config_cache[$cache_key])) {
- return $config_cache[$cache_key];
- }
-
- $config = [
- 'allowed_types' => null,
- 'max_size' => null,
- 'convert' => 'webp',
- 'quality' => 80,
- 'create_thumbnails' => true,
- ];
-
- // Get field definition from registry if available
- if (!empty($args['content']) && !empty($args['field_name'])) {
- $content_type = $args['content'];
- $field_name = $args['field_name'];
-
- if (array_key_exists($content_type, JVB_CONTENT)) {
- $content_fields = JVB_CONTENT[$content_type]['fields'] ?? [];
- if (array_key_exists($field_name, $content_fields)) {
- $field_def = $content_fields[$field_name];
-
- // Extract relevant config from field definition
- $config = array_merge($config, [
- 'allowed_types' => $field_def['accepted_types'] ?? null,
- 'max_size' => $field_def['max_size'] ?? null,
- 'convert' => $field_def['convert'] ?? 'webp',
- 'quality' => $field_def['quality'] ?? 80,
- 'create_thumbnails' => $field_def['create_thumbnails'] ?? true,
- ]);
- }
- }
- }
-
- $config_cache[$cache_key] = $config;
- return $config;
- }
-
-
-
- /**
* Get files info for error logging
+ * @param array $files
+ * @return array
*/
protected function getFilesInfo(array $files): array
{
@@ -1080,17 +635,13 @@
return $this->success($response);
}
-
-
-
-
public function handleGroupingRequest(WP_REST_Request $request): WP_REST_Response
{
try {
$files = $request->get_file_params();
$args = $this->buildUploadArgs($request);
- if (!array_key_exists('user', $args) || $args['user'] === 0){
+ if (!$args['user']) {
return $this->unauthorized();
}
if (!array_key_exists('content', $args) || empty($args['content'])) {
@@ -1116,7 +667,7 @@
$chunkSize = 10;
}
- JVB()->queue()->queueOperation(
+ Queue::getInstance()->queueOperation(
$operation_type,
$args['user'],
array_merge(
@@ -1130,700 +681,23 @@
]
);
- $ID = JVB()->queue()->queueOperation(
+ $ID = Queue::getInstance()->queueOperation(
'process_upload_groups',
$args['user'],
$args,
[
'operation_id' => $args['id'],
'depends_on' => [$args['upload']],
- 'priority' => 'high'
+ 'priority' => 'high',
+ 'chunk_key' => 'posts'
]
);
return $this->queued($ID['operation_id'], 'Files uploaded and posts queued for creation');
} catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:handleGroupingRequest',
- $e->getMessage(),
- [
- 'request_data' => $request->get_params(),
- 'trace' => $e->getTraceAsString()
- ]
- );
+ $this->logError($e->getMessage(), 'handleGroupingRequest');
+
return $this->error('Grouping operation failed: '.$e->getMessage());
}
}
-
- protected function processUploadGroups(WP_Error|array $result, object $operation, array $data): WP_Error|array
- {
- try {
- $queue = JVB()->queue();
- $all_uploaded_images = [];
-
- // Get the upload operation ID from dependencies
- $dependencies = json_decode($operation->dependencies, true);
-
- if (empty($dependencies)) {
- return [
- 'success' => false,
- 'result' => 'No dependencies found'
- ];
- }
-
- // Collect uploads from all dependency operations
- $uploads = [];
- foreach ($dependencies as $dependency) {
- // Use getOperationValue like ContentRoutes does
- $res = $queue->getOperationValue($dependency, 'result');
-
- if (empty($res)) {
- continue;
- }
-
- // Results are stored at root level, keyed by upload_id
- // Filter to only include actual upload results (arrays with attachment_id)
- foreach ($res as $key => $value) {
- if (is_array($value) && isset($value['attachment_id'])) {
- $uploads[$key] = $value;
- }
- }
- }
-
- if (empty($uploads)) {
- return [
- 'success' => false,
- 'result' => 'No uploads to process'
- ];
- }
-
- // Build map of upload_id => attachment_id
- foreach ($uploads as $upload_id => $img) {
- $all_uploaded_images[$upload_id] = [
- 'upload_id' => $upload_id,
- 'attachment_id' => (int)$img['attachment_id']
- ];
- }
-
- $content = jvbCheckBase($data['content']);
- if (Features::forContent($data['content'])->has('is_timeline')) {
- return $this->processTimelineUploads($data, $uploads, $all_uploaded_images, $operation);
- }
-
- $user = (int)$data['user'];
- $created_posts = [];
- $used_upload_ids = [];
-
- // Create posts from groups
- foreach ($data['posts'] as $index => $post) {
- $post_title = !empty($post['fields']['post_title'])
- ? sanitize_text_field($post['fields']['post_title'])
- : 'New ' . JVB_CONTENT[$data['content']]['singular'] . ' ' . ($index + 1);
-
- $post_excerpt = !empty($post['fields']['post_excerpt'])
- ? sanitize_textarea_field($post['fields']['post_excerpt'])
- : '';
-
- $args = [
- 'post_type' => $content,
- 'post_author' => $user,
- 'post_status' => 'draft',
- 'post_title' => $post_title,
- 'post_excerpt' => $post_excerpt,
- ];
-
- $new_post_id = wp_insert_post($args);
-
- if ($new_post_id && !is_wp_error($new_post_id)) {
- $created_posts[] = $new_post_id;
-
- // Get featured image upload_id - string, not int!
- $featured_upload_id = $post['fields']['featured'] ?? null;
- $featured_attachment_id = null;
- $gallery_attachment_ids = [];
-
- // Process all images for this post
- foreach ($post['images'] as $img) {
- $upload_id = $img['upload_id'];
- $used_upload_ids[] = $upload_id;
-
- if (isset($all_uploaded_images[$upload_id])) {
- $attachment_id = $all_uploaded_images[$upload_id]['attachment_id'];
-
- if ($upload_id === $featured_upload_id) {
- $featured_attachment_id = $attachment_id;
- } else {
- $gallery_attachment_ids[] = $attachment_id;
- }
- }
- }
-
- // Set featured image
- if ($featured_attachment_id) {
- set_post_thumbnail($new_post_id, $featured_attachment_id);
- } elseif (!empty($gallery_attachment_ids)) {
- set_post_thumbnail($new_post_id, $gallery_attachment_ids[0]);
- array_shift($gallery_attachment_ids);
- }
-
- // Set gallery images
- if (!empty($gallery_attachment_ids)) {
- $meta = Meta::forPost($new_post_id);
- $fields = jvbGetFields($content, 'post');
-
- foreach ($fields as $name => $config) {
- if ($config['type'] === 'gallery') {
- $meta->set($name, implode(',', $gallery_attachment_ids));
- break;
- }
- }
- }
- }
- }
-
- return [
- 'success' => true,
- 'result' => [
- 'created_posts' => $created_posts,
- 'total_posts' => count($created_posts),
- 'used_images' => count($used_upload_ids),
- 'message' => "Created " . count($created_posts) . " post(s) from uploads"
- ]
- ];
-
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processUploadGroups',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'user_id' => $operation->user_id
- ]
- );
-
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
-
- protected function processTimelineUploads(array $data, array $uploads, array $uploadMap, object $operation):array
- {
- try {
- $user = (int)$data['user'];
- $created_posts = [];
- $used_upload_ids = [];
-
- $content = jvbCheckBase($data['content']);
-
- $config = Features::getConfig($content);
-
- $defaultTitle = 'New '.$config['singular']. ' ';
- foreach ($data['posts'] as $index=> $post) {
- $title = !empty($post['fields']['post_title'])
- ? sanitize_text_field($post['fields']['post_title'])
- : $defaultTitle.($index + 1);
- $excerpt = !empty($post['fields']['post_excerpt'])
- ? sanitize_textarea_field($post['fields']['post_excerpt'])
- : '';
-
- $args =[
- 'post_type' => $content,
- 'post_author' => $user,
- 'post_status' => 'draft',
- 'post_title' => $title,
- 'post_excerpt' => $excerpt
- ];
- $parent = wp_insert_post($args);
-
- if ($parent && !is_wp_error($parent)) {
- //Get the attachment IDs first
- $childPosts = [];
- $featured = $post['fields']['featured']??null;
- $featuredID = null;
- foreach ($post['images'] as $key => $img) {
- $upload_id = $img['upload_id'];
- $used_upload_ids[] = $upload_id;
-
- if (isset($uploadMap[$upload_id])) {
- $attachment_id = (int)$uploadMap[$upload_id]['attachment_id'];
- if ($upload_id === $featured) {
- $featuredID = $attachment_id;
- } else {
- $childPosts[] = $attachment_id;
- }
- }
- }
- // Set the featured image for the parent
- if ($featuredID) {
- set_post_thumbnail($parent, $featuredID);
- } elseif (!empty($childPosts)) {
- //use first image if no set featured
- set_post_thumbnail($parent, (int)$childPosts[0]);
- array_shift($childPosts);
- }
-
- //Create Child Posts
- if (!empty($childPosts)) {
- $args['post_parent'] = $parent;
- $created_posts[$parent] = [];
- foreach ($childPosts as $i => $imgID) {
- $treatment = $i + 1;
- $childTitle = $title.' - Treatment '.$treatment;
- $childDesc = '';
- $args['post_title'] = $childTitle;
- $args['post_excerpt'] = $childDesc;
- $child = wp_insert_post($args);
- if ($child && !is_wp_error($child)) {
- $created_posts[$parent][] = $child;
- set_post_thumbnail($child, $imgID);
- }
- }
- }
- }
- }
- return [
- 'success' => true,
- 'result' => [
- 'created_posts' => $created_posts,
- 'used_images' => $used_upload_ids
- ]
- ];
- } catch (Exception $e) {
- JVB()->error()->log(
- '[UploadRoutes]:processTimelineUploads',
- $e->getMessage(),
- [
- 'operation_id' => $operation->id,
- 'user_id' => $operation->user_id
- ]
- );
-
- return [
- 'success' => false,
- 'result' => $e->getMessage()
- ];
- }
- }
-
- protected function cleanupUnusedImages(array $unused_images): array
- {
- $cleaned_count = 0;
- $errors = [];
-
- foreach ($unused_images as $upload_id => $image_data) {
- try {
- $attachment_id = $image_data['attachment_id'];
-
- // Verify this attachment exists and wasn't already deleted
- if (get_post($attachment_id)) {
- // Delete the attachment and its files
- $deleted = wp_delete_attachment($attachment_id, true);
-
- if ($deleted) {
- $cleaned_count++;
- } else {
- $errors[] = "Failed to delete attachment {$attachment_id} for upload {$upload_id}";
- }
- } else {
- // Attachment already doesn't exist, count as cleaned
- $cleaned_count++;
- }
-
- } catch (Exception $e) {
- $errors[] = "Error cleaning up upload {$upload_id}: " . $e->getMessage();
- }
- }
-
- return [
- 'cleaned_count' => $cleaned_count,
- 'errors' => $errors
- ];
- }
-
- function getAttachmentID(array $image, array $storedResults): int|false
- {
- foreach ($storedResults as $operationID => $uploads) {
- foreach ($uploads as $upload) {
- // FIX: Handle both case variations
- $stored_upload_id = $upload['upload_id'];
- $search_upload_id = $image['upload_id'];
-
- if ($stored_upload_id === $search_upload_id) {
- return (int)$upload['attachment_id'];
- }
- }
- }
- return false;
- }
-
- function extractFeaturedItem(array &$items, string $meta_key = 'featured'): array
- {
- // Handle empty array
- if (empty($items)) {
- return [
- 'featured' => null,
- 'remaining' => []
- ];
- }
-
- $featured_index = null;
-
- // First pass: look for featured item
- foreach ($items as $index => $item) {
- if (isset($item['meta'][$meta_key])) {
- $featured_index = $index;
- break;
- }
- }
-
- // If no featured item found, use first item (index 0)
- if ($featured_index === null) {
- $featured_index = 0;
- }
-
- // Extract the featured/first item
- $featured = $items[$featured_index];
-
- // Remove the item from the original array
- unset($items[$featured_index]);
-
- // Re-index the array to maintain sequential indices
- $remaining = array_values($items);
-
- return [
- 'featured' => $featured,
- 'remaining' => $remaining
- ];
- }
-
- protected function mapUploadIdsToAttachments(array $uploadIds, array $uploadedImages): array
- {
- $mappedImages = [];
-
- foreach ($uploadIds as $uploadId) {
- $imageData = $this->findImageByUploadId($uploadId, $uploadedImages);
- if ($imageData) {
- $mappedImages[] = $imageData;
- }
- }
-
- return $mappedImages;
- }
-
- protected function findImageByUploadId(string $uploadId, array $uploadedImages): ?array
- {
- // Handle both flat array and grouped results
- foreach ($uploadedImages as $image) {
- if (is_array($image)) {
- // If it's a grouped result, check each image in the group
- if (isset($image[0]) && is_array($image[0])) {
- foreach ($image as $groupImage) {
- if (isset($groupImage['upload_id']) && $groupImage['upload_id'] === $uploadId) {
- return $groupImage;
- }
- }
- } else {
- // Single image result
- if (isset($image['upload_id']) && $image['upload_id'] === $uploadId) {
- return $image;
- }
- }
- }
- }
-
- return null;
- }
-
- protected function determineFeaturedImage(array $group, array $groupImages): ?int
- {
- // Check if user has starred a specific image
- if (!empty($group['featured_upload_id'])) {
- foreach ($groupImages as $image) {
- if (isset($image['upload_id']) && $image['upload_id'] === $group['featured_upload_id']) {
- return $image['attachment_id'];
- }
- }
- }
-
- // Default to first image
- return !empty($groupImages) ? $groupImages[0]['attachment_id'] : null;
- }
-
- protected function sanitizeGroupMetadata(array $metadata): array
- {
- $sanitized = [];
-
- foreach ($metadata as $key => $value) {
- $sanitizedKey = sanitize_key($key);
-
- if (is_string($value)) {
- $sanitized[$sanitizedKey] = sanitize_text_field($value);
- } elseif (is_array($value)) {
- $sanitized[$sanitizedKey] = array_map('sanitize_text_field', $value);
- } else {
- $sanitized[$sanitizedKey] = $value;
- }
- }
-
- return $sanitized;
- }
-
- protected function generatePostTitle(string $content, int $userId): string
- {
- $username = get_user_meta($userId, 'first_name', true) ?: get_user_meta($userId, 'display_name', true);
- $link = get_user_meta($userId, BASE.'link', true);
- $city = function_exists('jvbArtistCity') ? jvbArtistCity($link) : '';
-
- $title = ucfirst($content);
- if ($username) {
- $title .= ' by ' . $username;
- }
- if ($city) {
- $title .= ' from ' . $city;
- }
-
- return $title;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /**
- * Determine how to save uploaded files based on configuration
- */
- protected function handleUploadDestination(array $data, array $results): void
- {
- // Determine destination from config
- $destination = $data['destination'] ?? 'meta';
-
- switch ($destination) {
- case 'meta':
- // Save to post/term/user meta
- $this->saveToMeta($data, $results);
- break;
-
- case 'post':
- // Create individual posts for each file
- $this->createIndividualPosts($data, $results);
- break;
-
- case 'post_group':
- // Create posts with grouped files
- $this->createGroupedPosts($data, $results);
- break;
-
- default:
- // No destination specified - files processed but not attached
- break;
- }
- }
-
- /**
- * Infer destination from existing data (backward compatibility)
- */
- protected function inferDestination(array $data): string
- {
- // If field_name exists → saving to meta
- if (!empty($data['field_name'])) {
- return 'meta';
- }
-
- // If post_type exists without field_name → creating posts
- if (!empty($data['content'])) {
- return 'post';
- }
-
- // No destination
- return 'none';
- }
-
- /**
- * Save attachment IDs to meta field
- */
- protected function saveToMeta(array $data, array $results): void
- {
- if (empty($data['field_name'])) {
- return;
- }
-
- $attachment_ids = array_column($results, 'attachment_id');
-
- // Determine meta type
- if (!empty($data['post_id'])) {
- $meta = Meta::forPost($data['post_id']);
- } elseif (!empty($data['term_id'])) {
- $meta = Meta::forTerm($data['term_id']);
- } elseif (!empty($data['user'])) {
- $link = (int)get_user_meta($data['user'], BASE.'link', true);
- $meta = Meta::forPost($link);
- } else {
- return;
- }
-
- // Get existing value
- $existing = $meta->get($data['field_name']);
- $existing_ids = !empty($existing) ? explode(',', $existing) : [];
-
- // Merge with new IDs
- $all_ids = array_unique(array_merge($existing_ids, $attachment_ids));
-
- // Update with comma-separated string
- $meta->set($data['field_name'], implode(',', $all_ids));
- }
-
- /**
- * Create individual posts from uploads
- */
- protected function createIndividualPosts(array $data, array $results): array
- {
- if (empty($data['content'])) {
- return [];
- }
-
- $created_posts = [];
-
- foreach ($results as $result) {
- $attachment_id = $result['attachment_id'];
- $attachment = get_post($attachment_id);
-
- // Create post
- $post_data = [
- 'post_type' => jvbCheckBase($data['content']),
- 'post_title' => $attachment->post_title,
- 'post_status' => 'draft',
- 'post_author' => $data['user'] ?? get_current_user_id(),
- ];
-
- $post_id = wp_insert_post($post_data);
-
- if (!is_wp_error($post_id)) {
- // Set as featured image or attach to gallery
- $this->attachFileToPost($post_id, $attachment_id, $data);
-
- $created_posts[] = [
- 'post_id' => $post_id,
- 'attachment_id' => $attachment_id,
- ];
- }
- }
-
- return $created_posts;
- }
-
- /**
- * Create posts with grouped uploads
- */
- protected function createGroupedPosts(array $data, array $results): array
- {
- if (empty($data['content'])) {
- return [];
- }
-
- $id_map = [];
- foreach ($results as $result) {
- if (isset($result['upload_id'], $result['attachment_id'])) {
- $id_map[$result['upload_id']] = $result['attachment_id'];
- }
- }
-
- // Groups come from frontend as metadata
- $groups = $data['groups'] ?? [array_column($results, 'attachment_id')];
- $created_posts = [];
-
- foreach ($groups as $group_index => $group_upload_ids) {
- $group_attachment_ids = array_filter(
- array_map(fn($uid) => $id_map[$uid] ?? null, $group_upload_ids)
- );
-
- if (empty($group_attachment_ids)) continue;
- // Create post for this group
- $first_attachment = get_post($group_attachment_ids[0]);
-
- $post_data = [
- 'post_type' => jvbCheckBase($data['content']),
- 'post_title' => $data['group_titles'][$group_index] ?? $first_attachment->post_title,
- 'post_status' => $data['post_status'] ?? 'draft',
- 'post_author' => $data['user'] ?? get_current_user_id(),
- ];
-
- $post_id = wp_insert_post($post_data);
-
- if (!is_wp_error($post_id)) {
- // Attach all files in group
- foreach ($group_attachment_ids as $index => $attachment_id) {
- if ($index === 0) {
- // First is featured
- set_post_thumbnail($post_id, $attachment_id);
- } else {
- // Others go to gallery
- $meta = Meta::forPost($post_id);
- $existing = $meta->get('gallery');
- $existing_ids = !empty($existing) ? explode(',', $existing) : [];
- $existing_ids[] = $attachment_id;
- $meta->set('gallery', implode(',', $existing_ids));
- }
- }
-
- $created_posts[] = [
- 'post_id' => $post_id,
- 'attachment_ids' => $group_attachment_ids,
- ];
- }
- }
-
- return $created_posts;
- }
-
- /**
- * Attach file to post based on file type
- */
- protected function attachFileToPost(int $post_id, int $attachment_id, array $data): void
- {
- $attachment = get_post($attachment_id);
- $mime_type = $attachment->post_mime_type;
-
- // Determine file type
- if (str_starts_with($mime_type, 'image/')) {
- // Set as featured image
- set_post_thumbnail($post_id, $attachment_id);
- } elseif (str_starts_with($mime_type, 'video/')) {
- // Save to video field
- $meta = Meta::forPost($post_id);
- $meta->set('video', $attachment_id);
- } else {
- // Documents - save to documents field
- $meta = Meta::forPost($post_id);
- $existing = $meta->get('documents');
- $existing_ids = !empty($existing) ? explode(',', $existing) : [];
- $existing_ids[] = $attachment_id;
- $meta->set('documents', implode(',', $existing_ids));
- }
- }
}
--
Gitblit v1.10.0