Updated tests and README.md

Author: osandadeshan

README.md

@@ -55,10 +55,10 @@ src/
 │   │                   │   └── TestCategory.java
 │   │                   ├── AuthTest.java                 # Authentication tests
 │   │                   ├── BaseTest.java                 # Base test class setup
-│   │                   ├── CreateUserTest.java           # API test for creating a user
-│   │                   ├── DeleteUserTest.java           # API test for deleting a user
-│   │                   ├── GetAllUsersTest.java          # API test for fetching all users
-│   │                   └── UpdateUserTest.java           # API test for updating a user
+│   │                   ├── CreateBookingTest.java        # API test for creating a booking
+│   │                   ├── DeleteBookingTest.java        # API test for deleting a booking
+│   │                   ├── GetAllBookingsTest.java       # API test for fetching all bookings
+│   │                   └── UpdateBookingTest.java        # API test for updating a booking
 │   └── resources/
 │       └── env/                                          # Environment configurations
 │           ├── dev.properties
@@ -75,6 +75,11 @@ pom.xml                                                   # Maven configuration
 README.md                                                 # Repository overview and instructions (This file)
 ```
 
+## ⚠️ Important: Steps to update the APIs
+* Go to `com.restassured.example.util.RestClient`
+* **Uncomment line 131** to enable your actual API functionality.
+* Remove the **"TODO: "** comment, as it is no longer relevant
+
 ## How to run tests
 1. Using IntelliJ IDEA
     * Go to Maven Profiles

pom.xml

@@ -17,7 +17,7 @@
         <rest.assured.version>5.5.0</rest.assured.version>
         <testng.version>7.10.2</testng.version>
         <mockneat.version>0.4.8</mockneat.version>
-        <json.version>20240303</json.version>
+        <jackson-databind>2.17.2</jackson-databind>
         <extent.report.version>5.1.2</extent.report.version>
         <log4j.api.version>2.24.0</log4j.api.version>
         <log4j.core.version>2.24.0</log4j.core.version>
@@ -164,9 +164,9 @@
             <version>${mockneat.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>${json.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-databind}</version>
         </dependency>
         <dependency>
             <groupId>com.aventstack</groupId>

src/main/java/com/restassured/example/constant/ApplicationConstant.java

@@ -4,14 +4,13 @@
 
 public class ApplicationConstant {
     // Base URLs
-    public static final String AUTH_SERVICE_BASE_URL = getEnvironmentConfig("auth_service_base_url");
-    public static final String GO_REST_SERVICE_BASE_URL = getEnvironmentConfig("go_rest_service_base_url");
+    public static final String RESTFUL_BOOKER_BASE_URL = getEnvironmentConfig("restful_booker_base_url");
 
     // API Endpoints
     public static final String AUTH_SERVICE_ENDPOINT = "/auth";
-    public static final String USER_SERVICE_ENDPOINT = "/public-api/users";
+    public static final String BOOKING_SERVICE_ENDPOINT = "/booking";
 
     // Headers
-    public static final String AUTH_HEADER_NAME = "Authorization";
-    public static final String AUTH_TOKEN_PREFIX = "Bearer ";
+    public static final String AUTH_HEADER_NAME = "Cookie";
+    public static final String AUTH_TOKEN_PREFIX = "token=";
 }

src/main/java/com/restassured/example/constant/AuthenticationConstant.java

@@ -3,6 +3,6 @@
 import static com.restassured.example.util.FileReader.getEnvironmentConfig;
 
 public class AuthenticationConstant {
-    public static final String EMAIL = getEnvironmentConfig("email_address");
+    public static final String USERNAME = getEnvironmentConfig("username");
     public static final String PASSWORD = getEnvironmentConfig("password");
 }

src/main/java/com/restassured/example/constant/ReporterConstant.java

@@ -3,18 +3,26 @@
 import com.restassured.example.util.FileReader;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class ReporterConstant {
     public static final String FILE_SEPARATOR = File.separator;
     public static final String PROJECT_DIRECTORY = System.getProperty("user.dir");
-    public static final String TEST_REPORTER_PROPERTY_FILE_DIRECTORY = PROJECT_DIRECTORY + FILE_SEPARATOR
-            + "src" + FILE_SEPARATOR + "main" + FILE_SEPARATOR + "resources" + FILE_SEPARATOR
-            + "test-reporter.properties";
-    public static final String EXTENT_FULL_REPORT_DIRECTORY = FileReader.getTestReporterProperty("extent_full_report_dir");
-    public static final String EXTENT_REPORT_FILE_NAME_PREFIX = FileReader.getTestReporterProperty("extent_report_file_name_prefix");
-    public static final String EXTENT_REPORT_THEME = FileReader.getTestReporterProperty("extent_reporter_theme");
-    public static final String EXTENT_REPORT_DOCUMENT_TITLE = FileReader.getTestReporterProperty("extent_document_title");
-    public static final String EXTENT_REPORT_REPORTER_NAME = FileReader.getTestReporterProperty("extent_reporter_name");
-    public static final String APPLICATION_NAME = FileReader.getTestReporterProperty("application_name");
-    public static final String TEST_DEVELOPER = FileReader.getTestReporterProperty("test_developer");
+    public static final Path TEST_REPORTER_PROPERTY_FILE_DIRECTORY
+            = Paths.get(PROJECT_DIRECTORY, "src", "main", "resources", "test-reporter.properties");
+    public static final String EXTENT_FULL_REPORT_DIRECTORY
+            = FileReader.getTestReporterProperty("extent_full_report_dir");
+    public static final String EXTENT_REPORT_FILE_NAME_PREFIX
+            = FileReader.getTestReporterProperty("extent_report_file_name_prefix");
+    public static final String EXTENT_REPORT_THEME
+            = FileReader.getTestReporterProperty("extent_reporter_theme");
+    public static final String EXTENT_REPORT_DOCUMENT_TITLE
+            = FileReader.getTestReporterProperty("extent_document_title");
+    public static final String EXTENT_REPORT_REPORTER_NAME
+            = FileReader.getTestReporterProperty("extent_reporter_name");
+    public static final String APPLICATION_NAME
+            = FileReader.getTestReporterProperty("application_name");
+    public static final String TEST_DEVELOPER
+            = FileReader.getTestReporterProperty("test_developer");
 }

src/main/java/com/restassured/example/model/AuthenticationRequest.java

@@ -0,0 +1,11 @@
+package com.restassured.example.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AuthenticationRequest {
+    private String username;
+    private String password;
+}

src/main/java/com/restassured/example/model/BookingDates.java

@@ -0,0 +1,16 @@
+package com.restassured.example.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BookingDates {
+
+    @JsonProperty("checkin")
+    private String checkIn;
+
+    @JsonProperty("checkout")
+    private String checkOut;
+}

src/main/java/com/restassured/example/model/BookingRequest.java

@@ -0,0 +1,27 @@
+package com.restassured.example.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BookingRequest {
+    @JsonProperty("firstname")
+    private String firstName;
+
+    @JsonProperty("lastname")
+    private String lastName;
+
+    @JsonProperty("totalprice")
+    private int totalPrice;
+
+    @JsonProperty("depositpaid")
+    private boolean depositPaid;
+
+    @JsonProperty("bookingdates")
+    private BookingDates bookingDates;
+
+    @JsonProperty("additionalneeds")
+    private String additionalNeeds;
+}

src/main/java/com/restassured/example/service/app/AuthenticationService.java

@@ -1,23 +1,33 @@
 package com.restassured.example.service.app;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.restassured.example.model.AuthenticationRequest;
 import com.restassured.example.util.RestClient;
-import org.json.JSONObject;
 
 import java.util.Collections;
 import java.util.Map;
 
 import static com.restassured.example.HttpMethod.POST;
 import static com.restassured.example.constant.ApplicationConstant.*;
-import static com.restassured.example.constant.AuthenticationConstant.EMAIL;
 import static com.restassured.example.constant.AuthenticationConstant.PASSWORD;
+import static com.restassured.example.constant.AuthenticationConstant.USERNAME;
 
 public class AuthenticationService {
     public static Map<String, String> getAuthenticationHeaders() {
-        JSONObject authRequestJson = new JSONObject();
-        authRequestJson.put("email", EMAIL);
-        authRequestJson.put("password", PASSWORD);
+        AuthenticationRequest authenticationRequest = new AuthenticationRequest();
+        authenticationRequest.setUsername(USERNAME);
+        authenticationRequest.setPassword(PASSWORD);
 
-        String token = new RestClient(AUTH_SERVICE_BASE_URL, AUTH_SERVICE_ENDPOINT, authRequestJson.toString())
+        ObjectMapper objectMapper = new ObjectMapper();
+        String authRequestJson;
+        try {
+            authRequestJson = objectMapper.writeValueAsString(authenticationRequest);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        String token = new RestClient(RESTFUL_BOOKER_BASE_URL, AUTH_SERVICE_ENDPOINT, authRequestJson)
                 .sendRequest(POST)
                 .extract()
                 .body()

src/main/java/com/restassured/example/service/app/UserService.java renamed to src/main/java/com/restassured/example/service/app/BookingService.java

@@ -3,20 +3,20 @@
 import com.restassured.example.util.RestClient;
 
 import static com.restassured.example.HttpMethod.GET;
-import static com.restassured.example.constant.ApplicationConstant.GO_REST_SERVICE_BASE_URL;
-import static com.restassured.example.constant.ApplicationConstant.USER_SERVICE_ENDPOINT;
+import static com.restassured.example.constant.ApplicationConstant.BOOKING_SERVICE_ENDPOINT;
+import static com.restassured.example.constant.ApplicationConstant.RESTFUL_BOOKER_BASE_URL;
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.http.HttpStatus.SC_OK;
 
-public class UserService {
-    public static String getUserIdFromUserDb() {
-        return new RestClient(GO_REST_SERVICE_BASE_URL, USER_SERVICE_ENDPOINT, EMPTY)
+public class BookingService {
+    public static String getBookingIdFromBookingDb() {
+        return new RestClient(RESTFUL_BOOKER_BASE_URL, BOOKING_SERVICE_ENDPOINT, EMPTY)
                 .sendRequest(GET)
                 .statusCode(SC_OK)
                 .extract()
                 .body()
                 .jsonPath()
-                .get("data[0].id")
+                .get("[0].bookingid")
                 .toString();
     }
 }