diff --git a/new-gui/.expo/packager-info.json b/new-gui/.expo/packager-info.json index c04af40..63115da 100755 --- a/new-gui/.expo/packager-info.json +++ b/new-gui/.expo/packager-info.json @@ -1,10 +1,10 @@ { - "expoServerPort": null, - "expoServerNgrokUrl": null, - "packagerNgrokUrl": null, - "ngrokPid": null, + "expoServerPort": 19000, + "expoServerNgrokUrl": "https://as-km5.anonymous.new-gui.exp.direct", + "packagerNgrokUrl": "https://packager.as-km5.anonymous.new-gui.exp.direct", + "ngrokPid": 15688, "devToolsPort": 19002, - "packagerPort": null, - "packagerPid": null, + "packagerPort": 19001, + "packagerPid": 13356, "webpackServerPort": null } \ No newline at end of file diff --git a/new-gui/src/commons/serverRequest/index.js b/new-gui/src/commons/serverRequest/index.js index c1e2222..c60fbfc 100755 --- a/new-gui/src/commons/serverRequest/index.js +++ b/new-gui/src/commons/serverRequest/index.js @@ -1,3 +1,3 @@ -//const HOST = "52.39.77.219"; -const HOST = "174.77.40.238"; +const HOST = "52.39.77.219"; +// const HOST = "192.168.1.8"; export const SERVER_URL = "http://" + HOST + ":8080"; \ No newline at end of file diff --git a/web/balancedbite/src/main/java/edu/uci/ics/balancedbite/web/resources/RecommendationResource.java b/web/balancedbite/src/main/java/edu/uci/ics/balancedbite/web/resources/RecommendationResource.java index 7bca1cf..d27596c 100755 --- a/web/balancedbite/src/main/java/edu/uci/ics/balancedbite/web/resources/RecommendationResource.java +++ b/web/balancedbite/src/main/java/edu/uci/ics/balancedbite/web/resources/RecommendationResource.java @@ -109,6 +109,7 @@ else if(cal_target>cal_need*0.3) List disLikeFoods=currentUserInfo.getDislikeFoods(); List allergies = currentUserInfo.getAllergies(); + List foodEatenToday = currentUserInfo.getFoodsEatenCurrently(); List filterlist=new ArrayList(); @@ -127,6 +128,11 @@ else if(cal_target>cal_need*0.3) for (String allergy: allergies) { filterlist.add(not(regex("ingredients",Pattern.compile("^.*"+ allergy +".*$", Pattern.CASE_INSENSITIVE)))); } + + // filter out all foods that is eaten by the user today + for (String food: foodEatenToday) { + filterlist.add(not(eq("title", food))); + } //System.out.println(and(filterlist).toBsonDocument(BsonDocument.class, com.mongodb.MongoClient.getDefaultCodecRegistry())); AggregateIterable foundFoods = foodCollection.aggregate(