done with yelp client for today

FultonBrowne · Sep 29, 2019 · 0feb08a · 0feb08a
1 parent 5db185e
commit 0feb08a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/.idea/artifacts/Ara_Server_jar.xml b/.idea/artifacts/Ara_Server_jar.xml
diff --git a/bin/jar/Ara-Server.jar b/bin/jar/Ara-Server.jar
diff --git a/src/main/java/com/andromeda/araserver/apiStart.java b/src/main/java/com/andromeda/araserver/apiStart.java
@@ -76,13 +76,14 @@ private String ParseApi(String search) {
         for (SqlModel sqlModel : sqlmodel) {
             System.out.println(sqlModel.description);
             System.out.println(search.startsWith(sqlModel.description));
+
             assert term != null;
             if (term.startsWith(sqlModel.description)) {
-                linkval = sqlModel.link + search.replace(sqlModel.description, "");
+                linkval = sqlModel.link +"/"+ search.replace(sqlModel.description, "");
                 break;
             }
             if (term.endsWith(sqlModel.title) && !sqlModel.title.equals("")) {
-                linkval = sqlModel.link + search.replace(sqlModel.title, "");
+                linkval = sqlModel.link  + "/"+ search.replace(sqlModel.title, "");
 
                 break;
             }

diff --git a/src/main/java/com/andromeda/araserver/locdec.java b/src/main/java/com/andromeda/araserver/locdec.java
@@ -1,7 +1,6 @@
 package com.andromeda.araserver;
 
 import com.google.gson.*;
-import jdk.internal.org.jline.keymap.BindingReader;
 import okhttp3.*;
 
 import java.io.IOException;
@@ -13,6 +12,7 @@
 public class locdec {
     String log;
     String lat;
+    String term;
     Gson gson = new Gson();
 
     String main(String search) {
@@ -24,50 +24,55 @@ String main(String search) {
                 log = pair.replace("log=", "");
             } else if (pair.startsWith("lat")) {
                 lat = pair.replace("lat=", "");
-            } else search = pair;
+            } else term = pair.replace("/yelpclient/", "");
         }
-        yelpSearch();
         //place holder text for testing
         ArrayList<OutputModel> mainout = new ArrayList<>();
         mainout.add(new OutputModel(search, "this is a test", "", "", "", ""));
         mainout.add(new OutputModel(log, lat, "", "", "", ""));
         //return new gson value
-        return new Gson().toJson(mainout);
+        return new Gson().toJson(yelpSearch());
     }
     ArrayList<OutputModel> yelpSearch(){
         ArrayList<OutputModel> returedval = new ArrayList<>();
-        // POST https://api.yelp.com/oauth2/token
-
-
-
-        // GET /businesses/search
         OkHttpClient client2 = new OkHttpClient();
-
-
-        String term = "taco";                       // term
-        String location = "Irivine, CA";            // location
-        String price = "1";                         // price        1 = $, 2 = $$, 3 = $$$, 4 = $$$$
-
-
+        System.out.println("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude="+ log +"&limit=25&sort_by=rating");
         Request request2 = new Request.Builder()
-                .url("https://api.yelp.com/v3/businesses/search?term=" + term + "&location=" + location + "&limit=1&sort_by=rating&price="+price+"")
+                .url("https://api.yelp.com/v3/businesses/search?term=" + term + "&latitude=" + lat + "&longitude="+ log +"&limit=25&sort_by=rating")
                 .get()
-                .addHeader("Authorization", "Bearer fghjk")
+                .addHeader("Authorization", "Bearer cflXv51tAXEtctkOgrdD3CIUculH7ieskJc6fKTguo4XXYx")
                 .addHeader("cache-control", "no-cache")
 
                 .build();
 
         try {
             Response response2 = client2.newCall(request2).execute();
-            System.out.println(response2.body().string());
+           // System.out.println(response2.body().string());
+            JsonElement jelement = new JsonParser().parse(response2.body().string());
+            JsonObject  jobject = jelement.getAsJsonObject();
+            System.out.println(jobject);
+           JsonArray jsonArray = jobject.getAsJsonArray("businesses");
+           System.out.println(jsonArray.size());
+           OutputModel outputModel;
+            for (int i = 0; i < jsonArray.size(); i++) {
+                jobject = jsonArray.get(i).getAsJsonObject();
+                System.out.println(jobject.get("name").getAsString());
+                jobject.get("name").getAsString();
+                outputModel = new OutputModel(jobject.get("name").getAsString(), jobject.get("display_phone").getAsString(),jobject.get("url").getAsString(),"","", "" );
+                returedval.add(outputModel);
+
+            }
+
+
+
 
            // JSONObject jsonObject = new JSONObject(response2.body().string().trim());       // parser
             //JSONArray myResponse = (JSONArray)jsonObject.get("businesses");
            // System.out.println(myResponse.getJSONObject(0).getString("id"));
 
 
         } catch (IOException e) {
-            // TODO Auto-generated catch block
+
             e.printStackTrace();
         }