Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/tet 981 stova attendee ingestion fields #5969

Merged
merged 2 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Generated by Django 4.2.17 on 2025-02-20 13:41

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('company_activity', '0030_match_stova_data_for_state'),
]

operations = [
migrations.AlterField(
model_name='stovaattendee',
name='category',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='created_by',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='created_date',
field=models.DateTimeField(blank=True, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='language',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='last_lobby_login',
field=models.DateTimeField(blank=True, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='modified_by',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='modified_date',
field=models.DateTimeField(blank=True, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='registration_status',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AlterField(
model_name='stovaattendee',
name='virtual_event_attendance',
field=models.CharField(blank=True, max_length=255, null=True),
),
]
18 changes: 9 additions & 9 deletions datahub/company_activity/models/stova_attendee.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ class StovaAttendee(models.Model):
stova_attendee_id = models.IntegerField(unique=True)
stova_event_id = models.IntegerField(unique=True)

created_by = models.CharField(max_length=MAX_LENGTH)
created_date = models.DateTimeField()
modified_by = models.CharField(max_length=MAX_LENGTH)
modified_date = models.DateTimeField()
created_by = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)
created_date = models.DateTimeField(blank=True, null=True)
modified_by = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)
modified_date = models.DateTimeField(blank=True, null=True)

email = models.CharField(max_length=MAX_LENGTH)
first_name = models.CharField(max_length=MAX_LENGTH)
last_name = models.CharField(max_length=MAX_LENGTH)
attendee_questions = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)

company_name = models.CharField(max_length=MAX_LENGTH)
category = models.CharField(max_length=MAX_LENGTH)
registration_status = models.CharField(max_length=MAX_LENGTH)
category = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)
registration_status = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)

virtual_event_attendance = models.CharField(max_length=MAX_LENGTH)
language = models.CharField(max_length=MAX_LENGTH)
virtual_event_attendance = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)
language = models.CharField(max_length=MAX_LENGTH, blank=True, null=True)

last_lobby_login = models.DateTimeField()
last_lobby_login = models.DateTimeField(blank=True, null=True)

# Data Hub Fields
created_on = models.DateTimeField(auto_now_add=True)
Expand Down
26 changes: 26 additions & 0 deletions datahub/company_activity/tasks/ingest_stova_attendees.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,23 @@ def ingest_object(self) -> None:
self.default_advisor = self.get_or_create_default_stova_adviser()
return super().ingest_object()

@staticmethod
def _required_fields() -> list:
"""
Returns a list of fields required for to make a StovaAttendee a Data Hub Contact.
Any fields listed here but not provided by Stova will be rejected from ingestion.

:return: Required fields to save a StovaAttendee.
"""
return [
'id',
'event_id',
'company_name',
'first_name',
'last_name',
'email',
]

@transaction.atomic
def _process_record(self, record: dict) -> None:
"""
Expand All @@ -80,6 +97,15 @@ def _process_record(self, record: dict) -> None:
details.
:returns: None
"""
required_fields = self._required_fields()
for field in required_fields:
if record[field] is None or record[field] == '':
logger.info(
f'Stova Attendee with id {record["id"]} does not have required field {field}. '
'This stova attendee will not be processed into Data Hub.',
)
return

values = {
'stova_attendee_id': record.get('id'),
'stova_event_id': record.get('event_id', ''),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -547,3 +547,40 @@ def test_get_or_create_company__returns_when_company_name_empty(
company = ingestion_task.get_or_create_company(data)
assert 'No company name available, skipping attendee 1234' in caplog.text
assert company is None

@pytest.mark.django_db
@pytest.mark.parametrize(
'required_field',
(
'id',
'event_id',
'company_name',
'first_name',
'last_name',
'email',
),
)
def test_stova_attendee_ingestion_rejects_attendee_if_missing_required_fields(
self,
caplog,
test_base_stova_attendee,
required_field,
):
"""
Some fields are required by Data Hub events, if a Stova Event does not provide these fields
the stova event will not be ingested.
"""
s3_processor_mock = mock.Mock()
task = StovaAttendeeIngestionTask('dummy-prefix', s3_processor_mock)

data = test_base_stova_attendee
data[required_field] = None

with caplog.at_level(logging.INFO):
task._process_record(data)
assert (
f'Stova Attendee with id {data["id"]} does not have required field '
f'{required_field}. This stova attendee will not be processed into Data Hub.'
) in caplog.text

assert StovaAttendee.objects.count() == 0