Fix issue adding job (#62)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

database/migrations/schema/0001_initial.sql

@@ -207,7 +207,6 @@ create table job (
     archived_at timestamptz,
     benefits text[],
     open_source int check (open_source >= 0 and open_source <= 100),
-    projects jsonb,
     published_at timestamptz,
     qualifications text check (qualifications <> ''),
     responsibilities text check (responsibilities <> ''),

gitjobs-server/src/db/dashboard/employer.rs

@@ -142,7 +142,6 @@ impl DBDashBoardEmployer for PgDB {
                     apply_url,
                     benefits,
                     open_source,
-                    projects,
                     qualifications,
                     responsibilities,
                     salary,
@@ -166,16 +165,15 @@ impl DBDashBoardEmployer for PgDB {
                     $9::text,
                     $10::text[],
                     $11::int,
-                    nullif($12::jsonb, 'null'::jsonb),
+                    $12::text,
                     $13::text,
-                    $14::text,
-                    $15::bigint,
-                    $16::text,
+                    $14::bigint,
+                    $15::text,
+                    $16::bigint,
                     $17::bigint,
-                    $18::bigint,
-                    $19::text,
-                    $20::text[],
-                    $21::int,
+                    $18::text,
+                    $19::text[],
+                    $20::int,
                     case when $3::text = 'published' then current_timestamp else null end
                 returning job_id;
                 ",
@@ -191,7 +189,6 @@ impl DBDashBoardEmployer for PgDB {
                     &job.apply_url,
                     &job.benefits,
                     &job.open_source,
-                    &serde_json::to_value(&job.projects).expect("projects should be valid json"),
                     &job.qualifications,
                     &job.responsibilities,
                     &job.salary,
@@ -560,16 +557,15 @@ impl DBDashBoardEmployer for PgDB {
                 apply_url = $9::text,
                 benefits = $10::text[],
                 open_source = $11::int,
-                projects = nullif($12::jsonb, 'null'::jsonb),
-                qualifications = $13::text,
-                responsibilities = $14::text,
-                salary = $15::bigint,
-                salary_currency = $16::text,
-                salary_min = $17::bigint,
-                salary_max = $18::bigint,
-                salary_period = $19::text,
-                skills = $20::text[],
-                upstream_commitment = $21::int,
+                qualifications = $12::text,
+                responsibilities = $13::text,
+                salary = $14::bigint,
+                salary_currency = $15::text,
+                salary_min = $16::bigint,
+                salary_max = $17::bigint,
+                salary_period = $18::text,
+                skills = $19::text[],
+                upstream_commitment = $20::int,
                 updated_at = current_timestamp
             where job_id = $1::uuid;
             ",
@@ -585,7 +581,6 @@ impl DBDashBoardEmployer for PgDB {
                 &job.apply_url,
                 &job.benefits,
                 &job.open_source,
-                &serde_json::to_value(&job.projects).expect("projects should be valid json"),
                 &job.qualifications,
                 &job.responsibilities,
                 &job.salary,

gitjobs-server/src/db/dashboard/job_seeker.rs

@@ -79,7 +79,7 @@ impl DBDashBoardJobSeeker for PgDB {
                 open_to_relocation: row.get("open_to_relocation"),
                 open_to_remote: row.get("open_to_remote"),
                 phone: row.get("phone"),
-                photo_id: row.get("avatar_id"),
+                photo_id: row.get("photo_id"),
                 projects: row
                     .get::<_, Option<serde_json::Value>>("projects")
                     .map(|v| serde_json::from_value(v).expect("projects should be valid json")),

gitjobs-server/src/handlers/dashboard/employer/jobs.rs

@@ -18,7 +18,7 @@ use crate::{
         error::HandlerError,
         extractors::{JobBoardId, SelectedEmployerIdRequired},
     },
-    templates::dashboard::employer::jobs,
+    templates::dashboard::employer::jobs::{self, Job},
 };
 
 // Pages handlers.
@@ -88,13 +88,21 @@ pub(crate) async fn update_page(
 #[instrument(skip_all, err)]
 pub(crate) async fn add(
     State(db): State<DynDB>,
+    State(form_de): State<serde_qs::Config>,
     SelectedEmployerIdRequired(employer_id): SelectedEmployerIdRequired,
-    Form(mut job): Form<jobs::Job>,
+    body: String,
 ) -> Result<impl IntoResponse, HandlerError> {
+    // Get job information from body
+    let mut job: Job = match form_de.deserialize_str(&body).map_err(anyhow::Error::new) {
+        Ok(profile) => profile,
+        Err(e) => return Ok((StatusCode::UNPROCESSABLE_ENTITY, e.to_string()).into_response()),
+    };
     job.normalize();
+
+    // Add job to database
     db.add_job(&employer_id, &job).await?;
 
-    Ok(StatusCode::CREATED)
+    Ok(StatusCode::CREATED.into_response())
 }
 
 /// Handler that archives a job.
@@ -134,11 +142,19 @@ pub(crate) async fn publish(
 #[instrument(skip_all, err)]
 pub(crate) async fn update(
     State(db): State<DynDB>,
+    State(form_de): State<serde_qs::Config>,
     Path(job_id): Path<Uuid>,
-    Form(mut job): Form<jobs::Job>,
+    body: String,
 ) -> Result<impl IntoResponse, HandlerError> {
+    // Get job information from body
+    let mut job: Job = match form_de.deserialize_str(&body).map_err(anyhow::Error::new) {
+        Ok(profile) => profile,
+        Err(e) => return Ok((StatusCode::UNPROCESSABLE_ENTITY, e.to_string()).into_response()),
+    };
     job.normalize();
+
+    // Update job in database
     db.update_job(&job_id, &job).await?;
 
-    Ok(StatusCode::NO_CONTENT)
+    Ok(StatusCode::NO_CONTENT.into_response())
 }

gitjobs-server/src/handlers/dashboard/job_seeker/profile.rs

@@ -53,6 +53,7 @@ pub(crate) async fn update_page(
 #[instrument(skip_all, err)]
 pub(crate) async fn update(
     State(db): State<DynDB>,
+    State(form_de): State<serde_qs::Config>,
     auth_session: AuthSession,
     body: String,
 ) -> Result<impl IntoResponse, HandlerError> {
@@ -62,7 +63,7 @@ pub(crate) async fn update(
     };
 
     // Get profile information from body
-    let mut profile: JobSeekerProfile = match serde_qs::from_str(&body).map_err(anyhow::Error::new) {
+    let mut profile: JobSeekerProfile = match form_de.deserialize_str(&body).map_err(anyhow::Error::new) {
         Ok(profile) => profile,
         Err(e) => return Ok((StatusCode::UNPROCESSABLE_ENTITY, e.to_string()).into_response()),
     };

gitjobs-server/src/router.rs

@@ -50,6 +50,7 @@ struct StaticFile;
 pub(crate) struct State {
     pub db: DynDB,
     pub image_store: DynImageStore,
+    pub form_de: serde_qs::Config,
 }
 
 /// Setup router.
@@ -59,6 +60,7 @@ pub(crate) fn setup(cfg: &HttpServerConfig, db: DynDB, image_store: DynImageStor
     let state = State {
         db: db.clone(),
         image_store,
+        form_de: serde_qs::Config::new(3, false),
     };
 
     // Setup authentication / authorization layer