Merge branch 'main' into features/573-ftue-tracking

.github/workflows/deploy-production.yml

@@ -72,39 +72,39 @@ jobs:
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan  # will be re-enabled once release workflow is tested
+          terragrunt apply tfplan
 
       - name: backend-infra
         working-directory: ./tofu/environments/prod/services/backend-infra
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
+          terragrunt apply tfplan
 
       - name: cache
         working-directory: ./tofu/environments/prod/data-store/cache
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
+          terragrunt apply tfplan
 
       - name: database
         working-directory: ./tofu/environments/prod/data-store/database
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
+          terragrunt apply tfplan
           
       - name: frontend-infra
         working-directory: ./tofu/environments/prod/services/frontend-infra
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
+          terragrunt apply tfplan
 
       - name: output-bucket-name
         id: output-bucket-name
@@ -145,9 +145,8 @@ jobs:
           role-session-name: Appointment_GitHub_to_AWS_via_FederatedOIDC
           aws-region: ${{ vars.AWS_REGION }}
 
-# will be re-enabled once release workflow is tested
-#      - name: Deploy frontend to S3
-#        run: aws s3 sync ./frontend/frontend/dist "s3://${{ needs.deploy-prod-iac.outputs.bucket }}"
+      - name: Deploy frontend to S3
+        run: aws s3 sync ./dist "s3://${{ needs.deploy-prod-iac.outputs.bucket }}"
 
       - name: Invalidate Cloudfront cache
         run: aws cloudfront create-invalidation --distribution-id ${{ needs.deploy-prod-iac.outputs.cloudfront_id }} --paths "/*"
@@ -222,7 +221,9 @@ jobs:
           terragrunt init -upgrade
           cd ../../data-store/database
           terragrunt init -upgrade
-          cd ../data-store/cache
+          cd ../../data-store/cache
+          terragrunt init -upgrade
+          cd ../../services/backend-infra
           terragrunt init -upgrade
 
       - name: Deploy Backend
@@ -231,6 +232,4 @@ jobs:
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -var "image=${{ steps.get_ecr_tag.outputs.ecr_tag }}" -out tfplan
-          cat tfplan
-  #        terragrunt apply tfplan # will be re-enabled once release workflow is tested
-
+          terragrunt apply tfplan

backend/src/appointment/controller/calendar.py

@@ -228,13 +228,13 @@ def create_event(
         body = {
             'iCalUID': event.uuid.hex,
             'summary': event.title,
-            'location': event.location.name,
+            'location': event.location.url if event.location.url else None,
             'description': '\n'.join(description),
             'start': {'dateTime': event.start.isoformat()},
             'end': {'dateTime': event.end.isoformat()},
             'attendees': [
-                {'displayName': organizer.name, 'email': organizer_email},
-                {'displayName': attendee.name, 'email': attendee.email},
+                {'displayName': organizer.name, 'email': organizer_email, 'responseStatus': 'accepted'},
+                {'displayName': attendee.name, 'email': attendee.email, 'responseStatus': 'accepted'},
             ],
             'organizer': {
                 'displayName': organizer.name,
@@ -414,13 +414,14 @@ def create_vevent(
             slot.start.replace(tzinfo=timezone.utc) + timedelta(minutes=slot.duration),
         )
         event.add('dtstamp', datetime.now(UTC))
+        event.add('status', 'CONFIRMED')
         event['description'] = appointment.details
         event['organizer'] = org
 
         # Prefer the slot meeting link url over the appointment location url
         location_url = slot.meeting_link_url if slot.meeting_link_url is not None else appointment.location_url
 
-        if location_url != '' or location_url is not None:
+        if location_url:
             event.add('location', location_url)
 
         cal.add_component(event)
@@ -435,10 +436,11 @@ def send_vevent(
         attendee: schemas.AttendeeBase,
     ):
         """send a booking confirmation email to attendee with .ics file attached"""
+        ics = self.create_vevent(appointment, slot, organizer)
         invite = Attachment(
             mime=('text', 'calendar'),
             filename='AppointmentInvite.ics',
-            data=self.create_vevent(appointment, slot, organizer),
+            data=ics,
         )
         background_tasks.add_task(send_invite_email, to=attendee.email, attachment=invite)
 

backend/src/appointment/controller/mailer.py

@@ -173,7 +173,7 @@ def __init__(self, confirm_url, deny_url, attendee_name, attendee_email, date, *
         self.date = date
         self.confirmUrl = confirm_url
         self.denyUrl = deny_url
-        default_kwargs = {'subject': l10n('confirm-mail-subject')}
+        default_kwargs = {'subject': l10n('confirm-mail-subject', {'attendee_name': self.attendee_name})}
         super(ConfirmationMail, self).__init__(*args, **default_kwargs, **kwargs)
 
     def text(self):

backend/src/appointment/l10n/en/email.ftl

@@ -15,7 +15,9 @@ invite-mail-html = {-brand-footer}
 
 ## Confirm Appointment
 
-confirm-mail-subject = Confirm booking request from {-brand-name}
+# Variables
+# $attendee_name (String) - Name of the person who requested the appointment
+confirm-mail-subject = Action Required: Confirm booking request from { $attendee_name }
 # Variables:
 # $attendee_name (String) - Name of the person who requested the appointment
 # $appointment_email (String) - Email of the person who requested the appointment

backend/src/appointment/routes/auth.py

@@ -247,8 +247,8 @@ def token(
     if os.getenv('AUTH_SCHEME') == 'fxa':
         raise HTTPException(status_code=405)
 
-    """Retrieve an access token from a given username and password."""
-    subscriber = repo.subscriber.get_by_username(db, form_data.username)
+    """Retrieve an access token from a given email (=username) and password."""
+    subscriber = repo.subscriber.get_by_email(db, form_data.username)
     if not subscriber or subscriber.password is None:
         raise HTTPException(status_code=403, detail=l10n('invalid-credentials'))
 
@@ -267,11 +267,11 @@ def token(
         db.add(subscriber)
         db.commit()
 
-    # Generate our jwt token, we only store the username on the token
+    # Generate our jwt token, we only store the user id on the token
     access_token_expires = timedelta(minutes=float(os.getenv('JWT_EXPIRE_IN_MINS')))
     access_token = create_access_token(data={'sub': f'uid-{subscriber.id}'}, expires_delta=access_token_expires)
 
-    """Log a user in with the passed username and password information"""
+    """Log a user in with the passed user id and password information"""
     return {'access_token': access_token, 'token_type': 'bearer'}
 
 

backend/src/appointment/routes/schedule.py

@@ -484,15 +484,14 @@ def handle_schedule_availability_decision(
             if os.getenv('SENTRY_DSN') != '':
                 capture_exception(err)
 
-
     event = schemas.Event(
         title=title,
         start=slot.start.replace(tzinfo=timezone.utc),
         end=slot.start.replace(tzinfo=timezone.utc) + timedelta(minutes=slot.duration),
         description=schedule.details or '',
         location=schemas.EventLocation(
-            type=schedule.location_type,
-            url=location_url,
+            type=models.LocationType.online,
+            url=slot.meeting_link_url if slot.meeting_link_url else location_url,
             name=None,
         ),
         uuid=slot.appointment.uuid if slot.appointment else None,

backend/src/appointment/tasks/emails.py

@@ -8,7 +8,8 @@
     ZoomMeetingFailedMail,
     RejectionMail,
     SupportRequestMail,
-    InviteAccountMail, ConfirmYourEmailMail,
+    InviteAccountMail,
+    ConfirmYourEmailMail,
 )
 
 

backend/test/factory/appointment_factory.py

@@ -55,7 +55,7 @@ def _make_appointment(
 
             if not factory_has_value(slots):
                 make_appointment_slot(appointment_id=appointment.id)
-            else:
+            elif slots is not None:
                 repo.slot.add_for_appointment(db, slots, appointment.id)
 
             # Refresh our appointment now that is has slot data

backend/test/integration/test_auth.py

@@ -62,7 +62,7 @@ def test_token(self, with_db, with_client, make_pro_subscriber):
         # Test good credentials
         response = with_client.post(
             '/token',
-            data={'username': subscriber.username, 'password': password},
+            data={'username': subscriber.email, 'password': password},
         )
         assert response.status_code == 200, response.text
         data = response.json()
@@ -72,14 +72,14 @@ def test_token(self, with_db, with_client, make_pro_subscriber):
         # Test bad credentials
         response = with_client.post(
             '/token',
-            data={'username': subscriber.username, 'password': bad_password},
+            data={'username': subscriber.email, 'password': bad_password},
         )
         assert response.status_code == 403, response.text
 
         # Test credentials with non-existent user
         response = with_client.post(
             '/token',
-            data={'username': subscriber.username + '1', 'password': password},
+            data={'username': subscriber.email + '1', 'password': password},
         )
         assert response.status_code == 403, response.text
 

backend/test/unit/test_calendar_tools.py

@@ -56,3 +56,17 @@ def test_events_roll_up_difference(self):
         assert rolled_up_slots[0].booking_status == models.BookingStatus.booked
         assert rolled_up_slots[1].booking_status == models.BookingStatus.requested
         assert rolled_up_slots[2].booking_status == models.BookingStatus.booked
+
+
+class TestVCreate:
+    def test_meeting_url_in_location(self, with_db, make_google_calendar, make_appointment, make_appointment_slot, make_pro_subscriber):
+        subscriber = make_pro_subscriber()
+        calendar = make_google_calendar(subscriber_id=subscriber.id)
+        appointment = make_appointment(calendar_id=calendar.id)
+        slot = appointment.slots[0]
+
+        slot.meeting_link_url = 'https://thunderbird.net'
+
+        ics = Tools().create_vevent(appointment, slot, subscriber)
+        assert ics
+        assert ':'.join(['LOCATION', slot.meeting_link_url])