fix(cvsb-19222): fix typo in column names

dvsa · Apr 20, 2021 · af95ba9 · af95ba9
1 parent 5d71275
commit af95ba9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 33 deletions.
diff --git a/src/app/databaseService.ts b/src/app/databaseService.ts
@@ -51,9 +51,9 @@ async function getVehicleDetails(
   const vehicleDetailsResult = vehicleDetailsQueryResult[0][0] as VehicleQueryResult;
 
   if (
-    vehicleDetailsResult === undefined ||
-    vehicleDetailsResult.id === undefined ||
-    vehicleDetailsResult.result === undefined
+    vehicleDetailsResult === undefined
+    || vehicleDetailsResult.id === undefined
+    || vehicleDetailsResult.result === undefined
   ) {
     throw new NotFoundError('Vehicle was not found');
   }
@@ -132,9 +132,9 @@ async function getTestResultDetails(
   const testResultQueryResult = queryResult[0][0] as TestResultQueryResult;
 
   if (
-    testResultQueryResult === undefined ||
-    testResultQueryResult.id === undefined ||
-    testResultQueryResult.result === undefined
+    testResultQueryResult === undefined
+    || testResultQueryResult.id === undefined
+    || testResultQueryResult.result === undefined
   ) {
     throw new NotFoundError('Test not found');
   }

diff --git a/src/app/queries/technicalRecord/axleQuery.ts b/src/app/queries/technicalRecord/axleQuery.ts
@@ -1,25 +1,26 @@
-const AXLE_QUERY = 'SELECT `a`.`id`, JSON_OBJECT('
-  + "'tyre', JSON_OBJECT("
-  + "'tyreSize', `t`.`tyreSize`,"
-  + "'plyRating', `t`.`plyRating`,"
-  + "'fitmentCode', `t`.`fitmentCode`,"
-  + "'dataTrAxles', `t`.`dataTrAxles`, "
-  + "'speedCategorySymbol', `t`.`speedCategorySymbol`, "
-  + "'tyreCode', `t`.`tyreCode`"
-  + '), '
-  + "'axleNumber', `a`.`axleNumber`, "
-  + "'parkingBrakeMrk', IF(`a`.`parkingBrakeMrk` = 1, cast(TRUE AS json), cast(FALSE AS json)), "
-  + "'kerbWeight', `a`.`kerbWeight`,"
-  + "'ladenWeight', `a`.`ladenWeight`,"
-  + "'gbWeight', `a`.`gbWeight`, "
-  + "'eecWeight', `a`.`eecWeight`,"
-  + "'designWeight', `a`.`designWeight`, "
-  + "'brakeActuator', `a`.`brakeActuator`, "
-  + "'leverLength', `a`.`leverLength`, "
-  + "'springBrakeParking', IF(`a`.`springBrakeParking` = 1, cast(TRUE AS json), cast(FALSE AS json))"
-  + ') result'
-  + ' FROM `axles` `a`'
-  + ' JOIN `tyre` t on `a`.`tyre_id` = `t`.`id`'
-  + ' WHERE technical_record_id = ?;';
+const AXLE_QUERY =
+  'SELECT `a`.`id`, JSON_OBJECT(' +
+  "'tyre', JSON_OBJECT(" +
+  "'tyreSize', `t`.`tyreSize`," +
+  "'plyRating', `t`.`plyRating`," +
+  "'fitmentCode', `t`.`fitmentCode`," +
+  "'dataTrAxles', `t`.`dataTrAxles`, " +
+  "'speedCategorySymbol', `t`.`speedCategorySymbol`, " +
+  "'tyreCode', `t`.`tyreCode`" +
+  '), ' +
+  "'axleNumber', `a`.`axleNumber`, " +
+  "'parkingBrakeMrk', IF(`a`.`parkingBrakeMrk` = 1, cast(TRUE AS json), cast(FALSE AS json)), " +
+  "'kerbWeight', `a`.`kerbWeight`," +
+  "'ladenWeight', `a`.`ladenWeight`," +
+  "'gbWeight', `a`.`gbWeight`, " +
+  "'eecWeight', `a`.`eecWeight`," +
+  "'designWeight', `a`.`designWeight`, " +
+  "'brakeActuator', `a`.`brakeActuator`, " +
+  "'leverLength', `a`.`leverLength`, " +
+  "'springBrakeParking', IF(`a`.`springBrakeParking` = 1, cast(TRUE AS json), cast(FALSE AS json))" +
+  ') result' +
+  ' FROM `axles` `a`' +
+  ' JOIN `tyre` t on `a`.`tyre_id` = `t`.`id`' +
+  ' WHERE technical_record_id = ?;';
 
 export default AXLE_QUERY;
diff --git a/src/app/queries/technicalRecord/technicalRecordQuery.ts b/src/app/queries/technicalRecord/technicalRecordQuery.ts
@@ -80,10 +80,10 @@ const TECHNICAL_RECORD_QUERY = 'SELECT `t`.`id`, JSON_OBJECT('
   + "'frontAxleTo5thWheelCouplingMax', `t`.`frontAxleTo5thWheelCouplingMax`, "
   + "'frontAxleToRearAxle', `t`.`frontAxleToRearAxle`,"
   + "'rearAxleToRearTrl', `t`.`rearAxleToRearTrl`, "
-  + "'couplingCenterToRearAxleMin', `t`.`couplingCenterToRearAxleMin`, "
-  + "'couplingCenterToRearAxleMax', `t`.`couplingCenterToRearAxleMax`,"
-  + "'couplingCenterToRearTrlMin', `t`.`couplingCenterToRearTrlMin`, "
-  + "'couplingCenterToRearTrlMax', `t`.`couplingCenterToRearTrlMax`, "
+  + "'couplingCentreToRearAxleMin', `t`.`couplingCentreToRearAxleMin`, "
+  + "'couplingCentreToRearAxleMax', `t`.`couplingCentreToRearAxleMax`,"
+  + "'couplingCentreToRearTrlMin', `t`.`couplingCentreToRearTrlMin`, "
+  + "'couplingCentreToRearTrlMax', `t`.`couplingCentreToRearTrlMax`, "
   + "'centreOfRearmostAxleToRearOfTrl', `t`.`centreOfRearmostAxleToRearOfTrl`, "
   + "'notes', `t`.`notes`, "
   + "'purchaserNotes', `t`.`purchaserNotes`,"