reverted to old apis and added register func

keyurdoshi03 · keyurdoshi03 · commit 445727363bfa · 2025-10-27T11:58:23.000+05:30
diff --git a/openapi-spec/crapi-openapi-spec.json b/openapi-spec/crapi-openapi-spec.json
@@ -1009,9 +1009,9 @@
       },
       "parameters" : [ ]
     },
-    "/identity/api/v2/vehicle/verify_vehicle" : {
+    "/identity/api/v2/vehicle/add_vehicle" : {
       "post" : {
-        "operationId" : "verify_vehicle",
+        "operationId" : "add_vehicle",
         "summary" : "Add the user vehicle",
         "tags" : [ "Identity / Vehicle" ],
         "security" : [ {
diff --git a/postman_collections/crAPI.postman_collection.json b/postman_collections/crAPI.postman_collection.json
@@ -775,7 +775,7 @@
         "uid": "13872198-c0ef62ef-8ca0-4eaf-a3d8-44c1aa41a407"
       },
       {
-        "name": "Verify Vehicle from Mail",
+        "name": "Add Vehicle from Mail",
         "event": [
           {
             "listen": "test",
@@ -850,7 +850,7 @@
             "raw": "{\"vin\": \"{{VIN}}\", \"pincode\": \"{{PIN}}\"}"
           },
           "url": {
-            "raw": "{{url}}/identity/api/v2/vehicle/verify_vehicle",
+            "raw": "{{url}}/identity/api/v2/vehicle/add_vehicle",
             "host": [
               "{{url}}"
             ],
@@ -859,7 +859,7 @@
               "api",
               "v2",
               "vehicle",
-              "verify_vehicle"
+              "add_vehicle"
             ]
           }
         },
diff --git a/services/chatbot/src/resources/crapi-openapi-spec.json b/services/chatbot/src/resources/crapi-openapi-spec.json
@@ -1009,9 +1009,9 @@
       },
       "parameters" : [ ]
     },
-    "/identity/api/v2/vehicle/verify_vehicle" : {
+    "/identity/api/v2/vehicle/add_vehicle" : {
       "post" : {
-        "operationId" : "verify_vehicle",
+        "operationId" : "add_vehicle",
         "summary" : "Add the user vehicle",
         "tags" : [ "Identity / Vehicle" ],
         "security" : [ {
diff --git a/services/identity/src/main/java/com/crapi/constant/UserMessage.java b/services/identity/src/main/java/com/crapi/constant/UserMessage.java
@@ -60,7 +60,7 @@ public class UserMessage {
   public static final String VEHICLE_DETAILS_SENT_TO_EMAIL =
       "Your newly purchased vehicle details have been sent to you email address. Verify them to add your vehicle. [If you have used example.com email, check your email using the MailHog web portal]";
   public static final String CHANGE_EMAIL_MESSAGE =
-      "The token has been sent to your email. If you have used example.com email, check your email using the MailHog web portal.";
+      "The token has been sent to your email. If you have used example.com email, check your email using the MailHog web portal.   ";
   public static final String CHANGE_EMAIL_OLD_USEREMAIL_NOT_FOUND_MESSAGE =
       "Sorry, we didn't find any user for ";
   public static final String INVALID_EMAIL_TOKEN = "Sorry, Token did't match";
diff --git a/services/identity/src/main/java/com/crapi/controller/VehicleController.java b/services/identity/src/main/java/com/crapi/controller/VehicleController.java
@@ -41,30 +41,30 @@ public class VehicleController {
   @Autowired VehicleOwnershipService vehicleOwnershipService;
 
   /**
-   * @param vehicleDetails
-   * @return response of success and failure message save vehicle Details for user in database
+   * @param request
+   * @return response of success and failure message creates vehicle and sends details to user
    */
-  @PostMapping("/vehicle/create_vehicle")
-  public ResponseEntity<CRAPIResponse> createVehicle(HttpServletRequest request) {
-    CRAPIResponse createVehicleResponse = vehicleService.createVehicle(request);
-    if (createVehicleResponse != null && createVehicleResponse.getStatus() == 200) {
-      return ResponseEntity.status(HttpStatus.OK).body(createVehicleResponse);
+  @PostMapping("/vehicle/register_vehicle")
+  public ResponseEntity<CRAPIResponse> registerVehicle(HttpServletRequest request) {
+    CRAPIResponse registerVehicleResponse = vehicleService.registerVehicle(request);
+    if (registerVehicleResponse != null && registerVehicleResponse.getStatus() == 200) {
+      return ResponseEntity.status(HttpStatus.OK).body(registerVehicleResponse);
     }
-    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(createVehicleResponse);
+    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(registerVehicleResponse);
   }
 
   /**
    * @param vehicleDetails
    * @return response of success and failure message save vehicle Details for user in database
    */
-  @PostMapping("/vehicle/verify_vehicle")
+  @PostMapping("/vehicle/add_vehicle")
   public ResponseEntity<CRAPIResponse> addVehicle(
       @Valid @RequestBody VehicleForm vehicleDetails, HttpServletRequest request) {
-    CRAPIResponse verifyVehicleResponse = vehicleService.verifyVehicle(vehicleDetails, request);
-    if (verifyVehicleResponse != null && verifyVehicleResponse.getStatus() == 200) {
-      return ResponseEntity.status(HttpStatus.OK).body(verifyVehicleResponse);
+    CRAPIResponse checkVehicleResponse = vehicleService.checkVehicle(vehicleDetails, request);
+    if (checkVehicleResponse != null && checkVehicleResponse.getStatus() == 200) {
+      return ResponseEntity.status(HttpStatus.OK).body(checkVehicleResponse);
     }
-    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(verifyVehicleResponse);
+    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(checkVehicleResponse);
   }
 
   /**
diff --git a/services/identity/src/main/java/com/crapi/service/Impl/VehicleServiceImpl.java b/services/identity/src/main/java/com/crapi/service/Impl/VehicleServiceImpl.java
@@ -109,11 +109,11 @@ public VehicleDetails createVehicle() {
 
   /**
    * @param request
-   * @return CRAPIResponse after creating a new vehicle and assigning it to the current user
+   * @return CRAPIResponse after creating a new vehicle and sending details to current user
    */
   @Transactional
   @Override
-  public CRAPIResponse createVehicle(HttpServletRequest request) {
+  public CRAPIResponse registerVehicle(HttpServletRequest request) {
     User user = null;
     UserDetails userDetails = null;
     VehicleDetails vehicleDetails = null;
@@ -205,7 +205,7 @@ public VehicleLocationResponse getVehicleLocation(UUID carId) {
    */
   @Transactional
   @Override
-  public CRAPIResponse verifyVehicle(VehicleForm vehicleForm, HttpServletRequest request) {
+  public CRAPIResponse checkVehicle(VehicleForm vehicleForm, HttpServletRequest request) {
     VehicleDetails checkVehicle = null;
     User user = null;
     checkVehicle = vehicleDetailsRepository.findByVin(vehicleForm.getVin());
diff --git a/services/identity/src/main/java/com/crapi/service/VehicleService.java b/services/identity/src/main/java/com/crapi/service/VehicleService.java
@@ -28,13 +28,13 @@ public interface VehicleService {
 
   VehicleDetails createVehicle();
 
-  CRAPIResponse createVehicle(HttpServletRequest request);
+  CRAPIResponse registerVehicle(HttpServletRequest request);
 
   List<VehicleDetails> getVehicleDetails(HttpServletRequest request);
 
   VehicleLocationResponse getVehicleLocation(UUID carId);
 
-  CRAPIResponse verifyVehicle(VehicleForm vehicleDetails, HttpServletRequest request);
+  CRAPIResponse checkVehicle(VehicleForm vehicleDetails, HttpServletRequest request);
 
   CRAPIResponse sendVehicleDetails(HttpServletRequest request);
 }
diff --git a/services/identity/src/test/java/com/crapi/service/Impl/VehicleServiceImplTest.java b/services/identity/src/test/java/com/crapi/service/Impl/VehicleServiceImplTest.java
@@ -181,7 +181,7 @@ public void getVehicleLocationNotFoundWhenVehicleDetailsOwnerIsNull() {
   }
 
   @Test
-  public void verifyVehicleSuccessFull() {
+  public void checkVehicleSuccessFull() {
     VehicleForm vehicleForm = getDummyVehicleForm();
     VehicleDetails vehicleDetails = getDummyVehicleDetails();
     User user = getDummyUser();
@@ -191,50 +191,50 @@ public void verifyVehicleSuccessFull() {
         .thenReturn(vehicleDetails);
     Mockito.when(userService.getUserFromToken(Mockito.any())).thenReturn(user);
     CRAPIResponse crapiAPIResponse =
-        vehicleService.verifyVehicle(vehicleForm, getDummyHttpRequest());
+        vehicleService.checkVehicle(vehicleForm, getDummyHttpRequest());
     Mockito.verify(vehicleDetailsRepository, Mockito.times(1)).save(Mockito.any());
     Assertions.assertEquals(UserMessage.VEHICLE_SAVED_SUCCESSFULLY, crapiAPIResponse.getMessage());
     Assertions.assertEquals(HttpStatus.OK.value(), crapiAPIResponse.getStatus());
   }
 
   @Test
-  public void verifyVehicleFailWhenPinCodeNotEqual() {
+  public void checkVehicleFailWhenPinCodeNotEqual() {
     VehicleForm vehicleForm = getDummyVehicleForm();
     VehicleDetails vehicleDetails = getDummyVehicleDetails();
     User user = getDummyUser();
     Mockito.when(vehicleDetailsRepository.findByVin(Mockito.anyString()))
         .thenReturn(vehicleDetails);
     Mockito.when(userService.getUserFromToken(Mockito.any())).thenReturn(user);
     CRAPIResponse crapiAPIResponse =
-        vehicleService.verifyVehicle(vehicleForm, getDummyHttpRequest());
+        vehicleService.checkVehicle(vehicleForm, getDummyHttpRequest());
     Mockito.verify(vehicleDetailsRepository, Mockito.times(0)).save(Mockito.any());
     Assertions.assertEquals(UserMessage.VEHICLE_ALREADY_CREATED, crapiAPIResponse.getMessage());
     Assertions.assertEquals(HttpStatus.FORBIDDEN.value(), crapiAPIResponse.getStatus());
   }
 
   @Test
-  public void verifyVehicleFailWhenVehicleDetailsNotFound() {
+  public void checkVehicleFailWhenVehicleDetailsNotFound() {
     VehicleForm vehicleForm = getDummyVehicleForm();
     User user = getDummyUser();
     Mockito.when(vehicleDetailsRepository.findByVin(Mockito.anyString())).thenReturn(null);
     Mockito.when(userService.getUserFromToken(Mockito.any())).thenReturn(user);
     CRAPIResponse crapiAPIResponse =
-        vehicleService.verifyVehicle(vehicleForm, getDummyHttpRequest());
+        vehicleService.checkVehicle(vehicleForm, getDummyHttpRequest());
     Mockito.verify(vehicleDetailsRepository, Mockito.times(0)).save(Mockito.any());
     Assertions.assertEquals(UserMessage.VEHICLE_ALREADY_CREATED, crapiAPIResponse.getMessage());
     Assertions.assertEquals(HttpStatus.FORBIDDEN.value(), crapiAPIResponse.getStatus());
   }
 
   @Test
-  public void verifyVehicleFailWhenUserNotFound() {
+  public void checkVehicleFailWhenUserNotFound() {
     VehicleForm vehicleForm = getDummyVehicleForm();
     VehicleDetails vehicleDetails = getDummyVehicleDetails();
     vehicleDetails.setPincode(vehicleForm.getPincode());
     Mockito.when(vehicleDetailsRepository.findByVin(Mockito.anyString()))
         .thenReturn(vehicleDetails);
     Mockito.when(userService.getUserFromToken(Mockito.any())).thenReturn(null);
     CRAPIResponse crapiAPIResponse =
-        vehicleService.verifyVehicle(vehicleForm, getDummyHttpRequest());
+        vehicleService.checkVehicle(vehicleForm, getDummyHttpRequest());
     Mockito.verify(vehicleDetailsRepository, Mockito.times(0)).save(Mockito.any());
     Assertions.assertEquals(UserMessage.VEHICLE_ALREADY_CREATED, crapiAPIResponse.getMessage());
     Assertions.assertEquals(HttpStatus.FORBIDDEN.value(), crapiAPIResponse.getStatus());
diff --git a/services/web/src/actions/vehicleActions.ts b/services/web/src/actions/vehicleActions.ts
@@ -25,9 +25,9 @@ interface GetVehiclesPayload extends ActionPayload {
   email?: string;
 }
 
-export const createVehicleAction = ({ callback, accessToken }: ActionPayload) => {
+export const registerVehicleAction = ({ callback, accessToken }: ActionPayload) => {
   return {
-    type: actionTypes.CREATE_VEHICLE,
+    type: actionTypes.REGISTER_VEHICLE,
     payload: {
       accessToken,
       callback,
diff --git a/services/web/src/components/dashboard/dashboard.tsx b/services/web/src/components/dashboard/dashboard.tsx
@@ -186,8 +186,8 @@ const Dashboard: React.FC<DashboardProps> = ({
       <span className="alert-msg">{NO_VEHICLE_DESC_3}</span>
     </>
   );
-  const handleAddVehicleClick = () => {
-    navigate("/add-vehicle");
+  const handleVerifyVehicleClick = () => {
+    navigate("/verify-vehicle");
   };
 
   const handleVehicleServiceClick = (vin: string) => {
@@ -208,8 +208,8 @@ const Dashboard: React.FC<DashboardProps> = ({
               shape="round"
               icon={<PlusOutlined />}
               size="large"
-              onClick={handleAddVehicleClick}
-              key="add-vehicle"
+              onClick={handleVerifyVehicleClick}
+              key="verify-vehicle"
             >
               Add Vehicle
             </Button>,
diff --git a/services/web/src/components/layout/layout.tsx b/services/web/src/components/layout/layout.tsx
@@ -27,7 +27,7 @@ import ForgotPassword from "../forgotPassword/forgotPassword";
 import ResetPasswordContainer from "../../containers/resetPassword/resetPassword";
 import DashboardContainer from "../../containers/dashboard/dashboard";
 import MechanicDashboardContainer from "../../containers/mechanicDashboard/mechanicDashboard";
-import AddVehicleContainer from "../../containers/addVehicle/addVehicle";
+import VerifyVehicleContainer from "../../containers/verifyVehicle/verifyVehicle";
 import ContactMechanicContainer from "../../containers/contactMechanic/contactMechanic";
 import ChangeEmail from "../changeEmail/changeEmail";
 import roleTypes from "../../constants/roleTypes";
@@ -305,10 +305,10 @@ const StyledComp: React.FC<PropsFromRedux> = (props) => {
               }
             />
             <Route
-              path="/add-vehicle"
+              path="/verify-vehicle"
               element={
                 <AfterLogin
-                  component={AddVehicleContainer}
+                  component={VerifyVehicleContainer}
                   isLoggedIn={props.isLoggedIn}
                   componentRole={roleTypes.ROLE_USER}
                   userRole={props.role}
diff --git a/services/web/src/components/verifyVehicle/verifyVehicle.css b/services/web/src/components/verifyVehicle/verifyVehicle.css
diff --git a/services/web/src/components/verifyVehicle/verifyVehicle.tsx b/services/web/src/components/verifyVehicle/verifyVehicle.tsx
@@ -22,56 +22,60 @@ import {
   INVALID_VIN,
 } from "../../constants/messages";
 import { PIN_CODE_VALIDATION, VIN_VALIDATION } from "../../constants/constants";
-import "./addVehicle.css";
+import "./verifyVehicle.css";
 
-interface AddVehicleProps {
+interface VerifyVehicleProps {
   hasErrored: boolean;
   errorMessage: string;
   onFinish: (values: any) => void;
-  onCreateVehicle: () => void;
-  vehicleCreated: number;
-  creationMessage: string;
+  onRegisterVehicle: () => void;
+  vehicleRegistered: number;
+  registrationMessage: string;
+  vehicles: any[];
 }
 
-const AddVehicle: React.FC<AddVehicleProps> = ({
+const VerifyVehicle: React.FC<VerifyVehicleProps> = ({
   hasErrored,
   errorMessage,
   onFinish,
-  onCreateVehicle,
-  vehicleCreated,
-  creationMessage,
+  onRegisterVehicle,
+  vehicleRegistered,
+  registrationMessage,
+  vehicles,
 }) => {
   return (
     <div className="container add-vehicle-container">
       <Row justify="center">
-        <Col xs={24} md={11}>
-          <Card
-            title="Create New Vehicle"
-            bordered={false}
-            className="add-vehicle-card"
-          >
-            <Button
-              type="primary"
-              onClick={onCreateVehicle}
-              disabled={vehicleCreated !== 0}
-              loading={vehicleCreated === 1}
-              className="form-button"
+        {vehicles.length && (
+          <Col xs={24} md={11}>
+            <Card
+              title="Register New Vehicle"
+              bordered={false}
+              className="add-vehicle-card"
             >
-              {vehicleCreated === 2 ? "Vehicle Created" : "Create Your New Vehicle"}
-            </Button>
-            {creationMessage && (
-              <Alert
-                message={vehicleCreated === 2 ? "Success" : "Error"}
-                description={creationMessage}
-                type={vehicleCreated === 2 ? "success" : "warning"}
-                showIcon
-                className="vehicle-alert"
-              />
-            )}
-          </Card>
-        </Col>
+              <Button
+                type="primary"
+                onClick={onRegisterVehicle}
+                disabled={vehicleRegistered !== 0}
+                loading={vehicleRegistered === 1}
+                className="form-button"
+              >
+                {vehicleRegistered === 2 ? "Vehicle Registered" : "Register Your New Vehicle"}
+              </Button>
+              {registrationMessage && (
+                <Alert
+                  message={vehicleRegistered === 2 ? "Success" : "Error"}
+                  description={registrationMessage}
+                  type={vehicleRegistered === 2 ? "success" : "warning"}
+                  showIcon
+                  className="vehicle-alert"
+                />
+              )}
+            </Card>
+          </Col>
+        )}
         
-        <Col xs={24} md={11}>
+        <Col xs={24} md={vehicles.length ? 11 : 20}>
           <Card
             title="Verify Vehicle Details"
             bordered={false}
@@ -121,4 +125,4 @@ const AddVehicle: React.FC<AddVehicleProps> = ({
   );
 };
 
-export default AddVehicle;
+export default VerifyVehicle;
diff --git a/services/web/src/constants/APIConstant.ts b/services/web/src/constants/APIConstant.ts
@@ -42,8 +42,8 @@ export const requestURLS: RequestURLSType = {
   FORGOT_PASSWORD: "api/auth/forget-password",
   VERIFY_OTP: "api/auth/v3/check-otp",
   LOGIN_TOKEN: "api/auth/v4.0/user/login-with-token",
-  CREATE_VEHICLE: "api/v2/vehicle/create_vehicle",
-  VERIFY_VEHICLE: "api/v2/vehicle/verify_vehicle",
+  REGISTER_VEHICLE: "api/v2/vehicle/register_vehicle",
+  ADD_VEHICLE: "api/v2/vehicle/add_vehicle",
   GET_VEHICLES: "api/v2/vehicle/vehicles",
   RESEND_MAIL: "api/v2/vehicle/resend_email",
   CHANGE_EMAIL: "api/v2/user/change-email",
diff --git a/services/web/src/constants/actionTypes.ts b/services/web/src/constants/actionTypes.ts
@@ -42,7 +42,7 @@ const actionTypes = {
   GET_VEHICLE_SERVICES: "GET_VEHICLE_SERVICES",
   GET_SERVICE_REPORT: "GET_SERVICE_REPORT",
   RESEND_MAIL: "RESEND_MAIL",
-  CREATE_VEHICLE: "CREATE_VEHICLE",
+  REGISTER_VEHICLE: "REGISTER_VEHICLE",
   VERIFY_VEHICLE: "VERIFY_VEHICLE",
   GET_VEHICLES: "GET_VEHICLES",
   FETCHED_VEHICLES: "FETCHED_VEHICLES",
diff --git a/services/web/src/constants/messages.ts b/services/web/src/constants/messages.ts
@@ -100,7 +100,7 @@ export const EMAIL_NOT_CHANGED: string = "Could not change email id";
 export const NO_SERVICES: string = "Could not get mechanic details";
 export const EMAIL_NOT_SENT: string = "Could not resend mail";
 export const VEHICLE_NOT_ADDED: string = "Internal Server error! Wrong VIN!";
-export const VEHICLE_NOT_CREATED: string = "Could not create vehicle. Try again!";
+export const VEHICLE_NOT_REGISTERED: string = "Could not register vehicle. Try again!";
 export const NO_VEHICLES: string = "Could not get vehicles";
 export const NO_MECHANICS: string = "Could not get mechanic details";
 export const SERVICE_REQUEST_SENT: string =
diff --git a/services/web/src/containers/verifyVehicle/verifyVehicle.js b/services/web/src/containers/verifyVehicle/verifyVehicle.js
diff --git a/services/web/src/sagas/vehicleSaga.ts b/services/web/src/sagas/vehicleSaga.ts
