query fix

This commit is contained in:
Pau 2025-04-22 00:38:01 +02:00
parent 82505b58d9
commit cdd0b1d844
1 changed files with 5 additions and 12 deletions

View File

@ -1,5 +1,5 @@
import { pagination } from "../../utils/pagination.js"; import { pagination } from "../../utils/pagination.js";
//reports repository
const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, user_uuid, place_uuid, report_type_uuid, rating }) => { const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, user_uuid, place_uuid, report_type_uuid, rating }) => {
const uuidCondition = uuid ? 'AND up.uuid = :uuid ' : ''; const uuidCondition = uuid ? 'AND up.uuid = :uuid ' : '';
const user_uuidCondition = user_uuid ? 'AND up.fk_user = (SELECT id FROM dbmaster.users WHERE uuid = :user_uuid)' : ''; const user_uuidCondition = user_uuid ? 'AND up.fk_user = (SELECT id FROM dbmaster.users WHERE uuid = :user_uuid)' : '';
@ -8,19 +8,12 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid,
const ratingCondition = rating ? 'AND up.rating = :rating' : ''; const ratingCondition = rating ? 'AND up.rating = :rating' : '';
// Conditional fields and joins for the report type // Conditional fields and joins for the report type
const reportTypeFields = ` const reportTypeFields = report_type_uuid ? `rt.name AS report_type_name,
${count ? '' : `, rt.uuid AS report_type_uuid` : '';
rt.name AS report_type_name,
rt.uuid AS report_type_uuid`}
`;
const reportTypeJoin = ` const reportTypeJoin = report_type_uuid ? 'LEFT JOIN dbmaster.report_types AS rt ON up.fk_report_type = rt.id' : '';
${up.fk_report_type ? 'LEFT JOIN dbmaster.report_types AS rt ON up.fk_report_type = rt.id' : ''}
`;
const reportTypeDeletedCondition = ` const reportTypeDeletedCondition = report_type_uuid ? 'AND rt.deleted IS NULL' : '';
${up.fk_report_type ? 'AND rt.deleted IS NULL' : ''}
`;
return ` return `
SELECT ${count || SELECT ${count ||