Merge branch 'development' into fix/th-294-user-unlogging-when-server-is-dead

Some14u · web-flow · commit 10d8b5249d2e · 2023-09-22T15:24:08.000+03:00
diff --git a/backend/src/libs/packages/database/generated-schema/0012_add_businessId_to_trucks.sql b/backend/src/libs/packages/database/generated-schema/0012_add_businessId_to_trucks.sql
diff --git a/backend/src/packages/orders/order.controller.ts b/backend/src/packages/orders/order.controller.ts
@@ -90,11 +90,11 @@ import {
  *         startPoint:
  *           type: string
  *           minLength: 1
- *           example: A
+ *           example: "{ \"lat\": \"-34.655\", \"lng\": \"150.590\" }"
  *         endPoint:
  *           type: string
  *           minLength: 1
- *           example: B
+ *           example: "{ \"lat\": \"-34.655\", \"lng\": \"150.590\" }"
  *         status:
  *           type: string
  *           enum: [pending, confirmed, cancelled, done]
@@ -109,11 +109,6 @@ import {
  *           format: number
  *           minimum: 1
  *           example: 1
- *         driverId:
- *           type: number
- *           format: number
- *           minimum: 1
- *           example: 1
  *         customerName:
  *           type: string
  *           pattern: ^[A-Za-z][\s'A-Za-z-]{0,39}$
@@ -124,6 +119,45 @@ import {
  *           pattern: ^\+\d{8,19}$
  *           nullable: true
  *           example: +123456789
+ *         shift:
+ *           type: object
+ *           properties:
+ *             id:
+ *               type: number
+ *               minimum: 1
+ *               example: 1
+ *             driver:
+ *               type: object
+ *               properties:
+ *                 id:
+ *                   type: number
+ *                   minimum: 1
+ *                   example: 1
+ *                 firstName:
+ *                   $ref: '#/components/schemas/Customer-sign-up-request/properties/firstName'
+ *                 lastName:
+ *                   $ref: '#/components/schemas/Customer-sign-up-request/properties/lastName'
+ *                 phone:
+ *                   $ref: '#/components/schemas/Customer-sign-up-request/properties/phone'
+ *                 email:
+ *                   $ref: '#/components/schemas/Customer-sign-up-request/properties/email'
+ *                 driverLicenseNumber:
+ *                   type: string
+ *                   minLength: 10
+ *                   example: AAA 123456
+ *             truck:
+ *               type: object
+ *               properties:
+ *                 id:
+ *                   type: number
+ *                   minimum: 1
+ *                   example: 1
+ *                 licensePlateNumber:
+ *                   type: string
+ *                   minLength: 3
+ *                   maxLength: 10
+ *                   pattern: ^(?!.*\\s)[\\dA-ZЁА-Я-]{3,10}}$
+ *                   example: DD1111RR
  *
  *       CreateOrderWithRegisteredUser:
  *         type: object
@@ -187,6 +221,27 @@ import {
  *               type: string
  *               enum:
  *                 - Driver does not exist!
+ *
+ *     TruckNotExistError:
+ *       allOf:
+ *         - $ref: '#/components/schemas/ErrorType'
+ *         - type: object
+ *           properties:
+ *             message:
+ *               type: string
+ *               enum:
+ *                 - Truck does not exist!
+ *
+ *     ShiftNotOpenError:
+ *       allOf:
+ *         - $ref: '#/components/schemas/ErrorType'
+ *         - type: object
+ *           properties:
+ *             message:
+ *               type: string
+ *               enum:
+ *                 - This truck is not inactive, please choose another one!
+ *
  *     BusinessNotExistError:
  *       allOf:
  *         - $ref: '#/components/schemas/ErrorType'
@@ -338,16 +393,16 @@ class OrderController extends Controller {
    *            application/json:
    *              schema:
    *                $ref: '#/components/schemas/Order'
-   *        400:
+   *        404:
    *          description:
    *            Order creation error
    *          content:
    *            application/json:
    *              schema:
    *                oneOf:
    *                 - $ref: '#/components/schemas/DriverNotExistError'
-   *                 - $ref: '#/components/schemas/OrderCreationError'
-   *
+   *                 - $ref: '#/components/schemas/TruckNotExistError'
+   *                 - $ref: '#/components/schemas/ShiftNotOpenError'
    */
   private async create(
     options: ApiHandlerOptions<{
@@ -460,7 +515,10 @@ class OrderController extends Controller {
    *          content:
    *            plain/text:
    *              schema:
-   *                $ref: '#/components/schemas/OrderDoesNotExist'
+   *                oneOf:
+   *                  - $ref: '#/components/schemas/OrderDoesNotExist'
+   *                  - $ref: '#/components/schemas/TruckNotExistError'
+   *                  - $ref: '#/components/schemas/DriverNotExistError'
    *        401:
    *          UnauthorizedError:
    *            description:
@@ -505,10 +563,7 @@ class OrderController extends Controller {
    *              schema:
    *                type: array
    *                items:
-   *                  type: object
-   *                  properties:
-   *                    items:
-   *                      $ref: '#/components/schemas/Order'
+   *                  $ref: '#/components/schemas/Order'
    *        401:
    *          UnauthorizedError:
    *            description:
@@ -517,7 +572,7 @@ class OrderController extends Controller {
    *            plain/text:
    *              schema:
    *                $ref: '#/components/schemas/UnauthorizedError'
-   *        400:
+   *        404:
    *          UnauthorizedError:
    *            description:
    *              You are not authorized
@@ -569,7 +624,9 @@ class OrderController extends Controller {
    *          content:
    *            plain/text:
    *              schema:
-   *                $ref: '#/components/schemas/OrderDoesNotExist'
+   *                oneOf:
+   *                - $ref: '#/components/schemas/OrderDoesNotExist'
+   *                - $ref: '#/components/schemas/BusinessDoesNotExist'
    *        401:
    *          UnauthorizedError:
    *            description:
diff --git a/backend/src/packages/shifts/shift.controller.ts b/backend/src/packages/shifts/shift.controller.ts
@@ -39,7 +39,7 @@ class ShiftController extends Controller {
     this.addRoute({
       path: ShiftsApiPath.ROOT,
       method: 'POST',
-      authStrategy: AuthStrategy.INJECT_USER,
+      authStrategy: AuthStrategy.VERIFY_JWT,
       validation: {
         body: shiftCreateValidationSchema,
       },
@@ -55,7 +55,7 @@ class ShiftController extends Controller {
     this.addRoute({
       path: ShiftsApiPath.$ID,
       method: 'PUT',
-      authStrategy: AuthStrategy.INJECT_USER,
+      authStrategy: AuthStrategy.VERIFY_JWT,
       validation: {
         body: shiftCloseValidationSchema,
       },
@@ -345,7 +345,7 @@ export { ShiftController };
 
 /**
  * @swagger
- * /shifts/drive/{id}:
+ * /shifts/driver/{id}:
  *    get:
  *      tags:
  *      - shifts
diff --git a/frontend/src/libs/components/input/input.tsx b/frontend/src/libs/components/input/input.tsx
@@ -66,9 +66,9 @@ const Input = <T extends FieldValues>({
   const toggleShowPassword = useCallback(
     (event: React.MouseEvent<HTMLElement>): void => {
       event.preventDefault();
-      setIsPasswordShown(!isPasswordShown);
+      setIsPasswordShown((old) => !old);
     },
-    [isPasswordShown],
+    [],
   );
 
   const clearError = useCallback(() => {
@@ -116,6 +116,7 @@ const Input = <T extends FieldValues>({
               styles.passwordEye,
               isPasswordShown && styles.passwordEyeLight,
             )}
+            type="button"
             onClick={toggleShowPassword}
             tabIndex={-1}
           >
diff --git a/frontend/src/libs/components/table/styles.module.scss b/frontend/src/libs/components/table/styles.module.scss
@@ -107,6 +107,10 @@
   cursor: pointer;
 }
 
+.spinnerWrapper {
+  height: 40vh;
+}
+
 @media (hover: hover) {
   .resizer {
     opacity: 0;
diff --git a/frontend/src/libs/components/table/table.tsx b/frontend/src/libs/components/table/table.tsx
@@ -27,7 +27,7 @@ type Properties<T> = {
   isLoading?: boolean;
   isTableEditable?: boolean;
   columns: ColumnDef<T>[];
-  emptyTableMessage?: JSX.Element;
+  emptyTableMessage?: string;
   pageSize: number;
   totalRow: number;
   pageIndex: number;
@@ -110,7 +110,9 @@ const Table = <T,>({
   return (
     <div className={styles.container}>
       {isLoading ? (
-        <Spinner />
+        <div className={styles.spinnerWrapper}>
+          <Spinner />
+        </div>
       ) : (
         <div className={styles.wrapper}>
           <table
diff --git a/frontend/src/pages/dashboard/components/tables/drivers-table/driver-table.tsx b/frontend/src/pages/dashboard/components/tables/drivers-table/driver-table.tsx
@@ -59,12 +59,7 @@ const DriverTable: React.FC = () => {
     [dispatch, searchParameters, handleToggle],
   );
 
-  const message = (
-    <div>
-      There are no data here yet. Please,{' '}
-      <span className={styles.red}>add new driver</span>
-    </div>
-  );
+  const message = 'There are no data here yet. Please, add a driver';
 
   return (
     <div className={styles.container}>
@@ -73,7 +68,7 @@ const DriverTable: React.FC = () => {
           Company Drivers
         </h2>
         <Button
-          label="Add a Driver"
+          label="Add Driver"
           className={styles.btn}
           onClick={handleToggle}
         />
diff --git a/frontend/src/pages/dashboard/components/tables/drivers-table/styles.module.scss b/frontend/src/pages/dashboard/components/tables/drivers-table/styles.module.scss
@@ -27,7 +27,3 @@
 .formWrapper {
   width: 448px;
 }
-
-.red {
-  color: $red;
-}
diff --git a/frontend/src/pages/dashboard/components/tables/trucks-table/styles.module.scss b/frontend/src/pages/dashboard/components/tables/trucks-table/styles.module.scss
@@ -21,6 +21,7 @@
 .title {
   color: $blue-extra-dark;
   text-align: center;
+  text-transform: uppercase;
 }
 
 .formWrapper {
diff --git a/frontend/src/pages/dashboard/components/tables/trucks-table/trucks-table.tsx b/frontend/src/pages/dashboard/components/tables/trucks-table/trucks-table.tsx
@@ -71,22 +71,17 @@ const TruckTable: React.FC = () => {
     [dispatch, searchParameters, handleToggle],
   );
 
-  const message = (
-    <div>
-      There are no data here yet. Please,{' '}
-      <span className={styles.red}>add new driver</span>
-    </div>
-  );
+  const message = 'There are no data here yet. Please, add a truck';
 
   return (
     <>
       <div className={styles.container}>
         <div className={styles.header}>
-          <h2 className={getValidClassNames('uppercase', styles.title)}>
+          <h2 className={getValidClassNames('h3', styles.title)}>
             Company Trucks
           </h2>
           <Button
-            label="Add a truck"
+            label="Add Truck"
             className={styles.btn}
             onClick={handleToggle}
           />

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,3 @@`
`27`	`27`	`.formWrapper {`
`28`	`28`	`width: 448px;`
`29`	`29`	`}`
`30`		`-`
`31`		`-.red {`
`32`		`- color: $red;`
`33`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`.title {`
`22`	`22`	`color: $blue-extra-dark;`
`23`	`23`	`text-align: center;`
	`24`	`+ text-transform: uppercase;`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`.formWrapper {`