If you received this email, the email configuration seems to be correct.
'); - }); + await mail.send((message) => { + message + // .from(Config.get('mail.from.address')) + .from('tethys@geosphere.at') + .to(userEmail) + .subject('Test Email') + .html('If you received this email, the email configuration seems to be correct.
'); + }); return response.json({ success: true, message: 'Test email sent successfully' }); // return response.flash('Test email sent successfully!', 'message').redirect().back(); diff --git a/app/Controllers/Http/Api/AuthorsController.ts b/app/Controllers/Http/Api/AuthorsController.ts index 2b0bae1..7209699 100644 --- a/app/Controllers/Http/Api/AuthorsController.ts +++ b/app/Controllers/Http/Api/AuthorsController.ts @@ -4,29 +4,20 @@ import Person from '#models/person'; // node ace make:controller Author export default class AuthorsController { - public async index({}: HttpContext) { - + public async index({}: HttpContext) { + // select * from gba.persons + // where exists (select * from gba.documents inner join gba.link_documents_persons on "documents"."id" = "link_documents_persons"."document_id" + // where ("link_documents_persons"."role" = 'author') and ("persons"."id" = "link_documents_persons"."person_id")); const authors = await Person.query() - .select([ - 'id', - 'academic_title', - 'first_name', - 'last_name', - 'identifier_orcid', - 'status', - 'name_type', - 'created_at' - // Note: 'email' is omitted - ]) - .preload('datasets') - .where('name_type', 'Personal') - .whereHas('datasets', (dQuery) => { - dQuery.wherePivot('role', 'author'); - }) - .withCount('datasets', (query) => { - query.as('datasets_count'); - }) - .orderBy('datasets_count', 'desc'); + .preload('datasets') + .where('name_type', 'Personal') + .whereHas('datasets', (dQuery) => { + dQuery.wherePivot('role', 'author'); + }) + .withCount('datasets', (query) => { + query.as('datasets_count'); + }) + .orderBy('datasets_count', 'desc'); return authors; } diff --git a/app/Controllers/Http/Api/AvatarController.ts b/app/Controllers/Http/Api/AvatarController.ts index d7c532f..74fe135 100644 --- a/app/Controllers/Http/Api/AvatarController.ts +++ b/app/Controllers/Http/Api/AvatarController.ts @@ -2,46 +2,26 @@ import type { HttpContext } from '@adonisjs/core/http'; import { StatusCodes } from 'http-status-codes'; import redis from '@adonisjs/redis/services/main'; -const PREFIXES = ['von', 'van', 'de', 'del', 'della', 'di', 'da', 'dos', 'du', 'le', 'la']; +const PREFIXES = ['von', 'van']; const DEFAULT_SIZE = 50; -const MIN_SIZE = 16; -const MAX_SIZE = 512; const FONT_SIZE_RATIO = 0.4; const COLOR_LIGHTENING_PERCENT = 60; const COLOR_DARKENING_FACTOR = 0.6; -const CACHE_TTL = 24 * 60 * 60; // 24 hours instead of 1 hour export default class AvatarController { public async generateAvatar({ request, response }: HttpContext) { try { const { name, size = DEFAULT_SIZE } = request.only(['name', 'size']); - - // Enhanced validation - if (!name || typeof name !== 'string' || name.trim().length === 0) { - return response.status(StatusCodes.BAD_REQUEST).json({ - error: 'Name is required and must be a non-empty string', - }); - } - - const parsedSize = this.validateSize(size); - if (!parsedSize.isValid) { - return response.status(StatusCodes.BAD_REQUEST).json({ - error: parsedSize.error, - }); + if (!name) { + return response.status(StatusCodes.BAD_REQUEST).json({ error: 'Name is required' }); } // Build a unique cache key for the given name and size - const cacheKey = `avatar:${this.sanitizeName(name)}-${parsedSize.value}`; - // const cacheKey = `avatar:${name.trim().toLowerCase()}-${size}`; - try { - const cachedSvg = await redis.get(cacheKey); - if (cachedSvg) { - this.setResponseHeaders(response); - return response.send(cachedSvg); - } - } catch (redisError) { - // Log redis error but continue without cache - console.warn('Redis cache read failed:', redisError); + const cacheKey = `avatar:${name.trim().toLowerCase()}-${size}`; + const cachedSvg = await redis.get(cacheKey); + if (cachedSvg) { + this.setResponseHeaders(response); + return response.send(cachedSvg); } const initials = this.getInitials(name); @@ -49,85 +29,41 @@ export default class AvatarController { const svgContent = this.createSvg(size, colors, initials); // // Cache the generated avatar for future use, e.g. 1 hour expiry - try { - await redis.setex(cacheKey, CACHE_TTL, svgContent); - } catch (redisError) { - // Log but don't fail the request - console.warn('Redis cache write failed:', redisError); - } + await redis.setex(cacheKey, 3600, svgContent); this.setResponseHeaders(response); return response.send(svgContent); } catch (error) { - console.error('Avatar generation error:', error); - return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ - error: 'Failed to generate avatar', - }); + return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error: error.message }); } } - private validateSize(size: any): { isValid: boolean; value?: number; error?: string } { - const numSize = Number(size); - - if (isNaN(numSize)) { - return { isValid: false, error: 'Size must be a valid number' }; - } - - if (numSize < MIN_SIZE || numSize > MAX_SIZE) { - return { - isValid: false, - error: `Size must be between ${MIN_SIZE} and ${MAX_SIZE}`, - }; - } - - return { isValid: true, value: Math.floor(numSize) }; - } - - private sanitizeName(name: string): string { - return name - .trim() - .toLowerCase() - .replace(/[^a-z0-9\s-]/gi, ''); - } - private getInitials(name: string): string { - const sanitized = name.trim().replace(/\s+/g, ' '); // normalize whitespace - const parts = sanitized + const parts = name + .trim() .split(' ') - .filter((part) => part.length > 0) - .map((part) => part.trim()); + .filter((part) => part.length > 0); if (parts.length === 0) { return 'NA'; } - if (parts.length === 1) { - // For single word, take first 2 characters or first char if only 1 char - return parts[0].substring(0, Math.min(2, parts[0].length)).toUpperCase(); + if (parts.length >= 2) { + return this.getMultiWordInitials(parts); } - - return this.getMultiWordInitials(parts); + return parts[0].substring(0, 2).toUpperCase(); } private getMultiWordInitials(parts: string[]): string { - // Filter out prefixes and short words - const significantParts = parts.filter((part) => !PREFIXES.includes(part.toLowerCase()) && part.length > 1); + const firstName = parts[0]; + const lastName = parts[parts.length - 1]; + const firstInitial = firstName.charAt(0).toUpperCase(); + const lastInitial = lastName.charAt(0).toUpperCase(); - if (significantParts.length === 0) { - // Fallback to first and last regardless of prefixes - const firstName = parts[0]; - const lastName = parts[parts.length - 1]; - return (firstName.charAt(0) + lastName.charAt(0)).toUpperCase(); + if (PREFIXES.includes(lastName.toLowerCase()) && lastName === lastName.toUpperCase()) { + return firstInitial + lastName.charAt(1).toUpperCase(); } - - if (significantParts.length === 1) { - return significantParts[0].substring(0, 2).toUpperCase(); - } - - // Take first and last significant parts - const firstName = significantParts[0]; - const lastName = significantParts[significantParts.length - 1]; - return (firstName.charAt(0) + lastName.charAt(0)).toUpperCase(); + return firstInitial + lastInitial; } private generateColors(name: string): { background: string; text: string } { @@ -139,44 +75,31 @@ export default class AvatarController { } private createSvg(size: number, colors: { background: string; text: string }, initials: string): string { - const fontSize = Math.max(12, Math.floor(size * FONT_SIZE_RATIO)); // Ensure readable font size - - // Escape any potential HTML/XML characters in initials - const escapedInitials = this.escapeXml(initials); - - return ``; - } - - private escapeXml(text: string): string { - return text.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, '''); + const fontSize = size * FONT_SIZE_RATIO; + return ` + + `; } private setResponseHeaders(response: HttpContext['response']): void { - response.header('Content-Type', 'image/svg+xml'); - response.header('Cache-Control', 'public, max-age=86400'); // Cache for 1 day - response.header('ETag', `"${Date.now()}"`); // Simple ETag + response.header('Content-type', 'image/svg+xml'); + response.header('Cache-Control', 'no-cache'); + response.header('Pragma', 'no-cache'); + response.header('Expires', '0'); } private getColorFromName(name: string): string { let hash = 0; - const normalizedName = name.toLowerCase().trim(); - - for (let i = 0; i < normalizedName.length; i++) { - hash = normalizedName.charCodeAt(i) + ((hash << 5) - hash); - hash = hash & hash; // Convert to 32-bit integer + for (let i = 0; i < name.length; i++) { + hash = name.charCodeAt(i) + ((hash << 5) - hash); } - // Ensure we get vibrant colors by constraining the color space const colorParts = []; for (let i = 0; i < 3; i++) { - let value = (hash >> (i * 8)) & 0xff; - // Ensure minimum color intensity for better contrast - value = Math.max(50, value); + const value = (hash >> (i * 8)) & 0xff; colorParts.push(value.toString(16).padStart(2, '0')); } return colorParts.join(''); @@ -187,7 +110,7 @@ export default class AvatarController { const g = parseInt(hexColor.substring(2, 4), 16); const b = parseInt(hexColor.substring(4, 6), 16); - const lightenValue = (value: number) => Math.min(255, Math.floor(value + (255 - value) * (percent / 100))); + const lightenValue = (value: number) => Math.min(255, Math.floor((value * (100 + percent)) / 100)); const newR = lightenValue(r); const newG = lightenValue(g); @@ -201,7 +124,7 @@ export default class AvatarController { const g = parseInt(hexColor.slice(2, 4), 16); const b = parseInt(hexColor.slice(4, 6), 16); - const darkenValue = (value: number) => Math.max(0, Math.floor(value * COLOR_DARKENING_FACTOR)); + const darkenValue = (value: number) => Math.round(value * COLOR_DARKENING_FACTOR); const darkerR = darkenValue(r); const darkerG = darkenValue(g); diff --git a/app/Controllers/Http/Api/DatasetController.ts b/app/Controllers/Http/Api/DatasetController.ts index 9106521..b80949d 100644 --- a/app/Controllers/Http/Api/DatasetController.ts +++ b/app/Controllers/Http/Api/DatasetController.ts @@ -1,36 +1,24 @@ import type { HttpContext } from '@adonisjs/core/http'; +// import Person from 'App/Models/Person'; import Dataset from '#models/dataset'; import { StatusCodes } from 'http-status-codes'; -import DatasetReference from '#models/dataset_reference'; // node ace make:controller Author export default class DatasetController { - /** - * GET /api/datasets - * Find all published datasets - */ - public async index({ response }: HttpContext) { - try { - const datasets = await Dataset.query() - .where(function (query) { - query.where('server_state', 'published').orWhere('server_state', 'deleted'); - }) - .preload('titles') - .preload('identifier') - .orderBy('server_date_published', 'desc'); + public async index({}: HttpContext) { + // Select datasets with server_state 'published' or 'deleted' and sort by the last published date + const datasets = await Dataset.query() + .where(function (query) { + query.where('server_state', 'published') + .orWhere('server_state', 'deleted'); + }) + .preload('titles') + .preload('identifier') + .orderBy('server_date_published', 'desc'); - return response.status(StatusCodes.OK).json(datasets); - } catch (error) { - return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ - message: error.message || 'Some error occurred while retrieving datasets.', - }); - } + return datasets; } - /** - * GET /api/dataset - * Find all published datasets - */ public async findAll({ response }: HttpContext) { try { const datasets = await Dataset.query() @@ -46,279 +34,34 @@ export default class DatasetController { } } - /** - * GET /api/dataset/:publish_id - * Find one dataset by publish_id - */ - public async findOne({ response, params }: HttpContext) { - try { - const dataset = await Dataset.query() - .where('publish_id', params.publish_id) - .preload('titles') - .preload('descriptions') // Using 'descriptions' instead of 'abstracts' - .preload('user', (builder) => { - builder.select(['id', 'firstName', 'lastName', 'avatar', 'login']); - }) - .preload('authors', (builder) => { - builder - .select(['id', 'academic_title', 'first_name', 'last_name', 'identifier_orcid', 'status', 'name_type']) - .withCount('datasets', (query) => { - query.as('datasets_count'); - }) - .pivotColumns(['role', 'sort_order']) - .orderBy('pivot_sort_order', 'asc'); - }) - .preload('contributors', (builder) => { - builder - .select(['id', 'academic_title', 'first_name', 'last_name', 'identifier_orcid', 'status', 'name_type']) - .withCount('datasets', (query) => { - query.as('datasets_count'); - }) - .pivotColumns(['role', 'sort_order', 'contributor_type']) - .orderBy('pivot_sort_order', 'asc'); - }) - .preload('subjects') - .preload('coverage') - .preload('licenses') - .preload('references') - .preload('project') - // .preload('referenced_by', (builder) => { - // builder.preload('dataset', (builder) => { - // builder.preload('identifier'); - // }); - // }) - .preload('files', (builder) => { - builder.preload('hashvalues'); - }) - .preload('identifier') - .first(); // Use first() instead of firstOrFail() to handle not found gracefully - - if (!dataset) { - return response.status(StatusCodes.NOT_FOUND).json({ - message: `Cannot find Dataset with publish_id=${params.publish_id}.`, + public async findOne({ params }: HttpContext) { + const datasets = await Dataset.query() + .where('publish_id', params.publish_id) + .preload('titles') + .preload('descriptions') + .preload('user') + .preload('authors', (builder) => { + builder.orderBy('pivot_sort_order', 'asc'); + }) + .preload('contributors', (builder) => { + builder.orderBy('pivot_sort_order', 'asc'); + }) + .preload('subjects') + .preload('coverage') + .preload('licenses') + .preload('references') + .preload('project') + .preload('referenced_by', (builder) => { + builder.preload('dataset', (builder) => { + builder.preload('identifier'); }); - } + }) + .preload('files', (builder) => { + builder.preload('hashvalues'); + }) + .preload('identifier') + .firstOrFail(); - // Build the version chain - const versionChain = await this.buildVersionChain(dataset); - - // Add version chain to response - const responseData = { - ...dataset.toJSON(), - versionChain: versionChain, - }; - - // return response.status(StatusCodes.OK).json(dataset); - return response.status(StatusCodes.OK).json(responseData); - } catch (error) { - return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ - message: error.message || `Error retrieving Dataset with publish_id=${params.publish_id}.`, - }); - } - } - - /** - * GET /:prefix/:value - * Find dataset by identifier (e.g., https://doi.tethys.at/10.24341/tethys.99.2) - */ - public async findByIdentifier({ response, params }: HttpContext) { - const identifierValue = `${params.prefix}/${params.value}`; - - // Optional: Validate DOI format - if (!identifierValue.match(/^10\.\d+\/[a-zA-Z0-9._-]+\.[0-9]+(?:\.[0-9]+)*$/)) { - return response.status(StatusCodes.BAD_REQUEST).json({ - message: `Invalid DOI format: ${identifierValue}`, - }); - } - - try { - // Method 1: Using subquery with whereIn (most similar to your original) - const dataset = await Dataset.query() - // .whereIn('id', (subQuery) => { - // subQuery.select('dataset_id').from('dataset_identifiers').where('value', identifierValue); - // }) - .whereHas('identifier', (builder) => { - builder.where('value', identifierValue); - }) - .preload('titles') - .preload('descriptions') // Using 'descriptions' instead of 'abstracts' - .preload('user', (builder) => { - builder.select(['id', 'firstName', 'lastName', 'avatar', 'login']); - }) - .preload('authors', (builder) => { - builder - .select(['id', 'academic_title', 'first_name', 'last_name', 'identifier_orcid', 'status', 'name_type']) - .withCount('datasets', (query) => { - query.as('datasets_count'); - }) - .pivotColumns(['role', 'sort_order']) - .wherePivot('role', 'author') - .orderBy('pivot_sort_order', 'asc'); - }) - .preload('contributors', (builder) => { - builder - .select(['id', 'academic_title', 'first_name', 'last_name', 'identifier_orcid', 'status', 'name_type']) - .withCount('datasets', (query) => { - query.as('datasets_count'); - }) - .pivotColumns(['role', 'sort_order', 'contributor_type']) - .wherePivot('role', 'contributor') - .orderBy('pivot_sort_order', 'asc'); - }) - .preload('subjects') - .preload('coverage') - .preload('licenses') - .preload('references') - .preload('project') - // .preload('referenced_by', (builder) => { - // builder.preload('dataset', (builder) => { - // builder.preload('identifier'); - // }); - // }) - .preload('files', (builder) => { - builder.preload('hashvalues'); - }) - .preload('identifier') - .first(); - - if (!dataset) { - return response.status(StatusCodes.NOT_FOUND).json({ - message: `Cannot find Dataset with identifier=${identifierValue}.`, - }); - } - // Build the version chain - const versionChain = await this.buildVersionChain(dataset); - - // Add version chain to response - const responseData = { - ...dataset.toJSON(), - versionChain: versionChain, - }; - - // return response.status(StatusCodes.OK).json(dataset); - return response.status(StatusCodes.OK).json(responseData); - } catch (error) { - return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ - message: error.message || `Error retrieving Dataset with identifier=${identifierValue}.`, - }); - } - } - - /** - * Build the complete version chain for a dataset - * Traverses both backwards (previous versions) and forwards (newer versions) - */ - private async buildVersionChain(dataset: Dataset) { - const versionChain = { - current: { - id: dataset.id, - publish_id: dataset.publish_id, - doi: dataset.identifier?.value || null, - main_title: dataset.mainTitle || null, - server_date_published: dataset.server_date_published, - }, - previousVersions: [] as any[], - newerVersions: [] as any[], - }; - - // Get all previous versions (going backwards in time) - versionChain.previousVersions = await this.getPreviousVersions(dataset.id); - - // Get all newer versions (going forwards in time) - versionChain.newerVersions = await this.getNewerVersions(dataset.id); - - return versionChain; - } - - /** - * Recursively get all previous versions - */ - private async getPreviousVersions(datasetId: number, visited: Set