Add React app to frontend

.gitignore

@@ -0,0 +1 @@
+.DS_Store 

backend/Dockerfile

@@ -7,11 +7,13 @@ COPY fivethreeone/.mvn ./.mvn
 
 COPY fivethreeone/target/fivethreeone-0.0.1-SNAPSHOT.jar app.jar
 
-EXPOSE 8080
+EXPOSE 8081
 
 CMD ["java", "-jar", "app.jar"]
 
 # docker stop 3e56942ba023
 
+
 # ./mvnw clean package -DskipTests
-# docker build -t backend-springboot .
+# docker build -t backend-springboot .
+# docker run -d -p 8081:8080 backend-springboot

backend/fivethreeone/.gitignore

@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+
+.DS_Store

backend/fivethreeone/pom.xml

@@ -45,6 +45,26 @@
     		<groupId>com.fasterxml.jackson.core</groupId>
     		<artifactId>jackson-databind</artifactId>
 		</dependency>
+
+		<dependency>
+    		<groupId>org.springframework.boot</groupId>
+    		<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+    		<groupId>org.junit.jupiter</groupId>
+    		<artifactId>junit-jupiter-api</artifactId>
+    		<version>5.9.3</version> <!-- Use the latest version available -->
+    		<scope>test</scope>
+		</dependency>
+		<dependency>
+    		<groupId>org.junit.jupiter</groupId>
+    		<artifactId>junit-jupiter-engine</artifactId>
+    		<version>5.9.3</version> <!-- Use the latest version available -->
+    		<scope>test</scope>
+		</dependency>
+
+
 	</dependencies>
 
 	<build>
@@ -53,6 +73,19 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+    			<groupId>org.jacoco</groupId>
+    			<artifactId>jacoco-maven-plugin</artifactId>
+    			<version>0.8.10</version> <!-- Use the latest version -->
+    			<executions>
+        			<execution>
+            			<goals>
+                			<goal>prepare-agent</goal>
+                			<goal>report</goal>
+            			</goals>
+        			</execution>
+    			</executions>
+			</plugin>
 		</plugins>
 	</build>
 

backend/fivethreeone/src/main/java/com/cs222/fivethreeone/AppConfig.java

@@ -1,12 +1,13 @@
 package com.cs222.fivethreeone;
 import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
 
+@Configuration
 public class AppConfig {
     @Bean
     public RestTemplate restTemplate() {
         return new RestTemplate();
     }
 
-}
+}

backend/fivethreeone/src/main/java/com/cs222/fivethreeone/GooglePlacesController.java

@@ -3,16 +3,63 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.http.HttpStatus;
+
+import java.util.List;
+import java.util.Random;
+
+
 @RestController
+@RequestMapping("/api/restaurants")
 public class GooglePlacesController {
-    private final GooglePlacesService placesService;
+    private final GooglePlacesService googlePlacesService;
 
-    public GooglePlacesController(GooglePlacesService placesService) {
-        this.placesService = placesService;
+    public GooglePlacesController(GooglePlacesService googlePlacesService) {
+        this.googlePlacesService = googlePlacesService;
     }
 
-    @GetMapping("/api/places")
-    public String getPlaces(@RequestParam String location, @RequestParam String radius) {
-        return placesService.getPlaces(location, radius);
+    @GetMapping("/nearby")
+    public List<Restaurant> getPlaces(@RequestParam String location, @RequestParam String radius) throws JsonMappingException, JsonProcessingException {
+        return googlePlacesService.getPlaces(location, radius);
     }
+
+//http://localhost:8081/api/restaurants/random?location=40.10996616819772, -88.23113574620692&radius=1000&numRestaurants=5&priceLevel=2&cuisine=italian
+    @GetMapping("/random")
+    public List<Restaurant> getRandomRestaurants(
+        @RequestParam(defaultValue = "40.1106,-88.2073") String location, // Default to latitude,longitude
+        @RequestParam(defaultValue = "1500") String radius,
+        @RequestParam(defaultValue = "5") int numRestaurants,
+        @RequestParam(required = false) Integer priceLevel,
+        @RequestParam(required = false) String cuisine) 
+        throws JsonMappingException, JsonProcessingException {
+        return googlePlacesService.getRandomRestaurants(location, radius, priceLevel, cuisine, numRestaurants);
+    }
+
+
+    //Receives POST request from client in the form of JSON of the 3 selected restuarants
+    @PostMapping("/select")
+    public Restaurant selectOneRestaurant(@RequestBody List<Restaurant> selectedRestaurants) {
+        if (selectedRestaurants == null || selectedRestaurants.size() < 3) {
+            throw new IllegalArgumentException("At least 3 restaurants must be selected by user");
+        }
+        Random random = new Random();
+        int index = random.nextInt(selectedRestaurants.size());
+        return selectedRestaurants.get(index);
+    }
+
+    // Exception handler for IllegalArgumentException
+    @ExceptionHandler(IllegalArgumentException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public String handleIllegalArgumentException(IllegalArgumentException ex) {
+            return ex.getMessage();
+        }
 }

backend/fivethreeone/src/main/java/com/cs222/fivethreeone/GooglePlacesService.java

@@ -4,22 +4,105 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+import java.util.Collections;
+
+
 @Service
 public class GooglePlacesService {
-    @Value("${google.places.api.key}")
+    @Value("${GOOGLE_API_KEY}") //inject API key
     private String apiKey;
-
     private final RestTemplate restTemplate;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
 
     public GooglePlacesService(RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }
 
-    public String getPlaces(String location, String radius) {
+    public List<Restaurant> getPlaces(String location, String radius) throws JsonMappingException, JsonProcessingException {
         String url = String.format(
             "https://maps.googleapis.com/maps/api/place/nearbysearch/json?location=%s&radius=%s&key=%s",
             location, radius, apiKey);
-        return restTemplate.getForObject(url, String.class);
+        String response = restTemplate.getForObject(url, String.class); //returns raw JSON response
+        JsonNode root = objectMapper.readTree(response);
+        JsonNode results = root.path("results");
+
+        return objectMapper.convertValue(results, new TypeReference<List<Restaurant>>() {});
+    }
+
+    public List<Restaurant> getRandomRestaurants(String location, String radius, Integer priceLevel, String cuisine, int numRestaurants) throws JsonMappingException, JsonProcessingException {
+
+        StringBuilder url = new StringBuilder(
+            String.format("https://maps.googleapis.com/maps/api/place/nearbysearch/json?location=%s&radius=%s&type=restaurant", 
+            location, radius)
+        );
+
+        if (priceLevel != null) {
+            url.append("&minprice=").append(priceLevel);
+            url.append("&maxprice=").append(priceLevel);
+        }
+
+        if (cuisine != null && !cuisine.isEmpty()) {
+            url.append("&keyword=").append(cuisine);
+        }
+
+        url.append("&key=").append(apiKey);
+
+
+
+
+        String response = restTemplate.getForObject(url.toString(), String.class); //returns raw JSON response
+        JsonNode root = objectMapper.readTree(response);
+        JsonNode results = root.path("results");
+
+        System.out.println("Requesting Google Places API: " + url); // Log the API URL
+        System.out.println("results: " + response);
+
+
+        List<Restaurant> restaurants = objectMapper.convertValue(results, new TypeReference<List<Restaurant>>() {});
+        Collections.shuffle(restaurants);
+
+        if (restaurants.isEmpty()) {
+            return Collections.emptyList(); // Return an empty list if no restaurants found
+}
+
+        if (restaurants.size() > numRestaurants) {
+            restaurants = restaurants.subList(0, numRestaurants);
+        } 
+
+        for (Restaurant r : restaurants) {
+            getDetails(r);
+        }
+
+        return restaurants;
+
+    }
+
+    private void getDetails(Restaurant restaurant) throws JsonProcessingException {
+    String detailsUrl = String.format(
+        "https://maps.googleapis.com/maps/api/place/details/json?fields=editorial_summary,website,formatted_phone_number&place_id=%s&key=%s", 
+        restaurant.getID(), apiKey);
+
+    String detailsResponse = restTemplate.getForObject(detailsUrl, String.class);
+    JsonNode detailsRoot = objectMapper.readTree(detailsResponse);
+    JsonNode detailsResult = detailsRoot.path("result");
+
+    if (detailsResult.has("editorial_summary")) {
+        restaurant.setOverview(detailsResult.path("editorial_summary").path("overview").asText());
+    }
+    if (detailsResult.has("website")) {
+        restaurant.setWebsite(detailsResult.path("website").asText());
+    }
+    if (detailsResult.has("formatted_phone_number")) {
+        restaurant.setPhone(detailsResult.path("formatted_phone_number").asText());
     }
+}    
 
 }