show message from rider in email to driver on ride request

Author: kielni

app/carpool/views.py

@@ -342,7 +342,7 @@ def new_rider(carpool_uuid):
         flash(
             "Your ride request has been sent to the driver for approval.",
             'success')
-        _email_driver_ride_requested(carpool, current_user)
+        _email_driver_ride_requested(carpool, rr, current_user)
 
         return redirect(url_for('carpool.details', uuid=carpool.uuid))
 
@@ -521,21 +521,22 @@ def _email_carpool_cancelled(carpool, reason, notify_driver):
         )
 
 
-def _email_driver(carpool, current_user, subject, template_name_specifier):
+def _email_driver(carpool, current_user, subject, template_name_specifier, ride_request=None):
     send_email(
         template_name_specifier,
         carpool.driver.email,
         subject,
         rider=current_user,
         carpool=carpool,
+        ride_request=ride_request,
     )
 
 
-def _email_driver_ride_requested(carpool, current_user):
+def _email_driver_ride_requested(carpool, ride_request, current_user):
     subject = '{} requested a ride in carpool on {}'.format(
         current_user.name, carpool.leave_time)
 
-    _email_driver(carpool, current_user, subject, 'ride_requested')
+    _email_driver(carpool, current_user, subject, 'ride_requested', ride_request)
 
 
 def _email_ride_status(request, subject_beginning, template_name_specifier):

app/templates/email/ride_requested.html

@@ -3,7 +3,11 @@
 {% block content %}
 <p>Hi {{ carpool.driver.name }},</p>
 
-<p>You have a new ride request! {{ rider.name }} ({{ rider.gender_string() }}) has requested a ride in your carpool from {{ carpool.from_place }} to {{ carpool.destination.name }} at {{ carpool.leave_time | humanize }}.</p>
+<p>You have a new ride request! {{ rider.name }} ({{ rider.gender_string() }}) has requested a ride in your carpool from {{ carpool.from_place }} to {{ carpool.destination.name }} at {{ carpool.leave_time | humanize }}.
+{% if ride_request.notes %}
+  <br>Message from {{rider.name}}: {{ride_request.notes}}
+{% endif %}
+</p>
 
 <p>Please <a href="{{url_for('carpool.details', uuid=carpool.uuid, _external=True)}}"> click here</a> and approve or deny this request.</p>
 
@@ -12,7 +16,7 @@
 <p>You'll receive a reminder email containing all of your passengers' contact information two days before your departure date.</p>
 
 <p>Thanks!</p>
-  
+
 <p>{{ config.get('BRANDING_EMAIL_SIGNATURE') }}</p>
 
 <p>SAFETY TIPS</p>

app/templates/email/ride_requested.txt

@@ -1,6 +1,10 @@
 Hi {{ carpool.driver.name }},
 
 You have a new ride request! {{ rider.name }} ({{ rider.gender_string() }}) has requested a ride in your carpool from {{ carpool.from_place }} to {{ carpool.destination.name }} at {{ carpool.leave_time | humanize }}.
+{% if ride_request.notes %}
+  Message from {{rider.name}}: {{ride_request.notes}}
+{% endif %}
+
 
 Please go to {{url_for('carpool.details', uuid=carpool.uuid, _external=True)}} and approve or deny this request.
 

tests/factories.py

@@ -65,6 +65,7 @@ class RideRequestFactory(BaseFactory):
     """Ride Request factory."""
     person = SubFactory(PersonFactory)
     carpool = SubFactory(CarpoolFactory)
+    notes = None
 
     class Meta:
         """Factory configuration."""

tests/test_email_templates.py

@@ -8,31 +8,41 @@ class TestEmailTemplates:
     def test_ride_requested(self, db):
         rider = PersonFactory(email='[email protected]', phone_number='')
         carpool = CarpoolFactory(from_place='from')
+        notes = 'Can we stop for coffee?'
+        ride_request = RideRequestFactory(person=rider, carpool=carpool, notes=notes)
         db.session.add(rider)
         db.session.add(carpool)
+        db.session.add(ride_request)
         db.session.commit()
         rendered = render_template(
             'email/ride_requested.html',
             carpool=carpool,
             rider=rider,
+            ride_request=ride_request,
         )
         assert 'requested a ride in your carpool from from to dest' in rendered
         assert 'can be contacted at [email protected].' in rendered
+        assert notes in rendered
 
 
-    def test_ride_requested(self, db):
+    def test_ride_requested_phone(self, db):
         rider = PersonFactory(email='[email protected]', phone_number='1231231234')
         carpool = CarpoolFactory(from_place='from')
+        ride_request = RideRequestFactory(person=rider, carpool=carpool)
         db.session.add(rider)
         db.session.add(carpool)
+        db.session.add(ride_request)
         db.session.commit()
         rendered = render_template(
             'email/ride_requested.html',
             carpool=carpool,
             rider=rider,
+            ride_request=ride_request,
+
         )
         assert 'requested a ride in your carpool from from to dest' in rendered
         assert 'can be contacted at [email protected] or 1231231234' in rendered
+        assert 'Message from ' not in rendered
 
     def test_ride_approved(self, db):
         rider = PersonFactory()
@@ -87,6 +97,8 @@ def test_email_signature(self, db):
         db.session.add(carpool)
         destination = DestinationFactory()
         db.session.add(destination)
+        ride_request = RideRequestFactory(person=rider, carpool=carpool)
+        db.session.add(ride_request)
         db.session.commit()
         for ext in ['html', 'txt']:
             for template in templates:
@@ -100,6 +112,7 @@ def test_email_signature(self, db):
                     driver=driver,
                     person=rider,
                     destination=destination,
+                    ride_request=ride_request,
                 )
                 assert config['BRANDING_EMAIL_SIGNATURE'] in rendered, \
                     '%s missing signature' % template_path