Update structure code

hotel-management/src/components/Dialog/index.tsx

@@ -4,7 +4,7 @@ import { MutableRefObject, ReactNode, forwardRef } from 'react';
 import { StyledBody, StyledDialog, StyledTitle } from './styled';
 
 // Type
-import { Nullable } from '../../globals/types';
+import { Nullable } from '../../types/common';
 
 export interface IDialogProps {
   title?: string;

hotel-management/src/components/Menus/index.tsx

@@ -13,7 +13,7 @@ import { StyledMenu, StyledButton, StyledList, StyledToggle } from './styled';
 import MenusContext from '../../contexts/MenuContext';
 
 // Types
-import { Nullable } from '../../globals/types';
+import { Nullable } from '../../types/common';
 
 interface IButton {
   children?: string;

hotel-management/src/constants/responseStatus.ts

@@ -2,6 +2,7 @@ const STATUS_CODE = {
   OK: 200,
   CREATE: 201,
   NOT_FOUND: 404,
+  INTERNAL_SERVER_ERROR: 500,
 };
 
 const RESPONSE_MESSAGE = {

hotel-management/src/globals/types.ts

@@ -1,31 +0,0 @@
-type TUser = {
-  id: number;
-  name: string;
-  identifiedCode: string;
-  phone: string;
-  roomId: number;
-};
-
-type TRoom = {
-  id: number;
-  name: string;
-  price: number;
-  discount: number;
-  finalPrice: number;
-  status: boolean;
-};
-
-type TResponse<T> = {
-  statusCode: number;
-  msg: string;
-  data?: T;
-};
-
-type Nullable<T> = T | null;
-
-export type {
-  TUser,
-  TRoom,
-  TResponse,
-  Nullable,
-};

hotel-management/src/helpers/sendRequest.ts

@@ -2,7 +2,7 @@
 import { BASE_URL } from '../constants/path';
 
 // Types
-import { TResponse } from '../globals/types';
+import { TResponse } from '../types/types';
 
 type TMethodRequest = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
 

hotel-management/src/hooks/useFetch.ts

@@ -8,7 +8,7 @@ import { DEFAULT_ORDER_BY, DEFAULT_SORT_BY } from '../constants/config';
 import { searchQuery } from '../helpers/utils';
 
 // Types
-import { Nullable } from '../globals/types';
+import { Nullable } from '../types/common';
 
 /**
  * The function use to fetch data on server API.

hotel-management/src/hooks/useForwardRef.ts

@@ -1,7 +1,7 @@
 import { ForwardedRef, useEffect, useRef } from 'react';
 
 // Types
-import { Nullable } from '../globals/types';
+import { Nullable } from '../types/common';
 
 const useForwardRef = <T>(
   ref: ForwardedRef<T>,

hotel-management/src/hooks/useOutsideClick.ts

@@ -1,7 +1,7 @@
 import { MutableRefObject, useEffect, useRef } from 'react';
 
 // Types
-import { Nullable } from '../globals/types';
+import { Nullable } from '../types/common';
 
 /**
  * Custom hook to call handler when click outside element

hotel-management/src/pages/Room/Dialog.tsx

@@ -11,7 +11,8 @@ import Dialog from '../../components/Dialog';
 import RoomForm from './Form';
 
 // Types
-import { Nullable, TRoom } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TRoom } from '../../types/rooms';
 
 // Hooks
 import { useForwardRef } from '../../hooks/useForwardRef';

hotel-management/src/pages/Room/Form.tsx

@@ -10,12 +10,16 @@ import Button from '../../commons/styles/Button.ts';
 import Input from '../../commons/styles/Input.ts';
 
 // Types
-import { Nullable, TRoom } from '../../globals/types.ts';
+import { Nullable } from '../../types/common';
+import { TRoom } from '../../types/rooms.ts';
 
 // Constants
+import { ROOM_PATH } from '../../constants/path.ts';
+import { STATUS_CODE } from '../../constants/responseStatus.ts';
 import {
   ADD_SUCCESS,
   EDIT_SUCCESS,
+  errorMsg,
 } from '../../constants/messages.ts';
 import {
   INVALID_DISCOUNT,
@@ -24,6 +28,7 @@ import {
 } from '../../constants/formValidateMessage.ts';
 
 // Helpers
+import { sendRequest } from '../../helpers/sendRequest.ts';
 import {
   isValidDiscount,
   isValidNumber,
@@ -33,7 +38,6 @@ import {
 // Components
 import FormRow from '../../components/LabelControl/index.tsx';
 import Form from '../../components/Form/index.tsx';
-import { addRoom, updateRoom } from '../../services/roomServices.ts';
 
 const FormBtn = styled(Button)`
   width: 100%;
@@ -83,17 +87,30 @@ const RoomForm = ({
     try {
       if (isAdd) {
         // Add request
-        const response = await addRoom(room);
 
-        if(response) {
+        const response = await sendRequest(
+          ROOM_PATH,
+          'POST',
+          JSON.stringify(room)
+        );
+
+        if (response.statusCode === STATUS_CODE.CREATE) {
           toast.success(ADD_SUCCESS);
+        } else {
+          throw new Error(errorMsg(response.statusCode, response.msg));
         }
       } else {
         // Edit request
-        const response = await updateRoom(room);
+        const response = await sendRequest(
+          ROOM_PATH + `/${room!.id}`,
+          'PUT',
+          JSON.stringify(room)
+        );
 
-        if (response) {
+        if (response.statusCode == STATUS_CODE.OK) {
           toast.success(EDIT_SUCCESS);
+        } else {
+          throw new Error(errorMsg(response.statusCode, response.msg));
         }
       }
       // Reload table data

hotel-management/src/pages/Room/Table.tsx

@@ -15,7 +15,8 @@ import SortBy from '../../components/SortBy';
 import OrderBy from '../../components/OrderBy';
 
 // Types
-import { Nullable, TRoom } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TRoom } from '../../types/rooms';
 
 // Constants
 import { useFetch } from '../../hooks/useFetch';

hotel-management/src/pages/Room/index.tsx

@@ -10,7 +10,8 @@ import Button from '../../commons/styles/Button';
 import RoomDialog from './Dialog';
 
 // Types
-import { Nullable, TRoom } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TRoom } from '../../types/rooms';
 
 const Room = () => {
   const dialogRef = useRef<HTMLDialogElement>(null);

hotel-management/src/pages/User/Dialog.tsx

@@ -11,7 +11,8 @@ import Dialog from '../../components/Dialog';
 import UserForm from './Form';
 
 // Types
-import { Nullable, TUser } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TUser } from '../../types/user';
 
 // Hooks
 import { useForwardRef } from '../../hooks/useForwardRef';

hotel-management/src/pages/User/Form.tsx

@@ -19,6 +19,7 @@ import FormRow from '../../components/LabelControl/index.tsx';
 import Select, { ISelectOptions } from '../../components/Select';
 
 // Helpers
+import { sendRequest } from '../../helpers/sendRequest.ts';
 import {
   isEmptyObj,
   isValidName,
@@ -27,10 +28,13 @@ import {
 } from '../../helpers/validators.ts';
 
 // Constants
+import { STATUS_CODE } from '../../constants/responseStatus.ts';
 import {
   ADD_SUCCESS,
   EDIT_SUCCESS,
+  errorMsg,
 } from '../../constants/messages.ts';
+import { USER_PATH } from '../../constants/path.ts';
 import {
   INVALID_FIELD,
   INVALID_PHONE,
@@ -45,8 +49,9 @@ import { FormBtn } from './styled.ts';
 import { getAllRoom, updateRoomStatus } from '../../services/roomServices.ts';
 
 // Types
-import { Nullable, TRoom, TUser } from '../../globals/types.ts';
-import { createUser, updateUser } from '../../services/userServices.ts';
+import { Nullable } from '../../types/common';
+import { TUser } from '../../types/user.ts';
+import { TRoom } from '../../types/rooms.ts';
 
 interface IUserFormProp {
   onClose: () => void;
@@ -82,12 +87,6 @@ const UserForm = ({
 
       // Load and set default options room
       if (rooms.length > 0) {
-        // Init first options
-        options.push({
-          label: '---Select---',
-          value: '0'
-        })
-
         rooms.forEach((item) => {
           if (!item.status || tempUser?.roomId === item.id)
             options.push({
@@ -99,11 +98,16 @@ const UserForm = ({
 
       if (options.length > 0) {
         setOptions(options);
+        reset({ roomId: +options[0].value });
       }
 
       if (!isEmptyObj(tempUser)) {
-        
         // Init value
+        // Set default value when user not have room yet.
+        if (!tempUser.roomId) {
+          tempUser.roomId = +options[0].value;
+        }
+
         reset(tempUser);
       } else {
         reset(INIT_VALUE_USER_FORM);
@@ -119,20 +123,32 @@ const UserForm = ({
       try {
         if (isAdd) {
           // Add request
-          const response = await createUser(newUser);
+          const response = await sendRequest(
+            USER_PATH,
+            'POST',
+            JSON.stringify(newUser)
+          );
 
-          if (response) {
+          if (response.statusCode === STATUS_CODE.CREATE) {
             toast.success(ADD_SUCCESS);
+          } else {
+            throw new Error(errorMsg(response.statusCode, response.msg));
           }
 
           // Update room status
           updateRoomStatus(newUser.roomId, true);
         } else {
           // Edit request
-          const response = await updateUser(newUser);
+          const response = await sendRequest(
+            USER_PATH + `/${newUser.id}`,
+            'PUT',
+            JSON.stringify(newUser)
+          );
 
-          if (response) {
+          if (response.statusCode == STATUS_CODE.OK) {
             toast.success(EDIT_SUCCESS);
+          } else {
+            throw new Error(errorMsg(response.statusCode, response.msg));
           }
 
           // Update room status
@@ -224,7 +240,6 @@ const UserForm = ({
               optionsConfigForm={{
                 valueAsNumber: true,
                 onChange: () => trigger('roomId'),
-                validate: (v) => v !== 0
               }}
             />
           ) : (

hotel-management/src/pages/User/Table.tsx

@@ -14,7 +14,8 @@ import SortBy from '../../components/SortBy';
 import OrderBy from '../../components/OrderBy';
 
 // Types
-import { Nullable, TUser } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TUser } from '../../types/user';
 
 // Hooks
 import { useFetch } from '../../hooks/useFetch';

hotel-management/src/pages/User/index.tsx

@@ -10,7 +10,8 @@ import { StyledUser, Title } from './styled';
 import UserDialog from './Dialog';
 
 // Types
-import { Nullable, TUser } from '../../globals/types';
+import { Nullable } from '../../types/common';
+import { TUser } from '../../types/user';
 
 const User = () => {
   const dialogRef = useRef<HTMLDialogElement>(null);

hotel-management/src/services/roomServices.ts

@@ -1,7 +1,9 @@
 import toast from 'react-hot-toast';
 
 // Types
-import { Nullable, TResponse, TRoom } from '../globals/types';
+import { Nullable } from '../types/common';
+import { TRoom } from '../types/rooms';
+import { TResponse } from '../types/response';
 
 // Helpers
 import { sendRequest } from '../helpers/sendRequest';
@@ -44,13 +46,13 @@ const getRoom = async (roomId: number): Promise<Nullable<TRoom>> => {
   try {
     const response = await sendRequest<TRoom>(ROOM_PATH + '/' + roomId);
 
-    if (response.statusCode !== STATUS_CODE.OK) {
+    if (response.statusCode === STATUS_CODE.OK) {
+      const rooms = response.data!;
+
+      return rooms;
+    } else {
       throw new Error(errorMsg(response.statusCode, response.msg));
     }
-
-    const rooms = response.data!;
-
-    return rooms;
   } catch (error) {
     if (error instanceof Error) {
       toast.error(error.message);
@@ -73,6 +75,10 @@ const updateRoom = async (room: TRoom): Promise<Nullable<TResponse<TRoom>>> => {
       JSON.stringify(room)
     );
 
+    if (response.statusCode !== STATUS_CODE.OK) {
+      throw new Error(errorMsg(response.statusCode, response.msg));
+    }
+
     return response;
   } catch (error: unknown) {
     if (error instanceof Error) {
@@ -95,77 +101,44 @@ const updateRoomStatus = async (
   status: boolean,
   roomIdNew?: number
 ): Promise<Nullable<TResponse<TRoom>>> => {
-  try {
-    if (!roomIdNew) {
-      const response = await sendRequest<TRoom>(
-        ROOM_PATH + '/' + roomId,
-        'PATCH',
-        JSON.stringify({ status: status })
-      );
-
-      return response;
-    }
-
-    // Update new room status
-    const resNewRoom = await sendRequest<TRoom>(
-      ROOM_PATH + '/' + roomIdNew,
+  if (!roomIdNew) {
+    const response = await sendRequest<TRoom>(
+      ROOM_PATH + '/' + roomId,
       'PATCH',
       JSON.stringify({ status: status })
     );
 
-    // Update old room status;
-    const resOldRoom = await sendRequest<TRoom>(
-      ROOM_PATH + '/' + roomId,
-      'PATCH',
-      JSON.stringify({ status: !status })
-    );
-
-    if (
-      resNewRoom.statusCode === STATUS_CODE.OK &&
-      resOldRoom.statusCode === STATUS_CODE.OK
-    ) {
-      return {
-        statusCode: STATUS_CODE.OK,
-        msg: RESPONSE_MESSAGE.UPDATE_SUCCESS,
-      };
-    }
-  } catch (error) {
-    if (error instanceof Error) {
-      toast.error(error.message);
-    }
-  }
-
-  return null;
-};
-
-/**
- * Add room to server
- * @param room The room object need to be add
- * @returns The response object if complete or null
- */
-const addRoom = async (room: TRoom): Promise<Nullable<TResponse<TRoom>>> => {
-  try {
-    // Set default status room
-    room.status = false;
-
-    const response = await sendRequest<TRoom>(
-      ROOM_PATH,
-      'POST',
-      JSON.stringify(room)
-    );
-
-    if (response.statusCode !== STATUS_CODE.CREATE) {
-      throw new Error(errorMsg(response.statusCode, response.msg));
-    }
-
     return response;
-  } catch (error: unknown) {
-    if (error instanceof Error) {
-      toast.error(error.message);
-    }
   }
   
-  return null;
+  // Update new room status
+  const resNewRoom = await sendRequest<TRoom>(
+    ROOM_PATH + '/' + roomIdNew,
+    'PATCH',
+    JSON.stringify({ status: status })
+  );
+
+  // Update old room status;
+  const resOldRoom = await sendRequest<TRoom>(
+    ROOM_PATH + '/' + roomId,
+    'PATCH',
+    JSON.stringify({ status: !status })
+  );
+
+  if (
+    resNewRoom.statusCode === STATUS_CODE.OK &&
+    resOldRoom.statusCode === STATUS_CODE.OK
+  ) {
+    return {
+      statusCode: STATUS_CODE.OK,
+      msg: RESPONSE_MESSAGE.UPDATE_SUCCESS,
+    };
+  }
+
+  return {
+    statusCode: STATUS_CODE.INTERNAL_SERVER_ERROR,
+    msg: 'Something went wrong!',
+  };
 };
 
-export { getRoom, updateRoom, updateRoomStatus, getAllRoom, addRoom };
+export { getRoom, updateRoom, updateRoomStatus, getAllRoom };

hotel-management/src/services/userServices.ts

@@ -6,43 +6,13 @@ import { USER_PATH } from '../constants/path';
 import { STATUS_CODE } from '../constants/responseStatus';
 
 // Types
-import { Nullable, TResponse, TUser } from '../globals/types';
+import { Nullable } from '../types/common';
+import { TUser } from '../types/user';
+import { TResponse } from '../types/response';
 
 // Helpers
 import { sendRequest } from '../helpers/sendRequest';
 
-/**
- * Create user to the server
- * @param user The user object need to be created
- * @returns The TResponse object if success or null
- */
-const createUser = async (user: TUser): Promise<Nullable<TResponse<TUser>>> => {
-  try {
-    const response = await sendRequest<TUser>(
-      USER_PATH,
-      'POST',
-      JSON.stringify(user)
-    );
-
-    if (response.statusCode !== STATUS_CODE.CREATE) {
-      throw new Error(errorMsg(response.statusCode, response.msg));
-    }
-
-    return response;
-  } catch (error: unknown) {
-    if (error instanceof Error) {
-      toast.error(error.message);
-    }
-  }
-
-  return null;
-}
-
-/**
- * Update the user to the server
- * @param user The user object need to be updated
- * @returns The TResponse object if update success or null
- */
 const updateUser = async (user: TUser): Promise<Nullable<TResponse<TUser>>> => {
   try {
     const response = await sendRequest<TUser>(
@@ -65,11 +35,6 @@ const updateUser = async (user: TUser): Promise<Nullable<TResponse<TUser>>> => {
   return null;
 };
 
-/**
- * Checkout user
- * @param user The user need to be checkout
- * @returns The TResponse object if checkout success or not
- */
 const checkOutUser = async (user: TUser): Promise<Nullable<TResponse<TUser>>> => {
   const tempUser = user;
 
@@ -83,4 +48,4 @@ const checkOutUser = async (user: TUser): Promise<Nullable<TResponse<TUser>>> =>
   return null;
 };
 
-export { updateUser, checkOutUser, createUser };
+export { updateUser, checkOutUser };

hotel-management/src/types/common.ts

@@ -0,0 +1,3 @@
+type Nullable<T> = T | null;
+
+export type { Nullable };

hotel-management/src/types/response.ts

@@ -0,0 +1,7 @@
+type TResponse<T> = {
+  statusCode: number;
+  msg: string;
+  data?: T;
+};
+
+export type { TResponse };

hotel-management/src/types/rooms.ts

@@ -0,0 +1,10 @@
+type TRoom = {
+  id: number;
+  name: string;
+  price: number;
+  discount: number;
+  finalPrice: number;
+  status: boolean;
+};
+
+export type { TRoom };

hotel-management/src/types/user.ts

@@ -0,0 +1,9 @@
+type TUser = {
+  id: number;
+  name: string;
+  identifiedCode: string;
+  phone: string;
+  roomId: number;
+};
+
+export type { TUser };