Skip to content

Commit

Permalink
removed extra quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
@RCAVelez
RCAVelez committed Aug 6, 2020
1 parent 5c8a82e commit ebd0c03
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 46 deletions.
45 changes: 22 additions & 23 deletions backend/src/main/java/com/google/sps/TripCrud.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,23 @@ private static void setProperties(Entity tripEntity, String tripData) {
JsonElement jsonElement = parser.parse(tripData);
JsonObject jsonObject = jsonElement.getAsJsonObject();
tripEntity.setProperty("isOptimized", jsonObject.get("isOptimized").getAsBoolean());
tripEntity.setProperty("searchText", jsonObject.get("searchText").toString());
tripEntity.setProperty("tripName", jsonObject.get("tripName").toString());
tripEntity.setProperty("centerLocation", jsonObject.get("centerLocation").toString());
tripEntity.setProperty("searchText", jsonObject.get("searchText").getAsString());
tripEntity.setProperty("tripName", jsonObject.get("tripName").getAsString());

Integer centerLat = jsonObject.get("centerLat").getAsInt();
Integer centerLng = jsonObject.get("centerLng").getAsInt();
tripEntity.setProperty("centerLng", centerLng);
tripEntity.setProperty("centerLat", centerLat);

ArrayList<EmbeddedEntity> attractions = new ArrayList<EmbeddedEntity>();
for (JsonElement attractionElement : jsonObject.getAsJsonArray("attractions")) {
JsonObject attraction = attractionElement.getAsJsonObject();
EmbeddedEntity embeddedAttraction = new EmbeddedEntity();
embeddedAttraction.setProperty("name", attraction.get("name").toString());
embeddedAttraction.setProperty("photoUrl", attraction.get("photoUrl").toString());
embeddedAttraction.setProperty("name", attraction.get("name").getAsString());
embeddedAttraction.setProperty("photoUrl", attraction.get("photoUrl").getAsString());
embeddedAttraction.setProperty("routeIndex", attraction.get("routeIndex").getAsInt());
embeddedAttraction.setProperty("lat", attraction.get("lat").toString());
embeddedAttraction.setProperty("lng", attraction.get("lng").toString());
embeddedAttraction.setProperty("lat", attraction.get("lat").getAsString());
embeddedAttraction.setProperty("lng", attraction.get("lng").getAsString());
attractions.add(embeddedAttraction);
}
tripEntity.setProperty("attractions", attractions);
Expand Down Expand Up @@ -112,29 +117,23 @@ public static Entity readTrip(Long tripId) {
public static JsonObject toJson(Entity tripEntity) {
JsonObject jsonTrip = new JsonObject();
jsonTrip.addProperty("tripId", Long.toString(tripEntity.getKey().getId()));
jsonTrip.addProperty(
"isOptimized", Boolean.parseBoolean(tripEntity.getProperty("isOptimized").toString()));
jsonTrip.addProperty("searchText", tripEntity.getProperty("searchText").toString());
jsonTrip.addProperty("tripName", tripEntity.getProperty("tripName").toString());
JsonParser parser = new JsonParser();
JsonObject centerLocation =
(JsonObject) parser.parse(tripEntity.getProperty("centerLocation").toString());
jsonTrip.addProperty("isOptimized", (Boolean) tripEntity.getProperty("isOptimized"));
jsonTrip.addProperty("searchText", (String) tripEntity.getProperty("searchText"));
jsonTrip.addProperty("tripName", (String) tripEntity.getProperty("tripName"));

jsonTrip.addProperty("centerLng", centerLocation.get("lng").getAsInt());
jsonTrip.addProperty("centerLat", centerLocation.get("lat").getAsInt());
jsonTrip.addProperty("centerLng", (Long) tripEntity.getProperty("centerLng"));
jsonTrip.addProperty("centerLat", (Long) tripEntity.getProperty("centerLat"));
JsonArray attractions = new JsonArray();
for (EmbeddedEntity attraction :
(ArrayList<EmbeddedEntity>) tripEntity.getProperty("attractions")) {
JsonObject attractionJson = new JsonObject();
attractionJson.addProperty("name", attraction.getProperty("name").toString());
attractionJson.addProperty("photoUrl", attraction.getProperty("photoUrl").toString());
attractionJson.addProperty(
"routeIndex", Integer.parseInt(attraction.getProperty("routeIndex").toString()));
attractionJson.addProperty("lat", attraction.getProperty("lat").toString());
attractionJson.addProperty("lng", attraction.getProperty("lng").toString());
attractionJson.addProperty("name", (String) attraction.getProperty("name"));
attractionJson.addProperty("photoUrl", (String) attraction.getProperty("photoUrl"));
attractionJson.addProperty("routeIndex", (Long) attraction.getProperty("routeIndex"));
attractionJson.addProperty("lat", (String) attraction.getProperty("lat"));
attractionJson.addProperty("lng", (String) attraction.getProperty("lng"));
attractions.add(attractionJson);
}
// String attractionsStr = attractions.toString();
jsonTrip.add("attractions", attractions);
return jsonTrip;
}
Expand Down
44 changes: 21 additions & 23 deletions backend/src/test/java/com/google/sps/TripCrudTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.util.ArrayList;
import org.junit.After;
import org.junit.Before;
Expand All @@ -37,9 +36,9 @@ public class TripCrudTest {
private static final LocalServiceTestHelper DATASTORE_SERVICE_HELPER =
new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
private static final String TRIP_DATA =
"{\"isOptimized\":true,\"searchText\":\"Milano\",\"tripName\":\"My Milan Trip\",\"centerLocation\":{\"lat\":0,\"lng\":0},\"attractions\":[{\"name\":\"Milano Giuseppe\",\"photoUrl\":\"2234f23f23r133fqfqef\",\"routeIndex\":0,\"lat\":1,\"lng\":1}]}";
"{\"isOptimized\":true,\"searchText\":\"Milano\",\"tripName\":\"My Milan Trip\",\"centerLng\":0,\"centerLat\":0,\"attractions\":[{\"name\":\"Milano Giuseppe\",\"photoUrl\":\"2234f23f23r133fqfqef\",\"routeIndex\":0,\"lat\":1,\"lng\":1}]}";
private static final String TRIP_DATA_2 =
"{\"isOptimized\":true,\"searchText\":\"Milano\",\"tripName\":\"My Awesome Milan Trip\",\"centerLocation\":{\"lat\":0,\"lng\":0},\"attractions\":[{\"name\":\"Milano Giuseppe\",\"photoUrl\":\"2234f23f23r133fqfqef\",\"routeIndex\":0,\"lat\":1,\"lng\":1}]}";
"{\"isOptimized\":true,\"searchText\":\"Milano\",\"tripName\":\"My Awesome Milan Trip\",\"centerLng\":0,\"centerLat\":0,\"attractions\":[{\"name\":\"Milano Giuseppe\",\"photoUrl\":\"2234f23f23r133fqfqef\",\"routeIndex\":0,\"lat\":1,\"lng\":1}]}";
private static final String BAD_TRIP_DATA = "{\"isOptimized\":true,\"searchText\":\"Milano\"}";

private static final String EMAIL = "[email protected]";
Expand Down Expand Up @@ -77,14 +76,14 @@ public void readTrip_noTripFound() {
public void toEntity_returnsTripEntityFromJsonMatchingTripName() {
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);

assertEquals("\"My Milan Trip\"", (String) tripEntityConverted.getProperty("tripName"));
assertEquals("My Milan Trip", (String) tripEntityConverted.getProperty("tripName"));
}

@Test
public void toEntity_returnsTripEntityFromJsonMatchingSearchText() {
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);

assertEquals("\"Milano\"", (String) tripEntityConverted.getProperty("searchText"));
assertEquals("Milano", (String) tripEntityConverted.getProperty("searchText"));
}

@Test
Expand All @@ -95,15 +94,17 @@ public void toEntity_returnsTripEntityFromJsonMatchingIsOptimized() {
}

@Test
public void toEntity_returnsTripEntityFromJsonMatchingCenterLocation() {
public void toEntity_returnsTripEntityFromJsonMatchingCenterLat() {
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);
JsonObject centerLocation = new JsonObject();
centerLocation.addProperty("lat", 0);
centerLocation.addProperty("lng", 0);
JsonParser parser = new JsonParser();
JsonObject readLocation =
(JsonObject) parser.parse(tripEntityConverted.getProperty("centerLocation").toString());
assertEquals(centerLocation, readLocation);

assertEquals(0, tripEntityConverted.getProperty("centerLat"));
}

@Test
public void toEntity_returnsTripEntityFromJsonMatchingCenterLng() {
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);

assertEquals(0, tripEntityConverted.getProperty("centerLng"));
}

@Test
Expand All @@ -112,7 +113,7 @@ public void toEntity_returnsTripEntityFromJsonMatchingAttractionName() {
EmbeddedEntity readAttraction =
(EmbeddedEntity) ((ArrayList) tripEntityConverted.getProperty("attractions")).get(0);

assertEquals("\"Milano Giuseppe\"", readAttraction.getProperty("name"));
assertEquals("Milano Giuseppe", readAttraction.getProperty("name"));
}

@Test
Expand All @@ -121,7 +122,7 @@ public void toEntity_returnsTripEntityFromJsonMatchingAttractionPhotoUrl() {
EmbeddedEntity readAttraction =
(EmbeddedEntity) ((ArrayList) tripEntityConverted.getProperty("attractions")).get(0);

assertEquals("\"2234f23f23r133fqfqef\"", readAttraction.getProperty("photoUrl"));
assertEquals("2234f23f23r133fqfqef", readAttraction.getProperty("photoUrl"));
}

@Test
Expand Down Expand Up @@ -157,7 +158,7 @@ public void toJson_returnsTripJsonFromEntityMatchingSearchText() {
Entity tripEntity = TripCrud.createTrip(EMAIL, TRIP_DATA);
JsonObject tripDataJson = TripCrud.toJson(tripEntity);

assertEquals("\"Milano\"", tripDataJson.get("searchText").getAsString());
assertEquals("Milano", tripDataJson.get("searchText").getAsString());
}

@Test
Expand All @@ -166,7 +167,7 @@ public void toJson_returnsTripJsonFromEntityMatchingTripName() {
Entity tripEntity = TripCrud.createTrip(EMAIL, TRIP_DATA);
JsonObject tripDataJson = TripCrud.toJson(tripEntity);

assertEquals("\"My Milan Trip\"", tripDataJson.get("tripName").getAsString());
assertEquals("My Milan Trip", tripDataJson.get("tripName").getAsString());
}

@Test
Expand Down Expand Up @@ -194,15 +195,13 @@ public void toJson_returnsTripJsonFromEntityMatchingCenterLng() {
assertEquals(0, tripDataJson.get("centerLng").getAsInt());
}

// AttractionName , AttractionPhotoUrl, AttractionRouteIndex, AttractionLat,AttractionLng
@Test
public void toJson_returnsTripJsonFromEntityMatchingAttractionName() {
Entity userEntity = UserCrud.createUser(EMAIL);
Entity tripEntity = TripCrud.createTrip(EMAIL, TRIP_DATA);
JsonObject tripDataJson = TripCrud.toJson(tripEntity);
JsonArray attractions = (JsonArray) tripDataJson.get("attractions");
assertEquals(
"\"\\\"Milano Giuseppe\\\"\"", ((JsonObject) attractions.get(0)).get("name").toString());
assertEquals("Milano Giuseppe", ((JsonObject) attractions.get(0)).get("name").getAsString());
}

@Test
Expand All @@ -212,8 +211,7 @@ public void toJson_returnsTripJsonFromEntityMatchingAttractionPhotoUrl() {
JsonObject tripDataJson = TripCrud.toJson(tripEntity);
JsonArray attractions = (JsonArray) tripDataJson.get("attractions");
assertEquals(
"\"\\\"2234f23f23r133fqfqef\\\"\"",
((JsonObject) attractions.get(0)).get("photoUrl").toString());
"2234f23f23r133fqfqef", ((JsonObject) attractions.get(0)).get("photoUrl").getAsString());
}

@Test
Expand Down Expand Up @@ -250,7 +248,7 @@ public void updateTrip_returnsUpdatedTripNameForUpdatedEntity() {
TripCrud.updateTrip(tripEntity.getKey().getId(), TRIP_DATA_2);
Entity tripFound = TripCrud.readTrip(tripEntity.getKey().getId());

assertEquals("\"My Awesome Milan Trip\"", (String) tripFound.getProperty("tripName"));
assertEquals("My Awesome Milan Trip", (String) tripFound.getProperty("tripName"));
}

@Test
Expand Down

0 comments on commit ebd0c03

Please sign in to comment.