Add foundation filter (#224)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>
Signed-off-by: Cintia Sánchez García <[email protected]>
Co-authored-by: Cintia Sánchez García <[email protected]>

Author: tegioz

database/migrations/functions/jobboard/search_jobs.sql

@@ -5,10 +5,11 @@ declare
     v_benefits text[];
     v_date_from date;
     v_date_to date;
-    v_max_distance real := (p_filters->>'max_distance')::real;
+    v_foundation text := (p_filters->>'foundation');
     v_kind text[];
     v_limit int := coalesce((p_filters->>'limit')::int, 20);
     v_location_id uuid := ((p_filters->'location')->>'location_id')::uuid;
+    v_max_distance real := (p_filters->>'max_distance')::real;
     v_offset int := coalesce((p_filters->>'offset')::int, 0);
     v_open_source int := (p_filters->>'open_source')::int;
     v_projects text[];
@@ -135,6 +136,16 @@ begin
             case when v_date_from is not null and v_date_to is not null then
                 j.published_at::date >= v_date_from and j.published_at::date <= v_date_to
             else true end
+        and
+            case when v_foundation is not null then
+                j.job_id = any(
+                    select job_id from job_project
+                    where project_id = any(
+                        select project_id from project
+                        where foundation = v_foundation
+                    )
+                )
+            else true end
         and
             case when cardinality(v_kind) > 0 then
                 j.kind = any(v_kind)
@@ -159,7 +170,8 @@ begin
                         select project_id from project
                         where name = any(v_projects)
                     )
-            ) else true end
+                )
+            else true end
         and
             case when v_salary_min is not null then
                 case

gitjobs-server/src/db/jobboard.rs

@@ -198,24 +198,32 @@ impl DBJobBoard for PgDB {
             let row = db
                 .query_one(
                     "
-                select
-                    (
-                        select json_agg(json_build_object(
-                            'project_id', project_id,
-                            'foundation', foundation,
-                            'logo_url', logo_url,
-                            'maturity', maturity,
-                            'name', name
-                        ))
-                        from project
-                    )::text as projects;
-                ",
+                    select
+                        (
+                            select json_agg(json_build_object(
+                                'foundation_id', foundation_id,
+                                'name', name
+                            ))
+                            from foundation
+                        )::text as foundations,
+                        (
+                            select json_agg(json_build_object(
+                                'project_id', project_id,
+                                'foundation', foundation,
+                                'logo_url', logo_url,
+                                'maturity', maturity,
+                                'name', name
+                            ))
+                            from project
+                        )::text as projects;
+                    ",
                     &[],
                 )
                 .await?;
 
             // Prepare filters options
             let filters_options = FiltersOptions {
+                foundations: serde_json::from_str(&row.get::<_, String>("foundations"))?,
                 projects: serde_json::from_str(&row.get::<_, String>("projects"))?,
             };
 

gitjobs-server/src/templates/jobboard/jobs.rs

@@ -12,7 +12,7 @@ use crate::templates::{
     dashboard::employer::jobs::{JobKind, SalaryKind, Workplace},
     filters,
     helpers::{DATE_FORMAT, DATE_FORMAT_3, build_jobboard_image_url, option_is_none_or_default},
-    misc::{Location, Member, Project},
+    misc::{Foundation, Location, Member, Project},
     pagination::{NavigationLinks, Pagination},
 };
 
@@ -64,6 +64,8 @@ pub(crate) struct Filters {
     #[serde(skip_serializing_if = "option_is_none_or_default")]
     pub date_range: Option<DateRange>,
     #[serde(skip_serializing_if = "option_is_none_or_default")]
+    pub foundation: Option<String>,
+    #[serde(skip_serializing_if = "option_is_none_or_default")]
     pub kind: Option<Vec<JobKind>>,
     #[serde(skip_serializing_if = "option_is_none_or_default")]
     pub limit: Option<usize>,
@@ -146,8 +148,9 @@ pub(crate) enum Seniority {
 }
 
 /// Filters options used in the jobs explore section.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub(crate) struct FiltersOptions {
+    pub foundations: Vec<Foundation>,
     pub projects: Vec<Project>,
 }
 

gitjobs-server/src/templates/misc.rs

@@ -39,6 +39,14 @@ pub(crate) struct UserMenuSection {
 
 // Types.
 
+/// Foundation information.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[allow(clippy::struct_field_names)]
+pub(crate) struct Foundation {
+    pub foundation_id: Uuid,
+    pub name: String,
+}
+
 /// Location information.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
 #[allow(clippy::struct_field_names)]

gitjobs-server/templates/jobboard/jobs/jobs_macros.html

@@ -110,6 +110,25 @@
     </div>
     {# End projects -#}
 
+    {# Foundation -#}
+    <div>
+      <div class="text-xs/6 text-stone-500/75 -mt-2">
+        or any project from the <span class="inline-block lg:hidden xl:inline-block">following</span> foundation
+      </div>
+      <div class="mt-2.5">
+        <select form="{{ form }}"
+                data-trigger-form="true"
+                name="foundation"
+                class="select-primary py-0.5 text-[0.8rem]/6 text-stone-500">
+          {% call macros::select_option(value = "", label = "", selected = filters.foundation|display_some) -%}
+          {% for foundation in filters_options.foundations -%}
+            {% call macros::select_option(value = &foundation.name, label = foundation.name|upper, selected = filters.foundation|display_some) -%}
+          {% endfor -%}
+        </select>
+      </div>
+    </div>
+    {# End foundation -#}
+
     {# Open source -#}
     <div>
       {% call filters_subtitle(text = "Time working on open source") -%}