From 57886dc276cf54c77321f7a28426f1c431721ce7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <pfic@outlook.com>
Date: Tue, 21 Jan 2020 08:54:37 -0800
Subject: [PATCH] Updated field names.

---
 .../job-detail-cards.customer.component.jsx    | 12 ++++++------
 .../jobs-list/jobs-list.component.jsx          | 12 ++++++------
 client/src/graphql/jobs.queries.js             | 18 ++++++++----------
 .../down.yaml                                  |  6 ++++++
 .../up.yaml                                    |  6 ++++++
 .../down.yaml                                  |  6 ++++++
 .../up.yaml                                    |  6 ++++++
 .../down.yaml                                  |  6 ++++++
 .../up.yaml                                    |  6 ++++++
 9 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/down.yaml
 create mode 100644 hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/up.yaml
 create mode 100644 hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/down.yaml
 create mode 100644 hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/up.yaml
 create mode 100644 hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/down.yaml
 create mode 100644 hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/up.yaml

diff --git a/client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx
index 1ad95037a..ffb3fc607 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx
@@ -13,14 +13,14 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
       extraLink={data?.owner ? `/manage/owners/${data?.owner?.id}` : null}>
       {data ? (
         <span>
-          <div>{`${data?.pit_owner_first_name ??
-            ""} ${data.pit_owner_last_name ?? ""}`}</div>
+          <div>{`${data?.ownr_fn ??
+            ""} ${data.ownr_ln ?? ""}`}</div>
           <div>
-            <PhoneFormatter>{`${data?.pit_owner_phone ?? ""}`}</PhoneFormatter>
+            <PhoneFormatter>{`${data?.ownr_ph1 ?? ""}`}</PhoneFormatter>
           </div>
-          {data?.pit_owner_email ? (
-            <a href={`mailto:${data.pit_owner_email}`}>
-              <div>{`${data?.pit_owner_email ?? ""}`}</div>
+          {data?.ownr_ea ? (
+            <a href={`mailto:${data.ownr_ea}`}>
+              <div>{`${data?.ownr_ea ?? ""}`}</div>
             </a>
           ) : null}
 
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 30af167ed..e64a39889 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -43,13 +43,13 @@ export default function JobsList({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.pit_owner_last_name, b.pit_owner_last_name),
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
         state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => {
         return record.owner ? (
           <Link to={"/manage/owners/" + record.owner.id}>
-            {record.pit_owner_first_name} {record.pit_owner_last_name}
+            {record.ownr_fn} {record.ownr_ln}
           </Link>
         ) : (
           t("jobs.errors.noowner")
@@ -58,13 +58,13 @@ export default function JobsList({
     },
     {
       title: t("jobs.fields.phone1"),
-      dataIndex: "pit_owner_phone",
-      key: "pit_owner_phone",
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
       ellipsis: true,
       render: (text, record) => {
-        return record.pit_owner_phone ? (
+        return record.ownr_ph1 ? (
           <span>
-            <PhoneFormatter>{record.pit_owner_phone}</PhoneFormatter>
+            <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
             <Icon
               style={{ margin: 4 }}
               type='message'
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 86e10bda7..9441ff3ee 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -30,10 +30,10 @@ export const GET_ALL_OPEN_JOBS = gql`
 export const SUBSCRIPTION_ALL_OPEN_JOBS = gql`
   subscription SUBSCRIPTION_ALL_OPEN_JOBS {
     jobs {
-      pit_owner_first_name
-      pit_owner_last_name
-      pit_owner_phone
-      pit_owner_email
+      ownr_fn
+      ownr_ln
+      ownr_ph1
+      ownr_ea
       owner {
         id
         allow_text_message
@@ -47,7 +47,6 @@ export const SUBSCRIPTION_ALL_OPEN_JOBS = gql`
         v_color
         plate_no
       }
-      pit_vehicle_plate_no
       actual_completion
       actual_delivery
       actual_in
@@ -196,10 +195,10 @@ export const GET_JOB_BY_PK = gql`
 export const QUERY_JOB_CARD_DETAILS = gql`
   query QUERY_JOB_CARD_DETAILS($id: uuid!) {
     jobs_by_pk(id: $id) {
-      pit_owner_first_name
-      pit_owner_last_name
-      pit_owner_phone
-      pit_owner_email
+      ownr_fn
+      ownr_ln
+      ownr_ph1
+      ownr_ea
       owner {
         id
         allow_text_message
@@ -213,7 +212,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         v_color
         plate_no
       }
-      pit_vehicle_plate_no
       actual_completion
       actual_delivery
       actual_in
diff --git a/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/down.yaml b/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/down.yaml
new file mode 100644
index 000000000..fc87d6d36
--- /dev/null
+++ b/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" ALTER COLUMN "ded_status" TYPE boolean;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."jobs"."ded_status" IS E'null'
+  type: run_sql
diff --git a/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/up.yaml b/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/up.yaml
new file mode 100644
index 000000000..a07b81c94
--- /dev/null
+++ b/hasura/migrations/1579565033587_alter_table_public_jobs_alter_column_ded_status/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" ALTER COLUMN "ded_status" TYPE text;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."jobs"."ded_status" IS E''
+  type: run_sql
diff --git a/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/down.yaml b/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/down.yaml
new file mode 100644
index 000000000..a18c9095b
--- /dev/null
+++ b/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."vehicles" ALTER COLUMN "v_vin" SET NOT NULL;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."vehicles"."v_vin" IS E'null'
+  type: run_sql
diff --git a/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/up.yaml b/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/up.yaml
new file mode 100644
index 000000000..dc4618c68
--- /dev/null
+++ b/hasura/migrations/1579565906890_alter_table_public_vehicles_alter_column_v_vin/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."vehicles" ALTER COLUMN "v_vin" DROP NOT NULL;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."vehicles"."v_vin" IS E''
+  type: run_sql
diff --git a/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/down.yaml b/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/down.yaml
new file mode 100644
index 000000000..e65c090c4
--- /dev/null
+++ b/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."vehicles" ALTER COLUMN "v_vin" DROP NOT NULL;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."vehicles"."v_vin" IS E'null'
+  type: run_sql
diff --git a/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/up.yaml b/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/up.yaml
new file mode 100644
index 000000000..fbfd8f4ad
--- /dev/null
+++ b/hasura/migrations/1579565961308_alter_table_public_vehicles_alter_column_v_vin/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    sql: ALTER TABLE "public"."vehicles" ALTER COLUMN "v_vin" SET NOT NULL;
+  type: run_sql
+- args:
+    sql: COMMENT ON COLUMN "public"."vehicles"."v_vin" IS E''
+  type: run_sql