Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: CLIN-2173 new handle to validate savedFilter name #41

Merged
merged 2 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions migrations/1692886119429_remove-unique-constraint.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-- Up Migration
drop index idx_unique_saved_filters;

drop function get_filter_uniqueness_date();
-- Down Migration
CREATE OR REPLACE FUNCTION get_filter_uniqueness_date() RETURNS timestamp AS $$
declare run_on_date timestamp;
BEGIN
SELECT run_on into run_on_date
FROM pgmigrations
WHERE name = '1688561786592_update-saved-filter';

RETURN run_on_date;
END
$$ LANGUAGE plpgsql
IMMUTABLE;;

CREATE UNIQUE INDEX idx_unique_saved_filters
ON saved_filters (title, keycloak_id, type)
WHERE creation_date > get_filter_uniqueness_date();
19 changes: 18 additions & 1 deletion src/routes/savedFilters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ import {
update,
updateAsDefault,
} from '../db/dal/savedFilter';
import { getFilterIDs, removeQueryFromFilters, uniqueNameErrorHandler, updateQuery } from '../utils/savedFilters';
import {
getFilterIDs,
handleUniqueName,
removeQueryFromFilters,
uniqueNameErrorHandler,
updateQuery,
} from '../utils/savedFilters';

// Handles requests made to /saved-filters
const savedFiltersRouter = Router();
Expand Down Expand Up @@ -129,4 +135,15 @@ savedFiltersRouter.get('/withQueryId/:id', async (req: any, res) => {
}
});

savedFiltersRouter.post('/validate-name', async (req: any, res: any, next) => {
try {
const keycloak_id = req['kauth']?.grant?.access_token?.content?.sub;
await handleUniqueName({ ...req.body, keycloak_id });
res.status(StatusCodes.OK).send({ valid: true });
} catch (err) {
uniqueNameErrorHandler(err, res);
next(err);
}
});

export default savedFiltersRouter;
2 changes: 1 addition & 1 deletion src/utils/savedFilters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const getCount = (filter) =>
type: QueryTypes.SELECT,
},
)
.then((res) => res[0]['count']);
.then((res) => Number(res[0]['count']));

export const handleUniqueName = async (filter) => {
if (!filter.title) {
Expand Down