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

editoast: add trigger for search_scenario table population #9484

Merged
merged 1 commit into from
Nov 7, 2024
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
3 changes: 2 additions & 1 deletion editoast/editoast_models/src/tables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,8 @@ diesel::table! {
id -> Int8,
name -> Nullable<Text>,
description -> Nullable<Text>,
study_id -> Nullable<Int4>,
tags -> Nullable<Text>,
study_id -> Nullable<Int4>,
}
}

Expand Down Expand Up @@ -792,6 +792,7 @@ diesel::joinable!(scenario -> study (study_id));
diesel::joinable!(scenario -> timetable (timetable_id));
diesel::joinable!(search_operational_point -> infra_object_operational_point (id));
diesel::joinable!(search_project -> project (id));
diesel::joinable!(search_scenario -> scenario (id));
diesel::joinable!(search_signal -> infra_object_signal (id));
diesel::joinable!(search_study -> study (id));
diesel::joinable!(stdcm_search_environment -> electrical_profile_set (electrical_profile_set_id));
Expand Down
7 changes: 7 additions & 0 deletions editoast/migrations/2024-10-29-145440_search_cache/down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- DO NOT EDIT THIS FILE MANUALLY!

DROP TABLE IF EXISTS "search_scenario";
DROP TRIGGER IF EXISTS search_scenario__ins_trig ON "scenario";
DROP TRIGGER IF EXISTS search_scenario__upd_trig ON "scenario";
DROP FUNCTION IF EXISTS search_scenario__ins_trig_fun;
DROP FUNCTION IF EXISTS search_scenario__upd_trig_fun;
70 changes: 70 additions & 0 deletions editoast/migrations/2024-10-29-145440_search_cache/up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
-- DO NOT EDIT THIS FILE MANUALLY!
-- To change the migration's content, use `editoast search make-migration`.
-- To add custom SQL code, check out `#[derive(Search)]` attributes `prepend_sql` and `append_sql`.

DROP TABLE IF EXISTS "search_scenario";

CREATE TABLE "search_scenario" (
id BIGINT PRIMARY KEY REFERENCES "scenario"("id") ON UPDATE CASCADE ON DELETE CASCADE,
"name" TEXT,
"description" TEXT,
"tags" TEXT,
"study_id" INTEGER
);

CREATE INDEX "search_scenario_name" ON "search_scenario" USING gin ("name" gin_trgm_ops);
CREATE INDEX "search_scenario_description" ON "search_scenario" USING gin ("description" gin_trgm_ops);
CREATE INDEX "search_scenario_tags" ON "search_scenario" ("tags");
CREATE INDEX "search_scenario_study_id" ON "search_scenario" ("study_id");

CREATE OR REPLACE FUNCTION search_scenario__ins_trig_fun()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
BEGIN
INSERT INTO "search_scenario" (id, name, description, tags, study_id)
SELECT "scenario".id AS id, osrd_prepare_for_search(scenario.name) AS name,
osrd_prepare_for_search(scenario.description) AS description,
(osrd_prepare_for_search_tags(scenario.tags)) AS tags,
(scenario.study_id) AS study_id
FROM (SELECT NEW.*) AS "scenario"
;
RETURN NEW;
END;
$$;
CREATE OR REPLACE TRIGGER search_scenario__ins_trig
AFTER INSERT ON "scenario"
FOR EACH ROW EXECUTE FUNCTION search_scenario__ins_trig_fun();


CREATE OR REPLACE FUNCTION search_scenario__upd_trig_fun()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
BEGIN
UPDATE "search_scenario"
SET "name" = osrd_prepare_for_search(scenario.name),
"description" = osrd_prepare_for_search(scenario.description),
"tags" = (osrd_prepare_for_search_tags(scenario.tags)),
"study_id" = (scenario.study_id)
FROM (SELECT NEW.*) AS "scenario"

WHERE "scenario".id = "search_scenario".id;
RETURN NEW;
END;
$$;
CREATE OR REPLACE TRIGGER search_scenario__upd_trig
AFTER UPDATE ON "scenario"
FOR EACH ROW EXECUTE FUNCTION search_scenario__upd_trig_fun();



INSERT INTO "search_scenario" (id, "name", "description", "tags", "study_id")
SELECT
"scenario"."id" AS id,
osrd_prepare_for_search(scenario.name) AS name
, osrd_prepare_for_search(scenario.description) AS description
, (osrd_prepare_for_search_tags(scenario.tags)) AS tags
, (scenario.study_id) AS study_id
FROM "scenario"
;
24 changes: 19 additions & 5 deletions editoast/src/views/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -654,14 +654,28 @@ pub(super) struct SearchResultItemStudy {
#[derive(Search, Serialize, ToSchema)]
#[search(
table = "search_scenario",
migration(src_table = "scenario"),
joins = "
INNER JOIN scenario ON scenario.id = search_scenario.id
INNER JOIN infra ON infra.id = scenario.infra_id",
column(name = "id", data_type = "integer"),
column(name = "name", data_type = "string"),
column(name = "description", data_type = "string"),
column(name = "tags", data_type = "string"),
column(name = "study_id", data_type = "integer")
column(
name = "name",
data_type = "TEXT",
sql = "scenario.name",
textual_search
),
column(
name = "description",
data_type = "TEXT",
sql = "scenario.description",
textual_search
),
column(
name = "tags",
data_type = "TEXT",
sql = "osrd_prepare_for_search_tags(scenario.tags)"
),
column(name = "study_id", data_type = "INTEGER", sql = "scenario.study_id")
)]
#[allow(unused)]
/// A search result item for a query with `object = "scenario"`
Expand Down
Loading