1b4b497fdf
Mirror to GitHub / mirror (push) Successful in 44s
Test and Lint / backend-test (push) Successful in 1m42s
Test and Lint / frontend-test (push) Has been cancelled
Version and Release / version-bump (push) Has been cancelled
Version and Release / trigger-drone (push) Has been cancelled
- Remove all console.log/debug statements from production code - Add NODE_ENV checks for development-only logging - Remove test scripts (test-feedback, test-image-security, test-backup-*, test-restore) - Remove one-time fix scripts (fix-temp-photos, fix-migration-state, mark-migration-applied) - Remove sensitive files (.env.backup, ADMIN_CREDENTIALS.txt) - Update package.json to remove references to deleted scripts - Replace console statements with logger utility in backend - Secure error boundaries to not expose stack traces in production This makes the codebase production-ready with no debug output or test scripts. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
99 lines
3.1 KiB
JavaScript
99 lines
3.1 KiB
JavaScript
const path = require('path');
|
|
const fs = require('fs').promises;
|
|
const { db } = require('../database/db');
|
|
const { generateThumbnail } = require('./imageProcessor');
|
|
const { generatePhotoFilename } = require('../utils/filenameSanitizer');
|
|
|
|
// Get storage path from environment or default
|
|
const getStoragePath = () => process.env.STORAGE_PATH || path.join(__dirname, '../../../storage');
|
|
|
|
async function processUploadedPhotos(files, eventId, uploadedBy = 'admin', categoryId = null) {
|
|
const uploadedPhotos = [];
|
|
|
|
// Get event details
|
|
const event = await db('events').where({ id: eventId }).first();
|
|
if (!event) {
|
|
throw new Error('Event not found');
|
|
}
|
|
|
|
// Process each file
|
|
for (const file of files) {
|
|
const trx = await db.transaction();
|
|
|
|
try {
|
|
// Count existing photos to generate sequence number
|
|
let counter = 1;
|
|
let photoType = 'individual'; // default type
|
|
|
|
// If categoryId is provided and matches photo types, use it as type
|
|
if (categoryId === 'collage') {
|
|
photoType = 'collage';
|
|
}
|
|
|
|
// Count existing photos of the same type for numbering
|
|
const existingCount = await trx('photos')
|
|
.where({ event_id: eventId, type: photoType })
|
|
.count('id as count')
|
|
.first();
|
|
|
|
counter = (existingCount.count || 0) + 1;
|
|
|
|
// Generate new filename
|
|
const extension = path.extname(file.originalname);
|
|
const categoryName = photoType === 'collage' ? 'collages' : 'individual';
|
|
const newFilename = generatePhotoFilename(
|
|
event.event_name,
|
|
categoryName,
|
|
counter,
|
|
extension
|
|
);
|
|
|
|
// Move file to event folder
|
|
const destPath = path.join(getStoragePath(), 'events/active', event.slug);
|
|
await fs.mkdir(destPath, { recursive: true });
|
|
|
|
const newPath = path.join(destPath, newFilename);
|
|
// Use copyFile and unlink instead of rename to avoid cross-device issues
|
|
await fs.copyFile(file.path, newPath);
|
|
await fs.unlink(file.path);
|
|
|
|
// Generate thumbnail
|
|
const thumbnailPath = await generateThumbnail(newPath);
|
|
|
|
// Calculate relative paths
|
|
const storagePath = getStoragePath();
|
|
const relativePath = path.relative(path.join(storagePath, 'events/active'), newPath);
|
|
const relativeThumbPath = thumbnailPath; // thumbnailPath is already relative to storage root
|
|
|
|
// Add to database with uploaded_by field
|
|
const [photoId] = await trx('photos').insert({
|
|
event_id: eventId,
|
|
filename: newFilename,
|
|
path: relativePath,
|
|
thumbnail_path: relativeThumbPath,
|
|
type: photoType,
|
|
size_bytes: file.size
|
|
});
|
|
|
|
// Commit transaction
|
|
await trx.commit();
|
|
|
|
uploadedPhotos.push({
|
|
id: photoId,
|
|
filename: newFilename,
|
|
size: file.size,
|
|
type: photoType
|
|
});
|
|
} catch (error) {
|
|
console.error(`Error processing file ${file.originalname}:`, error);
|
|
if (trx) await trx.rollback();
|
|
// Continue with other files
|
|
}
|
|
}
|
|
|
|
return uploadedPhotos;
|
|
}
|
|
|
|
module.exports = {
|
|
processUploadedPhotos
|
|
}; |