Skip to content

Commit ebd0c03

Browse files
RCAVelezRCAVelez
committed
removed extra quotes
1 parent 5c8a82e commit ebd0c03

File tree

2 files changed

+43
-46
lines changed

2 files changed

+43
-46
lines changed

‎backend/src/main/java/com/google/sps/TripCrud.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,23 @@ private static void setProperties(Entity tripEntity, String tripData) {
6969
JsonElement jsonElement = parser.parse(tripData);
7070
JsonObject jsonObject = jsonElement.getAsJsonObject();
7171
tripEntity.setProperty("isOptimized", jsonObject.get("isOptimized").getAsBoolean());
72-
tripEntity.setProperty("searchText", jsonObject.get("searchText").toString());
73-
tripEntity.setProperty("tripName", jsonObject.get("tripName").toString());
74-
tripEntity.setProperty("centerLocation", jsonObject.get("centerLocation").toString());
72+
tripEntity.setProperty("searchText", jsonObject.get("searchText").getAsString());
73+
tripEntity.setProperty("tripName", jsonObject.get("tripName").getAsString());
74+
75+
Integer centerLat = jsonObject.get("centerLat").getAsInt();
76+
Integer centerLng = jsonObject.get("centerLng").getAsInt();
77+
tripEntity.setProperty("centerLng", centerLng);
78+
tripEntity.setProperty("centerLat", centerLat);
79+
7580
ArrayList<EmbeddedEntity> attractions = new ArrayList<EmbeddedEntity>();
7681
for (JsonElement attractionElement : jsonObject.getAsJsonArray("attractions")) {
7782
JsonObject attraction = attractionElement.getAsJsonObject();
7883
EmbeddedEntity embeddedAttraction = new EmbeddedEntity();
79-
embeddedAttraction.setProperty("name", attraction.get("name").toString());
80-
embeddedAttraction.setProperty("photoUrl", attraction.get("photoUrl").toString());
84+
embeddedAttraction.setProperty("name", attraction.get("name").getAsString());
85+
embeddedAttraction.setProperty("photoUrl", attraction.get("photoUrl").getAsString());
8186
embeddedAttraction.setProperty("routeIndex", attraction.get("routeIndex").getAsInt());
82-
embeddedAttraction.setProperty("lat", attraction.get("lat").toString());
83-
embeddedAttraction.setProperty("lng", attraction.get("lng").toString());
87+
embeddedAttraction.setProperty("lat", attraction.get("lat").getAsString());
88+
embeddedAttraction.setProperty("lng", attraction.get("lng").getAsString());
8489
attractions.add(embeddedAttraction);
8590
}
8691
tripEntity.setProperty("attractions", attractions);
@@ -112,29 +117,23 @@ public static Entity readTrip(Long tripId) {
112117
public static JsonObject toJson(Entity tripEntity) {
113118
JsonObject jsonTrip = new JsonObject();
114119
jsonTrip.addProperty("tripId", Long.toString(tripEntity.getKey().getId()));
115-
jsonTrip.addProperty(
116-
"isOptimized", Boolean.parseBoolean(tripEntity.getProperty("isOptimized").toString()));
117-
jsonTrip.addProperty("searchText", tripEntity.getProperty("searchText").toString());
118-
jsonTrip.addProperty("tripName", tripEntity.getProperty("tripName").toString());
119-
JsonParser parser = new JsonParser();
120-
JsonObject centerLocation =
121-
(JsonObject) parser.parse(tripEntity.getProperty("centerLocation").toString());
120+
jsonTrip.addProperty("isOptimized", (Boolean) tripEntity.getProperty("isOptimized"));
121+
jsonTrip.addProperty("searchText", (String) tripEntity.getProperty("searchText"));
122+
jsonTrip.addProperty("tripName", (String) tripEntity.getProperty("tripName"));
122123

123-
jsonTrip.addProperty("centerLng", centerLocation.get("lng").getAsInt());
124-
jsonTrip.addProperty("centerLat", centerLocation.get("lat").getAsInt());
124+
jsonTrip.addProperty("centerLng", (Long) tripEntity.getProperty("centerLng"));
125+
jsonTrip.addProperty("centerLat", (Long) tripEntity.getProperty("centerLat"));
125126
JsonArray attractions = new JsonArray();
126127
for (EmbeddedEntity attraction :
127128
(ArrayList<EmbeddedEntity>) tripEntity.getProperty("attractions")) {
128129
JsonObject attractionJson = new JsonObject();
129-
attractionJson.addProperty("name", attraction.getProperty("name").toString());
130-
attractionJson.addProperty("photoUrl", attraction.getProperty("photoUrl").toString());
131-
attractionJson.addProperty(
132-
"routeIndex", Integer.parseInt(attraction.getProperty("routeIndex").toString()));
133-
attractionJson.addProperty("lat", attraction.getProperty("lat").toString());
134-
attractionJson.addProperty("lng", attraction.getProperty("lng").toString());
130+
attractionJson.addProperty("name", (String) attraction.getProperty("name"));
131+
attractionJson.addProperty("photoUrl", (String) attraction.getProperty("photoUrl"));
132+
attractionJson.addProperty("routeIndex", (Long) attraction.getProperty("routeIndex"));
133+
attractionJson.addProperty("lat", (String) attraction.getProperty("lat"));
134+
attractionJson.addProperty("lng", (String) attraction.getProperty("lng"));
135135
attractions.add(attractionJson);
136136
}
137-
// String attractionsStr = attractions.toString();
138137
jsonTrip.add("attractions", attractions);
139138
return jsonTrip;
140139
}

‎backend/src/test/java/com/google/sps/TripCrudTest.java‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
2525
import com.google.gson.JsonArray;
2626
import com.google.gson.JsonObject;
27-
import com.google.gson.JsonParser;
2827
import java.util.ArrayList;
2928
import org.junit.After;
3029
import org.junit.Before;
@@ -37,9 +36,9 @@ public class TripCrudTest {
3736
private static final LocalServiceTestHelper DATASTORE_SERVICE_HELPER =
3837
new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
3938
private static final String TRIP_DATA =
40-
"{\"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}]}";
39+
"{\"isOptimized\":true,\"searchText\":\"Milano\",\"tripName\":\"My Milan Trip\",\"centerLng\":0,\"centerLat\":0,\"attractions\":[{\"name\":\"Milano Giuseppe\",\"photoUrl\":\"2234f23f23r133fqfqef\",\"routeIndex\":0,\"lat\":1,\"lng\":1}]}";
4140
private static final String TRIP_DATA_2 =
42-
"{\"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}]}";
41+
"{\"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}]}";
4342
private static final String BAD_TRIP_DATA = "{\"isOptimized\":true,\"searchText\":\"Milano\"}";
4443

4544
private static final String EMAIL = "testEMAIL@gmail.com";
@@ -77,14 +76,14 @@ public void readTrip_noTripFound() {
7776
public void toEntity_returnsTripEntityFromJsonMatchingTripName() {
7877
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);
7978

80-
assertEquals("\"My Milan Trip\"", (String) tripEntityConverted.getProperty("tripName"));
79+
assertEquals("My Milan Trip", (String) tripEntityConverted.getProperty("tripName"));
8180
}
8281

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

87-
assertEquals("\"Milano\"", (String) tripEntityConverted.getProperty("searchText"));
86+
assertEquals("Milano", (String) tripEntityConverted.getProperty("searchText"));
8887
}
8988

9089
@Test
@@ -95,15 +94,17 @@ public void toEntity_returnsTripEntityFromJsonMatchingIsOptimized() {
9594
}
9695

9796
@Test
98-
public void toEntity_returnsTripEntityFromJsonMatchingCenterLocation() {
97+
public void toEntity_returnsTripEntityFromJsonMatchingCenterLat() {
9998
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);
100-
JsonObject centerLocation = new JsonObject();
101-
centerLocation.addProperty("lat", 0);
102-
centerLocation.addProperty("lng", 0);
103-
JsonParser parser = new JsonParser();
104-
JsonObject readLocation =
105-
(JsonObject) parser.parse(tripEntityConverted.getProperty("centerLocation").toString());
106-
assertEquals(centerLocation, readLocation);
99+
100+
assertEquals(0, tripEntityConverted.getProperty("centerLat"));
101+
}
102+
103+
@Test
104+
public void toEntity_returnsTripEntityFromJsonMatchingCenterLng() {
105+
Entity tripEntityConverted = TripCrud.toEntity(TRIP_DATA, null, null);
106+
107+
assertEquals(0, tripEntityConverted.getProperty("centerLng"));
107108
}
108109

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

115-
assertEquals("\"Milano Giuseppe\"", readAttraction.getProperty("name"));
116+
assertEquals("Milano Giuseppe", readAttraction.getProperty("name"));
116117
}
117118

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

124-
assertEquals("\"2234f23f23r133fqfqef\"", readAttraction.getProperty("photoUrl"));
125+
assertEquals("2234f23f23r133fqfqef", readAttraction.getProperty("photoUrl"));
125126
}
126127

127128
@Test
@@ -157,7 +158,7 @@ public void toJson_returnsTripJsonFromEntityMatchingSearchText() {
157158
Entity tripEntity = TripCrud.createTrip(EMAIL, TRIP_DATA);
158159
JsonObject tripDataJson = TripCrud.toJson(tripEntity);
159160

160-
assertEquals("\"Milano\"", tripDataJson.get("searchText").getAsString());
161+
assertEquals("Milano", tripDataJson.get("searchText").getAsString());
161162
}
162163

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

169-
assertEquals("\"My Milan Trip\"", tripDataJson.get("tripName").getAsString());
170+
assertEquals("My Milan Trip", tripDataJson.get("tripName").getAsString());
170171
}
171172

172173
@Test
@@ -194,15 +195,13 @@ public void toJson_returnsTripJsonFromEntityMatchingCenterLng() {
194195
assertEquals(0, tripDataJson.get("centerLng").getAsInt());
195196
}
196197

197-
// AttractionName , AttractionPhotoUrl, AttractionRouteIndex, AttractionLat,AttractionLng
198198
@Test
199199
public void toJson_returnsTripJsonFromEntityMatchingAttractionName() {
200200
Entity userEntity = UserCrud.createUser(EMAIL);
201201
Entity tripEntity = TripCrud.createTrip(EMAIL, TRIP_DATA);
202202
JsonObject tripDataJson = TripCrud.toJson(tripEntity);
203203
JsonArray attractions = (JsonArray) tripDataJson.get("attractions");
204-
assertEquals(
205-
"\"\\\"Milano Giuseppe\\\"\"", ((JsonObject) attractions.get(0)).get("name").toString());
204+
assertEquals("Milano Giuseppe", ((JsonObject) attractions.get(0)).get("name").getAsString());
206205
}
207206

208207
@Test
@@ -212,8 +211,7 @@ public void toJson_returnsTripJsonFromEntityMatchingAttractionPhotoUrl() {
212211
JsonObject tripDataJson = TripCrud.toJson(tripEntity);
213212
JsonArray attractions = (JsonArray) tripDataJson.get("attractions");
214213
assertEquals(
215-
"\"\\\"2234f23f23r133fqfqef\\\"\"",
216-
((JsonObject) attractions.get(0)).get("photoUrl").toString());
214+
"2234f23f23r133fqfqef", ((JsonObject) attractions.get(0)).get("photoUrl").getAsString());
217215
}
218216

219217
@Test
@@ -250,7 +248,7 @@ public void updateTrip_returnsUpdatedTripNameForUpdatedEntity() {
250248
TripCrud.updateTrip(tripEntity.getKey().getId(), TRIP_DATA_2);
251249
Entity tripFound = TripCrud.readTrip(tripEntity.getKey().getId());
252250

253-
assertEquals("\"My Awesome Milan Trip\"", (String) tripFound.getProperty("tripName"));
251+
assertEquals("My Awesome Milan Trip", (String) tripFound.getProperty("tripName"));
254252
}
255253

256254
@Test

0 commit comments

Comments
 (0)