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

added changes to reports repository to implement intermediary table and multiple report_types

This commit is contained in:
Pau 2025-05-25 04:38:33 +02:00
parent 85bf0d208a
commit e5a6c64196
1 changed files with 84 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,64 +4,71 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid,
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 ratingCondition = rating ? 'AND up.rating = :rating' : ''; const ratingCondition = rating ? 'AND up.rating = :rating' : '';
const descriptionCondition = description ? `AND up.description LIKE CONCAT('%',:description,'%')` : ''; const descriptionCondition = description ? `AND up.description LIKE CONCAT('%',:description,'%')` : '';
// Conditional fields and joins for the report type // For filter type, we do EXISTS with intermediate table
const reportTypeFields = report_type_uuid ? `, rt.name AS report_type_name, const reportTypeCondition = report_type_uuid ? `
rt.uuid AS report_type_uuid` : ''; AND EXISTS (
SELECT 1 FROM dbmaster.report_report_type rrt
const reportTypeJoin = report_type_uuid ? 'LEFT JOIN dbmaster.report_types AS rt ON up.fk_report_type = rt.id' : ''; WHERE rrt.report_uuid = up.uuid AND rrt.report_type_uuid = :report_type_uuid
)
const reportTypeDeletedCondition = report_type_uuid ? 'AND rt.deleted IS NULL' : ''; ` : '';
return ` return `
SELECT ${count || SELECT ${count || `up.*,
`up.*,
u.username AS user_username, u.username AS user_username,
u.uuid AS user_uuid, u.uuid AS user_uuid,
p.name AS place_name, p.name AS place_name,
p.uuid AS place_uuid${reportTypeFields}`} p.uuid AS place_uuid,
GROUP_CONCAT(rt.uuid) AS report_type_uuids,
GROUP_CONCAT(rt.name) AS report_type_names`
}
FROM dbmaster.users_has_places AS up FROM dbmaster.users_has_places AS up
LEFT JOIN dbmaster.users AS u ON up.fk_user = u.id LEFT JOIN dbmaster.users AS u ON up.fk_user = u.id
LEFT JOIN dbmaster.places AS p ON up.fk_place = p.id LEFT JOIN dbmaster.places AS p ON up.fk_place = p.id
${reportTypeJoin} LEFT JOIN dbmaster.report_report_type AS rrt ON rrt.report_uuid = up.uuid
LEFT JOIN dbmaster.report_types AS rt ON rt.uuid = rrt.report_type_uuid
WHERE up.created <= :now WHERE up.created <= :now
AND (up.deleted > :now OR up.deleted IS NULL) AND (up.deleted > :now OR up.deleted IS NULL)
AND u.deleted IS NULL AND u.deleted IS NULL
AND p.deleted IS NULL AND p.deleted IS NULL
${reportTypeDeletedCondition}
${uuidCondition} ${uuidCondition}
${user_uuidCondition} ${user_uuidCondition}
${place_uuidCondition} ${place_uuidCondition}
${report_type_uuidCondition} ${reportTypeCondition}
${ratingCondition} ${ratingCondition}
${descriptionCondition} ${descriptionCondition}
GROUP BY up.uuid
${_pagination} ${_pagination}
`; `;
} }
const getUserHasPlacesListQuery = ({ limit, page, ...rest }) => const getUserHasPlacesListQuery = ({ limit, page, ...rest }) =>
_userHasPlacesSelectQuery(pagination({ limit, page }))({ count: false })(rest); _userHasPlacesSelectQuery(pagination({ limit, page }))({ count: false })(rest);
const countUserHasPlacesListQuery = rest => const countUserHasPlacesListQuery = rest =>
_userHasPlacesSelectQuery()({ count: 'COUNT(DISTINCT(up.uuid)) AS count' })(rest); _userHasPlacesSelectQuery()({ count: 'COUNT(DISTINCT(up.uuid)) AS count' })(rest);
const insertUserHasPlacesQuery = ({ user_uuid, place_uuid, description, createdBy, report_type_uuid, images}) => { const insertUserHasPlacesQuery = ({ user_uuid, place_uuid, description, createdBy, report_type_uuid, images }) => {
const user_uuidCondition = user_uuid ? '(SELECT id FROM dbmaster.users WHERE uuid = :user_uuid)' : null; const report_type_uuidStatements = report_type_uuid && report_type_uuid.length > 0
const place_uuidCondition = place_uuid ? '(SELECT id FROM dbmaster.places WHERE uuid = :place_uuid)' : null; ? report_type_uuid.map(rt =>
const createdByCondition = createdBy ? ':createdBy' : null; `INSERT INTO dbmaster.report_report_type (report_uuid, report_type_uuid) VALUES (:uuid, '${rt}');`
const descriptionCondition = description ? ':description' : null; ).join('\n ')
const reportTypeCondition = report_type_uuid ? `(SELECT id FROM dbmaster.report_types WHERE uuid = :report_type_uuid)` : null; : '';
const imagesCondition = images ? ':images' : null;
const user_uuidCondition = user_uuid ? '(SELECT id FROM dbmaster.users WHERE uuid = :user_uuid)' : 'NULL';
const place_uuidCondition = place_uuid ? '(SELECT id FROM dbmaster.places WHERE uuid = :place_uuid)' : 'NULL';
const createdByCondition = createdBy ? ':createdBy' : 'NULL';
const descriptionCondition = description ? ':description' : 'NULL';
const imagesCondition = images ? ':images' : 'NULL';
return ` return `
INSERT INTO dbmaster.users_has_places ( INSERT INTO dbmaster.users_has_places (
uuid, uuid,
fk_user, fk_user,
fk_place, fk_place,
fk_report_type,
rating, rating,
images, images,
description, description,
@ -72,40 +79,75 @@ const insertUserHasPlacesQuery = ({ user_uuid, place_uuid, description, createdB
:uuid, :uuid,
${user_uuidCondition}, ${user_uuidCondition},
${place_uuidCondition}, ${place_uuidCondition},
${reportTypeCondition},
:rating, :rating,
${imagesCondition}, ${imagesCondition},
${descriptionCondition}, ${descriptionCondition},
${createdByCondition}, ${createdByCondition},
:now :now
); );
SELECT * FROM dbmaster.users_has_places WHERE uuid = :uuid;
` ${report_type_uuidStatements}
SELECT
up.*,
u.username AS user_username,
u.uuid AS user_uuid,
p.name AS place_name,
p.uuid AS place_uuid,
GROUP_CONCAT(rt.uuid) AS report_type_uuids,
GROUP_CONCAT(rt.name) AS report_type_names
FROM dbmaster.users_has_places AS up
LEFT JOIN dbmaster.users AS u ON up.fk_user = u.id
LEFT JOIN dbmaster.places AS p ON up.fk_place = p.id
LEFT JOIN dbmaster.report_report_type AS rrt ON rrt.report_uuid = up.uuid
LEFT JOIN dbmaster.report_types AS rt ON rt.uuid = rrt.report_type_uuid
WHERE up.created <= :now
AND (up.deleted > :now OR up.deleted IS NULL)
AND u.deleted IS NULL
AND p.deleted IS NULL
GROUP BY up.uuid;
`;
} }
const modifyUserHasPlacesQuery = ({user_uuid, place_uuid, report_type_uuid, rating, images, description}) => { const modifyUserHasPlacesQuery = ({user_uuid, place_uuid, report_type_uuid, rating, images, description}) => {
const user_uuidCondition = user_uuid ? 'fk_user = (SELECT id FROM dbmaster.users WHERE uuid = :user_uuid),' : ``; const user_uuidCondition = user_uuid ? 'fk_user = (SELECT id FROM dbmaster.users WHERE uuid = :user_uuid),' : '';
const place_uuidCondition = place_uuid ? 'fk_place = (SELECT id FROM dbmaster.places WHERE uuid = :place_uuid),' : ``; const place_uuidCondition = place_uuid ? 'fk_place = (SELECT id FROM dbmaster.places WHERE uuid = :place_uuid),' : '';
const report_type_uuidCondition = report_type_uuid ? 'fk_report_type = (SELECT id FROM dbmaster.report_types WHERE uuid = :report_type_uuid),' : ``; const report_type_uuidCondition = report_type_uuid ? `DELETE FROM dbmaster.report_report_type WHERE report_uuid = :uuid; ${report_type_uuid.map(rt => `INSERT INTO dbmaster.report_report_type (report_uuid, report_type_uuid) VALUES (:uuid, '${rt}');`).join(' ')}` : '';
const ratingCondition = rating ? 'rating = :rating,' : ``; const ratingCondition = rating ? 'rating = :rating,' : '';
const imagesCondition = images ? `images = :images,` : ''; const imagesCondition = images ? 'images = :images,' : '';
const descriptionCondition = description ? `description = :description,` : ``; const descriptionCondition = description ? 'description = :description,' : '';
return ` return `
${report_type_uuidCondition}
UPDATE dbmaster.users_has_places UPDATE dbmaster.users_has_places
SET SET
${user_uuidCondition} ${user_uuidCondition}
${place_uuidCondition} ${place_uuidCondition}
${report_type_uuidCondition}
${ratingCondition} ${ratingCondition}
${imagesCondition} ${imagesCondition}
${descriptionCondition} ${descriptionCondition}
uuid = :uuid modified = :now
WHERE WHERE uuid = :uuid AND deleted IS NULL;
users_has_places.uuid = :uuid
AND SELECT
users_has_places.deleted IS NULL; up.*,
SELECT * FROM dbmaster.users_has_places WHERE uuid = :uuid; u.username AS user_username,
` u.uuid AS user_uuid,
p.name AS place_name,
p.uuid AS place_uuid,
GROUP_CONCAT(rt.uuid) AS report_type_uuids,
GROUP_CONCAT(rt.name) AS report_type_names
FROM dbmaster.users_has_places AS up
LEFT JOIN dbmaster.users AS u ON up.fk_user = u.id
LEFT JOIN dbmaster.places AS p ON up.fk_place = p.id
LEFT JOIN dbmaster.report_report_type AS rrt ON rrt.report_uuid = up.uuid
LEFT JOIN dbmaster.report_types AS rt ON rt.uuid = rrt.report_type_uuid
WHERE up.uuid = :uuid
AND (up.deleted > :now OR up.deleted IS NULL)
AND u.deleted IS NULL
AND p.deleted IS NULL
GROUP BY up.uuid;
`;
} }
const softDeleteUserHasPlacesQuery = () => { const softDeleteUserHasPlacesQuery = () => {