+1 -1

requirements/base.txt

reviewed

··· 5 5 django-extensions==1.6.7 6 6 logutils==0.3.3 7 7 django-model-utils==2.5 8 8 - djangorestframework==3.5.1 8 8 + djangorestframework==3.6.3 9 9 djangorestframework-gis==0.10.1 10 10 sphinx==1.4.1 11 11 sphinx-rtd-theme==0.1.9

+2 -1

upvcarshare/config/router.py

reviewed

··· 8 8 join_journey, leave_journey, recommended_journeys, cancel_journey, journey_messages, MessageResource, \ 9 9 confirm_journey, reject_journey, recurrence_journeys 10 10 from notifications.api.v1.resources import NotificationResource 11 11 - from users.api.v1.resources import me 11 11 + from users.api.v1.resources import me, UserResource 12 12 13 13 router = SimpleRouter() 14 14 15 15 + router.register(r'users', viewset=UserResource) 15 16 router.register(r'transports', viewset=TransportResource) 16 17 router.register(r'residences', viewset=ResidenceResource) 17 18 router.register(r'campus', viewset=CampusResource)

+13 -9

upvcarshare/journeys/api/v1/serializers.py

reviewed

··· 9 9 from journeys.models import Transport, Place, Residence, Campus, Journey, Message 10 10 from notifications import MESSAGE 11 11 from notifications.decorators import dispatch 12 12 - from notifications.helpers import dispatch_message 13 12 from users.api.v1.serializers import UserSerializer 14 13 15 14 ··· 49 48 model = Campus 50 49 51 50 52 52 - class JourneySerializer(serializers.ModelSerializer): 53 53 - 54 54 - user = UserSerializer() 55 55 - residence = ResidenceSerializer() 56 56 - campus = CampusSerializer() 57 57 - driver = UserSerializer() 51 51 + class JourneySerializer(serializers.HyperlinkedModelSerializer): 58 52 59 53 title = serializers.CharField(source="get_title", read_only=True) 60 54 start = serializers.CharField(source="get_start", read_only=True) ··· 64 58 65 59 class Meta: 66 60 model = Journey 67 67 - fields = ["id", "user", "title", "driver", "residence", "campus", "kind", "free_places", "departure", 68 68 - "arrival", "start", "end", "disabled", "current_free_places"] 61 61 + fields = [ 62 62 + "id", 63 63 + "title", 64 64 + "kind", 65 65 + "free_places", 66 66 + "departure", 67 67 + "arrival", 68 68 + "start", 69 69 + "end", 70 70 + "disabled", 71 71 + "current_free_places", 72 72 + ] 69 73 70 74 71 75 class MessageSerializer(serializers.ModelSerializer):

+2 -2

upvcarshare/journeys/tests/test_api.py

reviewed

··· 107 107 response = self.client.get(url) 108 108 self.assertEqual(response.status_code, status.HTTP_200_OK) 109 109 response_data = json.loads(response.content.decode('utf-8')) 110 110 - self.assertIsNotNone(response_data["residence"]) 111 111 - self.assertIsNotNone(response_data["campus"]) 110 110 + self.assertIsNotNone(response_data["id"]) 111 111 + self.assertIsNotNone(response_data["title"]) 112 112 113 113 def test_join_journey(self): 114 114 user = UserFactory()