diff --git a/src/models/resource_types/usersHasPlacesModel.js b/src/models/resource_types/usersHasPlacesModel.js index 94fc5da..936be6a 100644 --- a/src/models/resource_types/usersHasPlacesModel.js +++ b/src/models/resource_types/usersHasPlacesModel.js @@ -10,7 +10,7 @@ const getUserHasPlacesListModel = ({conn, ...rest}) => { const paramsToSearch = {...rest, now} return mysql .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}) => { diff --git a/src/repositories/resource_types/usersHasPlacesRepository.js b/src/repositories/resource_types/usersHasPlacesRepository.js index 7f59e68..b1460e5 100644 --- a/src/repositories/resource_types/usersHasPlacesRepository.js +++ b/src/repositories/resource_types/usersHasPlacesRepository.js @@ -1,11 +1,12 @@ 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 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 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 descriptionCondition = description ? `AND up.description LIKE CONCAT('%',:description,'%')` : ''; // Conditional fields and joins for the report type const reportTypeFields = report_type_uuid ? `rt.name AS report_type_name, @@ -36,6 +37,7 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, ${place_uuidCondition} ${report_type_uuidCondition} ${ratingCondition} + ${descriptionCondition} ${_pagination} `; }