pushing place details to backend

backend/Dockerfile

@@ -11,9 +11,14 @@ EXPOSE 8081
 
 CMD ["java", "-jar", "app.jar"]
 
-# docker stop 3e56942ba023
-
+# set up API as environment variable 
 
+# in fivethree one directiory run: 
 # ./mvnw clean package -DskipTests
+
+# in team-5-3-1 directory run:
 # docker build -t backend-springboot .
-# docker run -d -p 8081:8080 backend-springboot
+# docker run -d -p 8081:8080 backend-springboot
+
+# when done run: 
+# docker stop 3e56942ba023

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

@@ -34,7 +34,10 @@ public List<Restaurant> getPlaces(@RequestParam String location, @RequestParam S
 
 //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 String location, @RequestParam String radius, @RequestParam(defaultValue = "5") int numRestaurants,
+    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 {

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

@@ -12,7 +12,9 @@
 
 import java.util.List;
 import java.util.Collections;
-
+import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Set;
 
 @Service
 public class GooglePlacesService {
@@ -71,14 +73,45 @@ public List<Restaurant> getRandomRestaurants(String location, String radius, Int
 
         if (restaurants.isEmpty()) {
             return Collections.emptyList(); // Return an empty list if no restaurants found
-}
+        }
 
-        if (restaurants.size() > numRestaurants) {
-            return restaurants.subList(0, numRestaurants);
-        } else {
-            return restaurants;
+        Set<String> seen = new HashSet<>();
+        List<Restaurant> unique = new ArrayList<>();
+        for (Restaurant restaurant : restaurants) {
+            if (seen.add(restaurant.getName())) {
+                unique.add(restaurant);
+            }
+            if (unique.size() == numRestaurants) {
+                break;
+            }
         }
 
+        for (Restaurant r : unique) {
+            getDetails(r);
+        }
+
+        return unique;
+
+    }
+
+    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());
     }
+}    
 
 }

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

@@ -28,6 +28,17 @@ public class Restaurant {
     @JsonProperty("icon") 
     private String iconUrl;
 
+    @JsonProperty("place_id")
+    private String id;
+
+    @JsonProperty("editorial_overview")
+    private String overview;
+
+    private String website;
+
+    @JsonProperty("formatted_phone_number")
+    private String phone;
+
     public static class OpeningHours {
         @JsonProperty("open_now")
         private Boolean openNow;
@@ -42,6 +53,8 @@ public void setOpenNow(Boolean openNow) {
     }
 
 
+
+
     public Restaurant(String name, String distance, String address, Integer priceLevel, String cuisine) { //String businessStatus) {
         this.name = name;
         this.distance = distance;
@@ -51,13 +64,13 @@ public Restaurant(String name, String distance, String address, Integer priceLev
 
     }
 
-    public Restaurant(String name, String distance, String address) { //String businessStatus) {
+    public Restaurant(String name, String distance, String address) { 
         this.name = name;
         this.distance = distance;
         this.address = address;
         this.priceLevel = null;
         this.cuisine = null;
-        //this.businessStatus = businessStatus;
+
     }
 
     public Restaurant() {
@@ -71,6 +84,8 @@ public void setName(String name) {
         this.name = name;
     }
 
+
+
     public String getDistance() {
         return distance;
     }
@@ -93,12 +108,6 @@ public void setPriceLevel(Integer priceLevel) {
         this.priceLevel = priceLevel;
     }
 
-    public String getCuisine() {
-        return cuisine;
-    }
-    public void setCuisine(String cuisine) {
-        this.cuisine = cuisine;
-    }
 
     public Double getRating() {
         return rating;
@@ -116,13 +125,6 @@ public void numRatings(Integer numRatings) {
         this.numRatings = numRatings;
     }
 
-    public String getIconUrl() {
-        return iconUrl;
-    }
-
-    public void setIconUrl(String iconUrl) {
-        this.iconUrl = iconUrl;
-    }
 
     public OpeningHours getOpeningHours() {
         return openingHours;
@@ -136,4 +138,22 @@ public void setOpeningHours(OpeningHours openingHours) {
     public Boolean isOpenNow() {
         return this.openingHours != null ? openingHours.getOpenNow() : null;
     }
+
+    public String getID() {
+        return id;
+    }
+
+    public void setID(String id) {
+        this.id = id;
+    } 
+
+    public String getOverview() { return overview; }
+    public void setOverview(String overview) { this.overview = overview; }
+
+    public String getWebsite() { return website; }
+    public void setWebsite(String website) { this.website = website; }
+
+    public String getPhone() { return phone; }
+    public void setPhone(String phone) { this.phone = phone; }
+
 }

backend/fivethreeone/src/test/java/com/cs222/fivethreeone/GooglePlacesControllerTest.java

@@ -74,10 +74,10 @@ public void testGetNearbyRestaurantsSuccess() throws Exception {
                 .andExpect(jsonPath("$").isArray())
                 .andExpect(jsonPath("$[0].name").value("Taco Bell"))
                 .andExpect(jsonPath("$[0].distance").value("500m"))
-                .andExpect(jsonPath("$[0].address").value("321 Green St"))
+                .andExpect(jsonPath("$[0].vicinity").value("321 Green St"))
                 .andExpect(jsonPath("$[1].name").value("Canes"))
                 .andExpect(jsonPath("$[1].distance").value("1200m"))
-                .andExpect(jsonPath("$[1].address").value("658 E Healey St"));
+                .andExpect(jsonPath("$[1].vicinity").value("658 E Healey St"));
     }
 
     @Test
@@ -127,10 +127,10 @@ public void testGetFilteredRestaurants() throws Exception {
             .andExpect(jsonPath("$").isArray())
             .andExpect(jsonPath("$[0].name").value("Taco Bell"))
             .andExpect(jsonPath("$[0].distance").value("500m"))
-            .andExpect(jsonPath("$[0].address").value("321 Green St"))
+            .andExpect(jsonPath("$[0].vicinity").value("321 Green St"))
             .andExpect(jsonPath("$[1].name").value("Canes"))
             .andExpect(jsonPath("$[1].distance").value("1200m"))
-            .andExpect(jsonPath("$[1].address").value("658 E Healey St"));
+            .andExpect(jsonPath("$[1].vicinity").value("658 E Healey St"));
     }
 
 

frontend/.gitignore

@@ -0,0 +1,25 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+.env

frontend/README.md

@@ -0,0 +1,70 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
+
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
+
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
+
+### Analyzing the Bundle Size
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
+
+### Making a Progressive Web App
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
+
+### Advanced Configuration
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
+
+### Deployment
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)