pauher
/
LocationAPI
mirror of https://github.com/Misscott/LocationAPI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added description to conditions and excluded foreign keys from output

This commit is contained in:
Pau 2025-04-22 01:07:39 +02:00
parent bbfabc17e4
commit 3b89082a92
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/resource_types/usersHasPlacesModel.js
View File

@ -10,7 +10,7 @@ const getUserHasPlacesListModel = ({conn, ...rest}) => {
const paramsToSearch = {...rest, now} const paramsToSearch = {...rest, now}
return mysql return mysql
.execute(getUserHasPlacesListQuery(paramsToSearch), conn, paramsToSearch) .execute(getUserHasPlacesListQuery(paramsToSearch), conn, paramsToSearch)
.then(queryResult => queryResult.map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) .then(queryResult => queryResult.map(({id, fk_user, fk_place, fk_report_type, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered))
} }
const countUserHasPlacesListModel = ({conn, ...rest}) => { const countUserHasPlacesListModel = ({conn, ...rest}) => {

4
src/repositories/resource_types/usersHasPlacesRepository.js
View File

@ -1,11 +1,12 @@
import { pagination } from "../../utils/pagination.js"; import { pagination } from "../../utils/pagination.js";
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, description }) => {
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)' : '';
const place_uuidCondition = place_uuid ? 'AND up.fk_place = (SELECT id FROM dbmaster.places WHERE uuid = :place_uuid)' : ''; const place_uuidCondition = place_uuid ? 'AND up.fk_place = (SELECT id FROM dbmaster.places WHERE uuid = :place_uuid)' : '';
const report_type_uuidCondition = report_type_uuid ? 'AND up.fk_report_type = (SELECT id FROM dbmaster.report_types WHERE uuid = :report_type_uuid)' : ''; const report_type_uuidCondition = report_type_uuid ? 'AND up.fk_report_type = (SELECT id FROM dbmaster.report_types WHERE uuid = :report_type_uuid)' : '';
const ratingCondition = rating ? 'AND up.rating = :rating' : ''; const ratingCondition = rating ? 'AND up.rating = :rating' : '';
const descriptionCondition = description ? `AND up.description LIKE CONCAT('%',:description,'%')` : '';
// Conditional fields and joins for the report type // Conditional fields and joins for the report type
const reportTypeFields = report_type_uuid ? `rt.name AS report_type_name, const reportTypeFields = report_type_uuid ? `rt.name AS report_type_name,
@ -36,6 +37,7 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid,
${place_uuidCondition} ${place_uuidCondition}
${report_type_uuidCondition} ${report_type_uuidCondition}
${ratingCondition} ${ratingCondition}
${descriptionCondition}
${_pagination} ${_pagination}
`; `;
} }