The registration system creates separate records for hackathon and session registration, but in order to provide OAuth2 registration information to for instance Meetecho we want just one consolidated record. Changed the handling of notifications from the registration system to aggregate reg_type and ticket_type information in one record.

- Legacy-Id: 18011

ietf/api/tests.py

@@ -210,7 +210,7 @@ class CustomApiTests(TestCase):
                 'last_name': 'Bar',
                 'meeting': meeting.number,
                 'reg_type': 'hackathon',
-                'ticket_type': 'regular',
+                'ticket_type': '',
             }
         url = urlreverse('ietf.api.views.api_new_meeting_registration')
         r = self.client.post(url, reg)
@@ -248,6 +248,18 @@ class CustomApiTests(TestCase):
         #
         # There should be no new outgoing mail
         self.assertEqual(len(outbox), 1)
+        #
+        # Test combination of reg types
+        reg['reg_type'] = 'remote'
+        reg['ticket_type'] = 'full_week_pass'
+        r = self.client.post(url, reg)
+        self.assertContains(r, "Accepted, Updated registration", status_code=202)
+        obj = MeetingRegistration.objects.get(email=reg['email'], meeting__number=reg['meeting'])
+        self.assertIn('hackathon', set(obj.reg_type.split()))
+        self.assertIn('remote', set(obj.reg_type.split()))
+        self.assertIn('full_week_pass', set(obj.ticket_type.split()))
+        self.assertEqual(len(outbox), 1)
+        #
         # Test incomplete POST
         drop_fields = ['affiliation', 'first_name', 'reg_type']
         for field in drop_fields:

ietf/api/views.py

@@ -34,6 +34,7 @@ from ietf.ietfauth.utils import role_required
 from ietf.meeting.models import Meeting
 from ietf.stats.models import MeetingRegistration
 from ietf.utils.decorators import require_api_key
+from ietf.utils.log import log
 
 
 def top_level(request):
@@ -122,7 +123,8 @@ def api_new_meeting_registration(request):
     '''REST API to notify the datatracker about a new meeting registration'''
     def err(code, text):
         return HttpResponse(text, status=code, content_type='text/plain')
-    required_fields = [ 'meeting', 'first_name', 'last_name', 'affiliation', 'country_code', 'email', 'reg_type', 'ticket_type', ]
+    required_fields = [ 'meeting', 'first_name', 'last_name', 'affiliation', 'country_code',
+                        'email', 'reg_type', 'ticket_type', ]
     fields = required_fields + []
     if request.method == 'POST':
         # parameters:
@@ -140,6 +142,7 @@ def api_new_meeting_registration(request):
             if value is None and item in required_fields:
                 missing_fields.append(item)
             data[item] = value
+        log("Meeting registration notification: %s" % json.dumps(data))
         if missing_fields:
             return err(400, "Missing parameters: %s" % ', '.join(missing_fields))
         number = data['meeting']
@@ -159,8 +162,14 @@ def api_new_meeting_registration(request):
             object, created = MeetingRegistration.objects.get_or_create(meeting_id=meeting.pk, email=email)
             try:
                 # Set attributes not already in the object
-                for key in set(data.keys())-set(['apikey', 'meeting', 'email']):
-                    setattr(object, key, data.get(key))
+                for key in set(data.keys())-set(['attended', 'apikey', 'meeting', 'email',]):
+                    new = data.get(key)
+                    cur = getattr(object, key, None)
+                    if key in ['reg_type', 'ticket_type', ] and cur and not new in cur:
+                        # Special handling for multiple reg types
+                        setattr(object, key, cur+' '+new)
+                    else:
+                        setattr(object, key, new)
                 person = Person.objects.filter(email__address=email)
                 if person.exists():
                     object.person = person.first()