# Structured Logging System Implementation ## Summary Implements a comprehensive structured logging system to replace verbose console.* calls throughout the codebase, addressing all cleanup tasks from CLEANUP.md. ## What Changed ### Core Features - ✅ **Structured Logging System** - New `lib/logger.ts` with DEBUG, INFO, WARN, ERROR levels - ✅ **Environment-Based Control** - `LOG_LEVEL` env var controls verbosity (DEBUG/INFO/WARN/ERROR/NONE) - ✅ **JSON Logging Option** - `LOG_FORMAT=json` for structured JSON output - ✅ **Shared Constants** - Extracted session cookie name to `lib/constants.ts` ### Code Refactoring - ✅ Replaced all `console.*` calls in API routes with structured logger - ✅ Refactored `activity-log.ts` to use new logger system - ✅ Reduced verbose logging in auth, photos page, and upload routes - ✅ Updated proxy.ts to use structured logging - ✅ Removed unused legacy `/api/photos` route (replaced by `/api/photos/upload`) ### Security Improvements - ✅ Protected `/api/debug/session` endpoint with admin-only access - ✅ Added proper error logging with structured context ### Documentation - ✅ Documented multiple upload routes usage - ✅ Enhanced watch-activity.sh script documentation - ✅ Updated README.md with upload endpoint information - ✅ Added configuration documentation to next.config.ts ### Testing - ✅ Added 23 tests for logger system - ✅ Added 8 tests for refactored activity-log - ✅ All 43 tests passing ## Benefits 1. **Production-Ready Logging** - Environment-based control, defaults to INFO in production 2. **Reduced Verbosity** - DEBUG logs only show in development or when explicitly enabled 3. **Structured Output** - JSON format option for log aggregation tools 4. **Better Organization** - Shared constants, consistent logging patterns 5. **Improved Security** - Debug endpoint now requires admin access ## Testing ### Manual Testing - ✅ Server builds successfully - ✅ All tests pass (43/43) - ✅ Type checking passes - ✅ Linting passes - ✅ Production server runs with logs visible - ✅ Log levels work correctly (DEBUG shows all, INFO shows activity, etc.) ### Test Coverage - Logger system: 100% coverage - Activity log: 100% coverage - All existing tests still pass ## Configuration ### Environment Variables ```bash # Control log verbosity (DEBUG, INFO, WARN, ERROR, NONE) LOG_LEVEL=INFO # Use structured JSON logging LOG_FORMAT=json ``` ### Defaults - Development: `LOG_LEVEL=DEBUG` (shows all logs) - Production: `LOG_LEVEL=INFO` (shows activity and above) ## Migration Notes - No breaking changes (legacy route was unused) - All existing functionality preserved - Logs are now structured and filterable - Debug endpoint now requires admin authentication - Legacy `/api/photos` endpoint removed (use `/api/photos/upload` instead) ## Checklist - [x] All console.* calls replaced in API routes - [x] Logger system implemented with tests - [x] Activity logging refactored - [x] Debug endpoint protected - [x] Documentation updated - [x] All tests passing - [x] Type checking passes - [x] Linting passes - [x] Build succeeds - [x] Manual testing completed ## Related Issues Addresses cleanup tasks from CLEANUP.md: - Task 1: Verbose logging in production ✅ - Task 2: Activity logging optimization ✅ - Task 3: Upload verification logging ✅ - Task 4: Middleware debug logging ✅ - Task 5: Legacy upload route documentation ✅ - Task 6: Multiple upload routes documentation ✅ - Task 7: Cookie name constant extraction ✅ - Task 8: Next.js config documentation ✅ - Task 9: ARCHITECTURE.md (already correct) ✅ - Task 10: Watch activity script documentation ✅ Reviewed-on: #4
256 lines
7.9 KiB
TypeScript
256 lines
7.9 KiB
TypeScript
/**
|
|
* Multiple Photo Upload Endpoint
|
|
*
|
|
* POST /api/photos/upload-multiple
|
|
*
|
|
* Uploads multiple photos in a single request. Supports both file uploads and URL-based uploads.
|
|
*
|
|
* This endpoint is used by the upload page for batch uploads. It processes multiple photos
|
|
* in parallel and sends email notifications for all successfully uploaded photos.
|
|
*
|
|
* Form Data:
|
|
* - photo_{index}_file: File object (optional, if using file upload)
|
|
* - photo_{index}_url: URL string (optional, if using URL upload)
|
|
* - photo_{index}_answerName: Answer name (required)
|
|
* - photo_{index}_points: Points value (optional, defaults to 1)
|
|
* - photo_{index}_penaltyEnabled: "true" or "false" (optional)
|
|
* - photo_{index}_penaltyPoints: Penalty points (optional)
|
|
* - photo_{index}_maxAttempts: Maximum attempts (optional)
|
|
* - count: Number of photos being uploaded
|
|
*
|
|
* Related endpoints:
|
|
* - POST /api/photos/upload - Single photo upload (supports both file and URL)
|
|
*/
|
|
import { NextRequest, NextResponse } from "next/server"
|
|
import { auth } from "@/lib/auth"
|
|
import { prisma } from "@/lib/prisma"
|
|
import { sendNewPhotoEmail } from "@/lib/email"
|
|
import { logger } from "@/lib/logger"
|
|
import { writeFile } from "fs/promises"
|
|
import { join } from "path"
|
|
import { existsSync, mkdirSync } from "fs"
|
|
import { createHash } from "crypto"
|
|
|
|
export async function POST(req: NextRequest) {
|
|
try {
|
|
const session = await auth()
|
|
|
|
if (!session) {
|
|
return NextResponse.json({ error: "Unauthorized" }, { status: 401 })
|
|
}
|
|
|
|
// Verify the user exists in the database
|
|
const user = await prisma.user.findUnique({
|
|
where: { id: session.user.id },
|
|
select: { id: true },
|
|
})
|
|
|
|
if (!user) {
|
|
return NextResponse.json(
|
|
{ error: "User not found. Please log out and log back in." },
|
|
{ status: 401 }
|
|
)
|
|
}
|
|
|
|
const formData = await req.formData()
|
|
const count = parseInt(formData.get("count") as string, 10)
|
|
|
|
if (!count || count < 1) {
|
|
return NextResponse.json(
|
|
{ error: "Invalid photo count" },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const uploadsDir = join(process.cwd(), "public", "uploads")
|
|
if (!existsSync(uploadsDir)) {
|
|
mkdirSync(uploadsDir, { recursive: true })
|
|
}
|
|
|
|
type PhotoWithUploader = {
|
|
id: string
|
|
uploaderId: string
|
|
url: string
|
|
answerName: string
|
|
points: number
|
|
createdAt: Date
|
|
uploader: { name: string }
|
|
}
|
|
|
|
const createdPhotos: PhotoWithUploader[] = []
|
|
|
|
for (let i = 0; i < count; i++) {
|
|
const answerName = (formData.get(`photo_${i}_answerName`) as string)?.trim()
|
|
const pointsStr = (formData.get(`photo_${i}_points`) as string) || "1"
|
|
const pointsValue = Math.max(1, parseInt(pointsStr, 10))
|
|
const penaltyEnabled = formData.get(`photo_${i}_penaltyEnabled`) === "true"
|
|
const penaltyPointsStr = (formData.get(`photo_${i}_penaltyPoints`) as string) || "0"
|
|
const penaltyPointsValue = Math.max(0, parseInt(penaltyPointsStr, 10))
|
|
const maxAttemptsStr = (formData.get(`photo_${i}_maxAttempts`) as string)?.trim() || ""
|
|
const maxAttemptsValue = maxAttemptsStr && parseInt(maxAttemptsStr, 10) > 0
|
|
? parseInt(maxAttemptsStr, 10)
|
|
: null
|
|
|
|
if (!answerName) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: Answer name is required` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const file = formData.get(`photo_${i}_file`) as File | null
|
|
const url = (formData.get(`photo_${i}_url`) as string)?.trim() || null
|
|
|
|
if (!file && !url) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: File or URL is required` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
let photoUrl: string
|
|
let fileHash: string | null = null
|
|
|
|
if (file) {
|
|
// Handle file upload
|
|
if (!file.type.startsWith("image/")) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: File must be an image` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
if (file.size > 10 * 1024 * 1024) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: File size must be less than 10MB` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
const bytes = await file.arrayBuffer()
|
|
const buffer = Buffer.from(bytes)
|
|
|
|
// Calculate SHA256 hash for duplicate detection
|
|
fileHash = createHash("sha256").update(buffer).digest("hex")
|
|
|
|
// Check for duplicate file
|
|
const existingPhoto = await prisma.photo.findFirst({
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
where: { fileHash } as any,
|
|
})
|
|
|
|
if (existingPhoto) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: This photo has already been uploaded (duplicate file detected)` },
|
|
{ status: 409 }
|
|
)
|
|
}
|
|
|
|
const timestamp = Date.now()
|
|
const randomStr = Math.random().toString(36).substring(2, 15)
|
|
// Sanitize extension - only allow alphanumeric characters
|
|
const rawExtension = file.name.split(".").pop() || "jpg"
|
|
const extension = rawExtension.replace(/[^a-zA-Z0-9]/g, "").toLowerCase() || "jpg"
|
|
const filename = `${timestamp}-${i}-${randomStr}.${extension}`
|
|
|
|
// Filename is generated server-side (timestamp + random), safe for path.join
|
|
const filepath = join(uploadsDir, filename)
|
|
await writeFile(filepath, buffer)
|
|
|
|
photoUrl = `/api/uploads/${filename}`
|
|
} else if (url) {
|
|
// Handle URL upload
|
|
photoUrl = url
|
|
|
|
// Check for duplicate URL
|
|
const existingPhoto = await prisma.photo.findFirst({
|
|
where: { url: photoUrl },
|
|
})
|
|
|
|
if (existingPhoto) {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: This photo URL has already been uploaded (duplicate URL detected)` },
|
|
{ status: 409 }
|
|
)
|
|
}
|
|
} else {
|
|
return NextResponse.json(
|
|
{ error: `Photo ${i + 1}: File or URL is required` },
|
|
{ status: 400 }
|
|
)
|
|
}
|
|
|
|
// Create photo record
|
|
const photo = await prisma.photo.create({
|
|
data: {
|
|
uploaderId: session.user.id,
|
|
url: photoUrl,
|
|
fileHash,
|
|
answerName,
|
|
points: pointsValue,
|
|
penaltyEnabled: penaltyEnabled,
|
|
penaltyPoints: penaltyPointsValue,
|
|
maxAttempts: maxAttemptsValue,
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any,
|
|
include: {
|
|
uploader: {
|
|
select: {
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
})
|
|
|
|
createdPhotos.push(photo)
|
|
}
|
|
|
|
// Send emails to all other users for all photos
|
|
const allUsers = await prisma.user.findMany({
|
|
where: {
|
|
id: { not: session.user.id },
|
|
},
|
|
select: {
|
|
id: true,
|
|
email: true,
|
|
name: true,
|
|
},
|
|
})
|
|
|
|
// Send emails asynchronously for all photos
|
|
Promise.all(
|
|
allUsers.map((user: { id: string; email: string; name: string }) =>
|
|
Promise.all(
|
|
createdPhotos.map((photo: PhotoWithUploader) =>
|
|
sendNewPhotoEmail(
|
|
user.email,
|
|
user.name,
|
|
photo.id,
|
|
photo.uploader.name
|
|
).catch((err) => {
|
|
logger.error("Failed to send email", {
|
|
email: user.email,
|
|
photoId: photo.id,
|
|
error: err instanceof Error ? err : new Error(String(err)),
|
|
})
|
|
})
|
|
)
|
|
)
|
|
)
|
|
)
|
|
|
|
return NextResponse.json(
|
|
{ photos: createdPhotos, count: createdPhotos.length },
|
|
{ status: 201 }
|
|
)
|
|
} catch (error) {
|
|
logger.error("Error uploading photos", {
|
|
error: error instanceof Error ? error : new Error(String(error)),
|
|
})
|
|
return NextResponse.json(
|
|
{ error: "Internal server error" },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
}
|