Skip to content
This repository was archived by the owner on Dec 2, 2022. It is now read-only.

Commit 22706ec

Browse files
janaipakosjanaipakos
authored
Merge pull request #34 from jackelder/response-inconsistencies
API response consistency
2 parents e2cce74 + 43dea9d commit 22706ec

File tree

2 files changed

+104
-94
lines changed

2 files changed

+104
-94
lines changed

‎data.json‎

Lines changed: 33 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,9 +1125,7 @@
11251125
"films": [
11261126
"https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6"
11271127
],
1128-
"url": [
1129-
"https://ghibliapi.herokuapp.com/locations/11014596-71b0-4b3e-b8c0-1c4b15f28b9a"
1130-
]
1128+
"url": "https://ghibliapi.herokuapp.com/locations/11014596-71b0-4b3e-b8c0-1c4b15f28b9a"
11311129
},
11321130
{
11331131
"id": "64a996aa-481e-4627-9624-ab23f59a05a9",
@@ -1142,9 +1140,7 @@
11421140
"films": [
11431141
"https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6"
11441142
],
1145-
"url": [
1146-
"https://ghibliapi.herokuapp.com/locations/64a996aa-481e-4627-9624-ab23f59a05a9"
1147-
]
1143+
"url": "https://ghibliapi.herokuapp.com/locations/64a996aa-481e-4627-9624-ab23f59a05a9"
11481144
},
11491145
{
11501146
"id": "a8bd9c03-7c80-4a97-b7c0-6a668acaf576",
@@ -1162,9 +1158,7 @@
11621158
"films": [
11631159
"https://ghibliapi.herokuapp.com/films/90b72513-afd4-4570-84de-a56c312fdf81"
11641160
],
1165-
"url": [
1166-
"https://ghibliapi.herokuapp.com/locations/a8bd9c03-7c80-4a97-b7c0-6a668acaf576"
1167-
]
1161+
"url": "https://ghibliapi.herokuapp.com/locations/a8bd9c03-7c80-4a97-b7c0-6a668acaf576"
11681162
},
11691163
{
11701164
"id": "56e423c4-d9a1-44c4-8bdb-1cab45fbf63e",
@@ -1176,9 +1170,7 @@
11761170
"films": [
11771171
"https://ghibliapi.herokuapp.com/films/5fdfb320-2a02-49a7-94ff-5ca418cae602"
11781172
],
1179-
"url": [
1180-
"https://ghibliapi.herokuapp.com/locations/56e423c4-d9a1-44c4-8bdb-1cab45fbf63e"
1181-
]
1173+
"url": "https://ghibliapi.herokuapp.com/locations/56e423c4-d9a1-44c4-8bdb-1cab45fbf63e"
11821174
},
11831175
{
11841176
"id": "660c8c91-bd92-43db-b475-b2df6ca96fec",
@@ -1192,9 +1184,7 @@
11921184
"films": [
11931185
"https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49"
11941186
],
1195-
"url": [
1196-
"https://ghibliapi.herokuapp.com/locations/660c8c91-bd92-43db-b475-b2df6ca96fec"
1197-
]
1187+
"url": "https://ghibliapi.herokuapp.com/locations/660c8c91-bd92-43db-b475-b2df6ca96fec"
11981188
},
11991189
{
12001190
"id": "6ba60a86-7c74-4ec4-a6f4-7112b5705a2f",
@@ -1208,9 +1198,7 @@
12081198
"films": [
12091199
"https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe"
12101200
],
1211-
"url": [
1212-
"https://ghibliapi.herokuapp.com/locations/6ba60a86-7c74-4ec4-a6f4-7112b5705a2f"
1213-
]
1201+
"url": "https://ghibliapi.herokuapp.com/locations/6ba60a86-7c74-4ec4-a6f4-7112b5705a2f"
12141202
},
12151203
{
12161204
"id": "fb083a4e-77b2-4623-a2e0-6bbca5bfd5b2",
@@ -1224,9 +1212,7 @@
12241212
"films": [
12251213
"https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e"
12261214
],
1227-
"url": [
1228-
"https://ghibliapi.herokuapp.com/locations/fb083a4e-77b2-4623-a2e0-6bbca5bfd5b2"
1229-
]
1215+
"url": "https://ghibliapi.herokuapp.com/locations/fb083a4e-77b2-4623-a2e0-6bbca5bfd5b2"
12301216
},
12311217
{
12321218
"id": "a072ec53-0467-4fac-864f-df234f9c4315",
@@ -1240,9 +1226,7 @@
12401226
"films": [
12411227
"https://ghibliapi.herokuapp.com/films/dc2e6bd1-8156-4886-adff-b39e6043af0c"
12421228
],
1243-
"url": [
1244-
"https://ghibliapi.herokuapp.com/locations/a072ec53-0467-4fac-864f-df234f9c4315"
1245-
]
1229+
"url": "https://ghibliapi.herokuapp.com/locations/a072ec53-0467-4fac-864f-df234f9c4315"
12461230
},
12471231
{
12481232
"id": "682df5c3-b09e-46af-94d1-ae0d17f9b4b6",
@@ -1257,9 +1241,7 @@
12571241
"https://ghibliapi.herokuapp.com/films/45204234-adfd-45cb-a505-a8e7a676b114",
12581242
"https://ghibliapi.herokuapp.com/films/578ae244-7750-4d9f-867b-f3cd3d6fecf4"
12591243
],
1260-
"url": [
1261-
"https://ghibliapi.herokuapp.com/locations/682df5c3-b09e-46af-94d1-ae0d17f9b4b6"
1262-
]
1244+
"url": "https://ghibliapi.herokuapp.com/locations/682df5c3-b09e-46af-94d1-ae0d17f9b4b6"
12631245
},
12641246
{
12651247
"id": "26361a2c-32c6-4bd5-ae9c-8e40e17ae28d",
@@ -1273,9 +1255,7 @@
12731255
"films": [
12741256
"https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe"
12751257
],
1276-
"url": [
1277-
"https://ghibliapi.herokuapp.com/locations/26361a2c-32c6-4bd5-ae9c-8e40e17ae28d"
1278-
]
1258+
"url": "https://ghibliapi.herokuapp.com/locations/26361a2c-32c6-4bd5-ae9c-8e40e17ae28d"
12791259
},
12801260
{
12811261
"id": "42f787d8-1fcb-4d3d-82f2-a74409869368",
@@ -1289,9 +1269,7 @@
12891269
"films": [
12901270
"https://ghibliapi.herokuapp.com/films/ff24da26-a969-4f0e-ba1e-a122ead6c6e3"
12911271
],
1292-
"url": [
1293-
"https://ghibliapi.herokuapp.com/locations/42f787d8-1fcb-4d3d-82f2-a74409869368"
1294-
]
1272+
"url": "https://ghibliapi.herokuapp.com/locations/42f787d8-1fcb-4d3d-82f2-a74409869368"
12951273
},
12961274
{
12971275
"id": "0fafa7a3-64c1-43fe-881b-ecb605c01e09",
@@ -1305,9 +1283,7 @@
13051283
"films": [
13061284
"https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe"
13071285
],
1308-
"url": [
1309-
"https://ghibliapi.herokuapp.com/locations/0fafa7a3-64c1-43fe-881b-ecb605c01e09"
1310-
]
1286+
"url": "https://ghibliapi.herokuapp.com/locations/0fafa7a3-64c1-43fe-881b-ecb605c01e09"
13111287
},
13121288
{
13131289
"id": "0132f7f6-fd52-4ac3-b5df-c96b609f77b6",
@@ -1321,9 +1297,7 @@
13211297
"films": [
13221298
"https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe"
13231299
],
1324-
"url": [
1325-
"https://ghibliapi.herokuapp.com/locations/0132f7f6-fd52-4ac3-b5df-c96b609f77b6"
1326-
]
1300+
"url": "https://ghibliapi.herokuapp.com/locations/0132f7f6-fd52-4ac3-b5df-c96b609f77b6"
13271301
},
13281302
{
13291303
"id": "c57fb2cb-ea85-4d73-8808-cf5dcd28c22e",
@@ -1337,9 +1311,7 @@
13371311
"films": [
13381312
"https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e"
13391313
],
1340-
"url": [
1341-
"https://ghibliapi.herokuapp.com/locations/c57fb2cb-ea85-4d73-8808-cf5dcd28c22e"
1342-
]
1314+
"url": "https://ghibliapi.herokuapp.com/locations/c57fb2cb-ea85-4d73-8808-cf5dcd28c22e"
13431315
},
13441316
{
13451317
"id": "615aa48d-8673-4117-b35a-79cb67af1897",
@@ -1353,9 +1325,7 @@
13531325
"films": [
13541326
"https://ghibliapi.herokuapp.com/films/0440483e-ca0e-4120-8c50-4c8cd9b965d6"
13551327
],
1356-
"url": [
1357-
"https://ghibliapi.herokuapp.com/locations/615aa48d-8673-4117-b35a-79cb67af1897"
1358-
]
1328+
"url": "https://ghibliapi.herokuapp.com/locations/615aa48d-8673-4117-b35a-79cb67af1897"
13591329
},
13601330
{
13611331
"id": "37d13a96-a03a-451d-8871-80be0495486e",
@@ -1369,9 +1339,7 @@
13691339
"films": [
13701340
"https://ghibliapi.herokuapp.com/films/dc2e6bd1-8156-4886-adff-b39e6043af0c"
13711341
],
1372-
"url": [
1373-
"https://ghibliapi.herokuapp.com/locations/37d13a96-a03a-451d-8871-80be0495486e"
1374-
]
1342+
"url": "https://ghibliapi.herokuapp.com/locations/37d13a96-a03a-451d-8871-80be0495486e"
13751343
},
13761344
{
13771345
"id": "6fc21b76-78fb-4451-98f7-857e32a23e85",
@@ -1385,9 +1353,7 @@
13851353
"films": [
13861354
"https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49"
13871355
],
1388-
"url": [
1389-
"https://ghibliapi.herokuapp.com/locations/6fc21b76-78fb-4451-98f7-857e32a23e85"
1390-
]
1356+
"url": "https://ghibliapi.herokuapp.com/locations/6fc21b76-78fb-4451-98f7-857e32a23e85"
13911357
},
13921358
{
13931359
"id": "dbeeaecb-7817-4b8b-90ca-edc432d3033e",
@@ -1401,9 +1367,7 @@
14011367
"films": [
14021368
"https://ghibliapi.herokuapp.com/films/4e236f34-b981-41c3-8c65-f8c9000b94e7"
14031369
],
1404-
"url": [
1405-
"https://ghibliapi.herokuapp.com/locations/dbeeaecb-7817-4b8b-90ca-edc432d3033e"
1406-
]
1370+
"url": "https://ghibliapi.herokuapp.com/locations/dbeeaecb-7817-4b8b-90ca-edc432d3033e"
14071371
},
14081372
{
14091373
"id": "34df8f25-8f80-4823-8f01-bf9852039987",
@@ -1417,9 +1381,7 @@
14171381
"films": [
14181382
"https://ghibliapi.herokuapp.com/films/ebbb6b7c-945c-41ee-a792-de0e43191bd8"
14191383
],
1420-
"url": [
1421-
"https://ghibliapi.herokuapp.com/locations/34df8f25-8f80-4823-8f01-bf9852039987"
1422-
]
1384+
"url": "https://ghibliapi.herokuapp.com/locations/34df8f25-8f80-4823-8f01-bf9852039987"
14231385
},
14241386
{
14251387
"id": "62346d33-caa0-4c17-8016-0aca56f3066b",
@@ -1433,9 +1395,7 @@
14331395
"films": [
14341396
"https://ghibliapi.herokuapp.com/films/ea660b10-85c4-4ae3-8a5f-41cea3648e3e"
14351397
],
1436-
"url": [
1437-
"https://ghibliapi.herokuapp.com/locations/62346d33-caa0-4c17-8016-0aca56f3066b"
1438-
]
1398+
"url": "https://ghibliapi.herokuapp.com/locations/62346d33-caa0-4c17-8016-0aca56f3066b"
14391399
},
14401400
{
14411401
"id": "ee897b2a-405e-42b9-bff4-8b51b0f03cab",
@@ -1449,9 +1409,7 @@
14491409
"films": [
14501410
"https://ghibliapi.herokuapp.com/films/58611129-2dbc-4a81-a72f-77ddfc1b1b49"
14511411
],
1452-
"url": [
1453-
"https://ghibliapi.herokuapp.com/locations/ee897b2a-405e-42b9-bff4-8b51b0f03cab"
1454-
]
1412+
"url": "https://ghibliapi.herokuapp.com/locations/ee897b2a-405e-42b9-bff4-8b51b0f03cab"
14551413
},
14561414
{
14571415
"id": "90241c46-d4be-411f-b00a-7561b9dda7b6",
@@ -1465,9 +1423,7 @@
14651423
"films": [
14661424
"https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786"
14671425
],
1468-
"url": [
1469-
"https://ghibliapi.herokuapp.com/locations/90241c46-d4be-411f-b00a-7561b9dda7b6"
1470-
]
1426+
"url": "https://ghibliapi.herokuapp.com/locations/90241c46-d4be-411f-b00a-7561b9dda7b6"
14711427
},
14721428
{
14731429
"id": "469b14bd-5565-4436-bbed-c2036f42cc99",
@@ -1481,9 +1437,7 @@
14811437
"films": [
14821438
"https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786"
14831439
],
1484-
"url": [
1485-
"https://ghibliapi.herokuapp.com/locations/469b14bd-5565-4436-bbed-c2036f42cc99"
1486-
]
1440+
"url": "https://ghibliapi.herokuapp.com/locations/469b14bd-5565-4436-bbed-c2036f42cc99"
14871441
},
14881442
{
14891443
"id": "b6bac992-a858-4d57-8477-9652d73caaa1",
@@ -1497,9 +1451,7 @@
14971451
"films": [
14981452
"https://ghibliapi.herokuapp.com/films/cd3d059c-09f4-4ff3-8d63-bc765a5184fa"
14991453
],
1500-
"url": [
1501-
"https://ghibliapi.herokuapp.com/locations/b6bac992-a858-4d57-8477-9652d73caaa1"
1502-
]
1454+
"url": "https://ghibliapi.herokuapp.com/locations/b6bac992-a858-4d57-8477-9652d73caaa1"
15031455
}
15041456
],
15051457
"species": [
@@ -1642,7 +1594,9 @@
16421594
"vehicle_class": "Airship",
16431595
"length": "1,000",
16441596
"pilot": "https://ghibliapi.herokuapp.com/people/40c005ce-3725-4f15-8409-3e1b1b14b583",
1645-
"films": "https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe",
1597+
"films": [
1598+
"https://ghibliapi.herokuapp.com/films/2baf70d1-42bb-4437-b551-e5fed5a87abe"
1599+
],
16461600
"url": "https://ghibliapi.herokuapp.com/vehicles/4e09b023-f650-4747-9ab9-eacf14540cfb"
16471601
},
16481602
{
@@ -1652,7 +1606,9 @@
16521606
"vehicle_class": "Airplane",
16531607
"length": "20",
16541608
"pilot": "https://ghibliapi.herokuapp.com/people/6523068d-f5a9-4150-bf5b-76abe6fb42c3",
1655-
"films": "https://ghibliapi.herokuapp.com/films/ebbb6b7c-945c-41ee-a792-de0e43191bd8",
1609+
"films": [
1610+
"https://ghibliapi.herokuapp.com/films/ebbb6b7c-945c-41ee-a792-de0e43191bd8"
1611+
],
16561612
"url": "https://ghibliapi.herokuapp.com/vehicles/d8f893b5-1dd9-41a1-9918-0099c1aa2de8"
16571613
},
16581614
{
@@ -1662,7 +1618,9 @@
16621618
"vehicle_class": "Boat",
16631619
"length": "10",
16641620
"pilot": "https://ghibliapi.herokuapp.com/people/a10f64f3-e0b6-4a94-bf30-87ad8bc51607",
1665-
"films": "https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786",
1621+
"films": [
1622+
"https://ghibliapi.herokuapp.com/films/758bf02e-3122-46e0-884e-67cf83df1786"
1623+
],
16661624
"url": "https://ghibliapi.herokuapp.com/vehicles/923d70c9-8f15-4972-ad53-0128b261d628"
16671625
}
16681626
]

0 commit comments

Comments
 (0)