strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unique sql wrapper functions

Browse Source
This commit is contained in:
Sam Becker 2024-05-20 11:33:39 -05:00
parent 58f52343dd
commit 17532465db
1 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/photo/db.ts
View File

@ -182,52 +182,64 @@ const sqlGetPhotosMostRecentUpdate = async () => sql`
SELECT updated_at FROM photos ORDER BY updated_at DESC LIMIT 1 SELECT updated_at FROM photos ORDER BY updated_at DESC LIMIT 1
`.then(({ rows }) => rows[0] ? rows[0].updated_at as Date : undefined); `.then(({ rows }) => rows[0] ? rows[0].updated_at as Date : undefined);
const sqlGetUniqueTags = async () => sql` export const getUniqueTags = async () =>
SELECT DISTINCT unnest(tags) as tag, COUNT(*) safelyQueryPhotos(() => sql`
FROM photos SELECT DISTINCT unnest(tags) as tag, COUNT(*)
WHERE hidden IS NOT TRUE FROM photos
GROUP BY tag WHERE hidden IS NOT TRUE
ORDER BY tag ASC GROUP BY tag
`.then(({ rows }): TagsWithMeta => rows.map(({ tag, count }) => ({ ORDER BY tag ASC
tag: tag as string, `.then(({ rows }): TagsWithMeta => rows.map(({ tag, count }) => ({
count: parseInt(count, 10), tag: tag as string,
})));
const sqlGetUniqueTagsHidden = async () => sql`
SELECT DISTINCT unnest(tags) as tag, COUNT(*)
FROM photos
GROUP BY tag
ORDER BY tag ASC
`.then(({ rows }): TagsWithMeta => rows.map(({ tag, count }) => ({
tag: tag as string,
count: parseInt(count, 10),
})));
const sqlGetUniqueCameras = async () => sql`
SELECT DISTINCT make||' '||model as camera, make, model, COUNT(*)
FROM photos
WHERE hidden IS NOT TRUE
AND trim(make) <> ''
AND trim(model) <> ''
GROUP BY make, model
ORDER BY camera ASC
`.then(({ rows }): Cameras => rows.map(({ make, model, count }) => ({
cameraKey: createCameraKey({ make, model }),
camera: { make, model },
count: parseInt(count, 10),
})));
const sqlGetUniqueFilmSimulations = async () => sql`
SELECT DISTINCT film_simulation, COUNT(*)
FROM photos
WHERE hidden IS NOT TRUE AND film_simulation IS NOT NULL
GROUP BY film_simulation
ORDER BY film_simulation ASC
`.then(({ rows }): FilmSimulations => rows
.map(({ film_simulation, count }) => ({
simulation: film_simulation as FilmSimulation,
count: parseInt(count, 10), count: parseInt(count, 10),
}))); }))),
'getUniqueTags',
);
export const getUniqueTagsHidden = async () =>
safelyQueryPhotos(() => sql`
SELECT DISTINCT unnest(tags) as tag, COUNT(*)
FROM photos
GROUP BY tag
ORDER BY tag ASC
`.then(({ rows }): TagsWithMeta => rows.map(({ tag, count }) => ({
tag: tag as string,
count: parseInt(count, 10),
}))),
'getUniqueTagsHidden',
);
export const getUniqueCameras = async () =>
safelyQueryPhotos(() => sql`
SELECT DISTINCT make||' '||model as camera, make, model, COUNT(*)
FROM photos
WHERE hidden IS NOT TRUE
AND trim(make) <> ''
AND trim(model) <> ''
GROUP BY make, model
ORDER BY camera ASC
`.then(({ rows }): Cameras => rows.map(({ make, model, count }) => ({
cameraKey: createCameraKey({ make, model }),
camera: { make, model },
count: parseInt(count, 10),
}))),
'getUniqueCameras',
);
export const getUniqueFilmSimulations = async () =>
safelyQueryPhotos(() => sql`
SELECT DISTINCT film_simulation, COUNT(*)
FROM photos
WHERE hidden IS NOT TRUE AND film_simulation IS NOT NULL
GROUP BY film_simulation
ORDER BY film_simulation ASC
`.then(({ rows }): FilmSimulations => rows
.map(({ film_simulation, count }) => ({
simulation: film_simulation as FilmSimulation,
count: parseInt(count, 10),
}))),
'getUniqueFilmSimulations',
);
export type GetPhotosOptions = { export type GetPhotosOptions = {
sortBy?: 'createdAt' | 'takenAt' | 'priority' sortBy?: 'createdAt' | 'takenAt' | 'priority'
@ -484,27 +496,17 @@ export const getPhotoIds = async ({ limit }: { limit?: number }) =>
export const getPhoto = async ( export const getPhoto = async (
id: string, id: string,
includeHidden?: boolean, includeHidden?: boolean,
): Promise<Photo | undefined> => { ): Promise<Photo | undefined> =>
// Check for photo id forwarding safelyQueryPhotos(() => {
// and convert short ids to uuids // Check for photo id forwarding and convert short ids to uuids
const photoId = translatePhotoId(id); const photoId = translatePhotoId(id);
return safelyQueryPhotos(() => return sqlGetPhoto(photoId, includeHidden);
sqlGetPhoto(photoId, includeHidden), 'sqlGetPhoto') }, 'sqlGetPhoto')
.then(({ rows }) => rows.map(parsePhotoFromDb)) .then(({ rows }) => rows.map(parsePhotoFromDb))
.then(photos => photos.length > 0 ? photos[0] : undefined); .then(photos => photos.length > 0 ? photos[0] : undefined);
};
export const getPhotosMostRecentUpdate = () => export const getPhotosMostRecentUpdate = () =>
safelyQueryPhotos( safelyQueryPhotos(
sqlGetPhotosMostRecentUpdate, sqlGetPhotosMostRecentUpdate,
'getPhotosMostRecentUpdate', 'getPhotosMostRecentUpdate',
); );
// UNIQUE META
export const getUniqueTags = () =>
safelyQueryPhotos(sqlGetUniqueTags, 'getUniqueTags');
export const getUniqueTagsHidden = () =>
safelyQueryPhotos(sqlGetUniqueTagsHidden, 'getUniqueTagsHidden');
export const getUniqueCameras = () =>
safelyQueryPhotos(sqlGetUniqueCameras, 'getUniqueCameras');
export const getUniqueFilmSimulations = () =>
safelyQueryPhotos(sqlGetUniqueFilmSimulations, 'getUniqueFilmSimulations');