Resolve cc contract car query error with service dates IO-728

2021-03-03 11:11:03 -08:00
parent 2588fffad3
commit 598741372a
2 changed files with 21 additions and 22 deletions
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -13,28 +13,24 @@ export const INSERT_NEW_COURTESY_CAR = gql`
 `;

 export const QUERY_AVAILABLE_CC = gql`
-  query QUERY_AVAILABLE_CC {
-    courtesycars(
-      where: {
-        serviceenddate: { _is_null: true }
-        status: { _eq: "courtesycars.status.in" }
-      }
-    ) {
-      color
-      dailycost
-      damage
-      fleetnumber
-      fuel
-      id
-      make
-      model
-      plate
-      status
-      year
-      dailycost
-      mileage
-    }
+query QUERY_AVAILABLE_CC($today: date) {
+  courtesycars(where: {_or: [{serviceenddate: {_is_null: true}}, {serviceenddate: {_gt: $today}}], status: {_eq: "courtesycars.status.in"}}) {
+    color
+    dailycost
+    damage
+    fleetnumber
+    fuel
+    id
+    make
+    model
+    plate
+    status
+    year
+    dailycost
+    mileage
  }
+}
+
 `;

 export const QUERY_ALL_CC = gql`