New feature of adding multiple vehicles added

Author: keyurdoshi03

docs/challengeSolutions.md

@@ -14,7 +14,7 @@ Verify the ports of the container by running the following command : `docker ps`
 #### Detailed solution
 
 1. Login to the application from http://localhost:8888/login
-2. From the *Dashboard*, choose *Add a Vehicle* and add the vehicle by providing the VIN and pincode received in Mailhog mailbox after Signup or by reinitiating from *Dashboard* page.
+2. From the *Dashboard*, choose *Add Vehicle* and add the vehicle by providing the VIN and pincode received in Mailhog mailbox after Signup or by reinitiating from *Dashboard* page.
 3. After the vehicle details are verified successful, the vehicle will get added and then be populated in the *Dashboard* page.
 4. Observe the request sent when we click *Refresh Location*. It can be seen that the endpoint is in the format `/identity/api/v2/vehicle/<vehicleid>/location`.
 5. Sensitive information like latitude and longitude are provided back in the response for the endpoint. Send the request to *Repeater* for later purpose.

openapi-spec/crapi-openapi-spec.json

@@ -1009,9 +1009,9 @@
       },
       "parameters" : [ ]
     },
-    "/identity/api/v2/vehicle/add_vehicle" : {
+    "/identity/api/v2/vehicle/verify_vehicle" : {
       "post" : {
-        "operationId" : "add_vehicle",
+        "operationId" : "verify_vehicle",
         "summary" : "Add the user vehicle",
         "tags" : [ "Identity / Vehicle" ],
         "security" : [ {

postman_collections/crAPI.postman_collection.json

@@ -775,7 +775,7 @@
         "uid": "13872198-c0ef62ef-8ca0-4eaf-a3d8-44c1aa41a407"
       },
       {
-        "name": "Add Vehicle from Mail",
+        "name": "Verify Vehicle from Mail",
         "event": [
           {
             "listen": "test",
@@ -850,7 +850,7 @@
             "raw": "{\"vin\": \"{{VIN}}\", \"pincode\": \"{{PIN}}\"}"
           },
           "url": {
-            "raw": "{{url}}/identity/api/v2/vehicle/add_vehicle",
+            "raw": "{{url}}/identity/api/v2/vehicle/verify_vehicle",
             "host": [
               "{{url}}"
             ],
@@ -859,7 +859,7 @@
               "api",
               "v2",
               "vehicle",
-              "add_vehicle"
+              "verify_vehicle"
             ]
           }
         },

services/chatbot/src/resources/crapi-openapi-spec.json

@@ -1009,9 +1009,9 @@
       },
       "parameters" : [ ]
     },
-    "/identity/api/v2/vehicle/add_vehicle" : {
+    "/identity/api/v2/vehicle/verify_vehicle" : {
       "post" : {
-        "operationId" : "add_vehicle",
+        "operationId" : "verify_vehicle",
         "summary" : "Add the user vehicle",
         "tags" : [ "Identity / Vehicle" ],
         "security" : [ {

services/identity/src/main/java/com/crapi/constant/UserMessage.java

@@ -55,12 +55,12 @@ public class UserMessage {
   public static final String PASSWORD_GOT_RESET = "Password reset successful.";
   public static final String VEHICLE_MODEL_IS_NOT_AVAILABLE =
       "Sorry we don't have Vehicle model for this company. Please select other..";
-  public static final String VEHICLE_SAVED_SUCCESSFULLY = "Vehicle save successfully..";
+  public static final String VEHICLE_SAVED_SUCCESSFULLY = "Vehicle saved successfully!";
   public static final String VEHICLE_NOT_FOUND = "Failed to get Vehicles";
   public static final String VEHICLE_DETAILS_SENT_TO_EMAIL =
-      "Your newly purchased Vehicle Details have been sent to you email address. If you have used example.com email, check your email using the MailHog web portal. ";
+      "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";

services/identity/src/main/java/com/crapi/controller/VehicleController.java

@@ -44,14 +44,27 @@ public class VehicleController {
    * @param vehicleDetails
    * @return response of success and failure message save vehicle Details for user in database
    */
-  @PostMapping("/vehicle/add_vehicle")
+  @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);
+    }
+    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(createVehicleResponse);
+  }
+
+  /**
+   * @param vehicleDetails
+   * @return response of success and failure message save vehicle Details for user in database
+   */
+  @PostMapping("/vehicle/verify_vehicle")
   public ResponseEntity<CRAPIResponse> addVehicle(
       @Valid @RequestBody VehicleForm vehicleDetails, HttpServletRequest request) {
-    CRAPIResponse checkVehicleResponse = vehicleService.checkVehicle(vehicleDetails, request);
-    if (checkVehicleResponse != null && checkVehicleResponse.getStatus() == 200) {
-      return ResponseEntity.status(HttpStatus.OK).body(checkVehicleResponse);
+    CRAPIResponse verifyVehicleResponse = vehicleService.verifyVehicle(vehicleDetails, request);
+    if (verifyVehicleResponse != null && verifyVehicleResponse.getStatus() == 200) {
+      return ResponseEntity.status(HttpStatus.OK).body(verifyVehicleResponse);
     }
-    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(checkVehicleResponse);
+    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(verifyVehicleResponse);
   }
 
   /**

services/identity/src/main/java/com/crapi/service/Impl/UserRegistrationServiceImpl.java

@@ -80,7 +80,7 @@ public CRAPIResponse registerUser(SignUpForm signUpRequest) {
       return new CRAPIResponse(
           UserMessage.NUMBER_ALREADY_REGISTERED + signUpRequest.getNumber(), 403);
     }
-    // check Number in database
+    // Check Email in database
     if (userRepository.existsByEmail(signUpRequest.getEmail())) {
       return new CRAPIResponse(
           UserMessage.EMAIL_ALREADY_REGISTERED + signUpRequest.getEmail(), 403);
@@ -107,7 +107,7 @@ public CRAPIResponse registerUser(SignUpForm signUpRequest) {
       if (vehicleDetails != null) {
         smtpMailServer.sendMail(
             user.getEmail(),
-            MailBody.signupMailBody(
+            MailBody.newVehicleMailBody(
                 vehicleDetails,
                 (userDetails != null && userDetails.getName() != null
                     ? userDetails.getName()

services/identity/src/main/java/com/crapi/service/Impl/VehicleServiceImpl.java

@@ -107,6 +107,35 @@ public VehicleDetails createVehicle() {
         500);
   }
 
+  /**
+   * @param request
+   * @return CRAPIResponse after creating a new vehicle and assigning it to the current user
+   */
+  @Transactional
+  @Override
+  public CRAPIResponse createVehicle(HttpServletRequest request) {
+    User user = null;
+    UserDetails userDetails = null;
+    VehicleDetails vehicleDetails = null;
+
+    user = userService.getUserFromToken(request);
+    if (user == null) {
+      return new CRAPIResponse(UserMessage.TOKEN_VERIFICATION_MISSING, 401);
+    }
+    userDetails = userDetailsRepository.findByUser_id(user.getId());
+    vehicleDetails = createVehicle();
+    if (vehicleDetails != null) {
+      smtpMailServer.sendMail(
+          user.getEmail(),
+          MailBody.newVehicleMailBody(
+              vehicleDetails,
+              (userDetails != null && userDetails.getName() != null ? userDetails.getName() : "")),
+          "Your New Vehicle In crAPI");
+      return new CRAPIResponse(UserMessage.VEHICLE_DETAILS_SENT_TO_EMAIL, 200);
+    }
+    return new CRAPIResponse(UserMessage.INTERNAL_SERVER_ERROR, 500);
+  }
+
   /**
    * @param request
    * @return list of vehicle of user
@@ -176,7 +205,7 @@ public VehicleLocationResponse getVehicleLocation(UUID carId) {
    */
   @Transactional
   @Override
-  public CRAPIResponse checkVehicle(VehicleForm vehicleForm, HttpServletRequest request) {
+  public CRAPIResponse verifyVehicle(VehicleForm vehicleForm, HttpServletRequest request) {
     VehicleDetails checkVehicle = null;
     User user = null;
     checkVehicle = vehicleDetailsRepository.findByVin(vehicleForm.getVin());
@@ -219,7 +248,7 @@ public CRAPIResponse sendVehicleDetails(HttpServletRequest request) {
     }
     smtpMailServer.sendMail(
         user.getEmail(),
-        MailBody.signupMailBody(
+        MailBody.newVehicleMailBody(
             vehicleDetails,
             (userDetails != null && userDetails.getName() != null ? userDetails.getName() : "")),
         "Welcome to crAPI");

services/identity/src/main/java/com/crapi/service/VehicleService.java

@@ -28,11 +28,13 @@ public interface VehicleService {
 
   VehicleDetails createVehicle();
 
+  CRAPIResponse createVehicle(HttpServletRequest request);
+
   List<VehicleDetails> getVehicleDetails(HttpServletRequest request);
 
   VehicleLocationResponse getVehicleLocation(UUID carId);
 
-  CRAPIResponse checkVehicle(VehicleForm vehicleDetails, HttpServletRequest request);
+  CRAPIResponse verifyVehicle(VehicleForm vehicleDetails, HttpServletRequest request);
 
   CRAPIResponse sendVehicleDetails(HttpServletRequest request);
 }

services/identity/src/main/java/com/crapi/utils/MailBody.java

@@ -50,13 +50,13 @@ public static String otpMailBody(Otp otp) {
    * @param name
    * @return Mail body for user Signup
    */
-  public static String signupMailBody(VehicleDetails vehicleDetails, String name) {
+  public static String newVehicleMailBody(VehicleDetails vehicleDetails, String name) {
     String msgBody =
         "<html><body>"
             + "<font face='calibri' style = 'font-size:15px; color:#000;'>Hi "
             + name
             + "<font>,"
-            + "<br><font face='calibri'><p style = 'font-size:15px; color:#000;'>We are glad to have you on-board. Your newly purchased vehiche details are provided below. Please add it on your crAPI dashboard.</p>"
+            + "<br><font face='calibri'><p style = 'font-size:15px; color:#000;'>We are glad to have you on-board with a new vehicle. Your newly purchased vehicle details are provided below. Please add it on your crAPI dashboard.</p>"
             + "<p><font face='calibri' style = 'font-size:15px;color:#000;'>Your vehicle information is <b>VIN: </font><font face='calibri' font color='#0000ff'>"
             + vehicleDetails.getVin()
             + "</font></b> and <b>Pincode: <font face='calibri' font color='#0000ff'>"