From 113a5c4e2dbb885099ea48093e99affb9125ae22 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Thu, 21 Sep 2017 21:59:14 -0400 Subject: [PATCH] job_type --- controllers/jobs.php | 4 ++-- database/sql/jobs/create.sql | 2 +- database/sql/jobs/update.sql | 2 +- models/job.php | 10 ++++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/controllers/jobs.php b/controllers/jobs.php index 43150a1..b9b1b66 100644 --- a/controllers/jobs.php +++ b/controllers/jobs.php @@ -8,7 +8,7 @@ if($_REQUEST['action'] === 'index'){ $requestBody = file_get_contents('php://input'); $body = json_decode($requestBody); - $newJob = new Job(null, $body->person_id, $body->company_id); + $newJob = new Job(null, $body->person_id, $body->job_type, $body->company_id); $allJobs = Jobs::create($newJob); @@ -19,7 +19,7 @@ if($_REQUEST['action'] === 'index'){ } else if ($_REQUEST['action'] === 'update'){ $requestBody = file_get_contents('php://input'); $body = json_decode($requestBody); - $updatedJob = new Job(null, $body->person_id, $body->company_id); + $updatedJob = new Job(null, $body->person_id, $body->job_type, $body->company_id); $allJobs = Jobs::update($_REQUEST['id'], $updatedJob); echo json_encode($allJobs); diff --git a/database/sql/jobs/create.sql b/database/sql/jobs/create.sql index 62387a2..546737f 100644 --- a/database/sql/jobs/create.sql +++ b/database/sql/jobs/create.sql @@ -1 +1 @@ -INSERT INTO jobs (person_id, company_id) VALUES ($1, $2) +INSERT INTO jobs (person_id, job_type, company_id) VALUES ($1, $2, $3) diff --git a/database/sql/jobs/update.sql b/database/sql/jobs/update.sql index 1a8a8d2..1d9c94e 100644 --- a/database/sql/jobs/update.sql +++ b/database/sql/jobs/update.sql @@ -1 +1 @@ -UPDATE jobs SET person_id = $1, company_id = $2 WHERE id = $3 +UPDATE jobs SET person_id = $1, job_type = $2, company_id = $3 WHERE id = $4 diff --git a/models/job.php b/models/job.php index c2cba09..b909c90 100644 --- a/models/job.php +++ b/models/job.php @@ -4,10 +4,12 @@ include_once __DIR__ . '/../database/db.php'; class Job { public $id; public $person_id; + public $job_type; public $company_id; - public function __construct($id, $person_id, $company_id) { + public function __construct($id, $person_id, $job_type, $company_id) { $this->id = $id; $this->person_id = $person_id; + $this->job_type = $job_type; $this->company_id = $company_id; } } @@ -18,14 +20,14 @@ class Jobs { $result = pg_query($query); $jobs = array(); while($data = pg_fetch_object($result)){ - $jobs[] = new Job(intval($data->id), intval($data->person_id), intval($data->company_id)); + $jobs[] = new Job(intval($data->id), intval($data->person_id), $data->job_type, intval($data->company_id)); } return $jobs; } static function create($job){ $query = file_get_contents(__DIR__ . '/../database/sql/jobs/create.sql'); - $result = pg_query_params($query, array($job->person_id, $job->company_id)); + $result = pg_query_params($query, array($job->person_id, $job->job_type, $job->company_id)); return self::find(); } @@ -37,7 +39,7 @@ class Jobs { } static function update($id, $updatedJob){ $query = file_get_contents(__DIR__ . '/../database/sql/jobs/update.sql'); - $result = pg_query_params($query, array($updatedJob->person_id, $updatedJob->company_id, $id)); + $result = pg_query_params($query, array($updatedJob->person_id, $updatedJob->job_type, $updatedJob->company_id, $id)); return self::find(); }