Skip to content

Commit

Permalink
Add more information in json full json format for invitations
Browse files Browse the repository at this point in the history
  • Loading branch information
@doumdi
doumdi committed Dec 12, 2024
1 parent f51a7ed commit b0f5a66
Show file tree
Hide file tree
Showing 2 changed files with 140 additions and 0 deletions.
53 changes: 53 additions & 0 deletions teraserver/python/opentera/db/models/TeraTestInvitation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,61 @@ def to_json(self, ignore_fields=None, minimal=False):
'test_invitation_device'])

json_value = super().to_json(ignore_fields=ignore_fields)

if not minimal:
# Add minimum test type information
if self.test_invitation_test_type is not None:
json_value['test_invitation_test_type'] = {
'test_type_uuid': self.test_invitation_test_type.test_type_uuid,
'test_type_name': self.test_invitation_test_type.test_type_name,
'test_type_description': self.test_invitation_test_type.test_type_description,
'test_type_key': self.test_invitation_test_type.test_type_key
}

# Add session information
if self.test_invitation_session is not None:
json_value['test_invitation_session'] = {
'session_uuid': self.test_invitation_session.session_uuid,
'session_name': self.test_invitation_session.session_name
}

# Add user information
if self.test_invitation_user is not None:
json_value['test_invitation_user'] = {
'user_uuid': self.test_invitation_user.user_uuid,
'user_firstname': self.test_invitation_user.user_firstname,
'user_lastname': self.test_invitation_user.user_lastname
}

# Add participant information
if self.test_invitation_participant is not None:
json_value['test_invitation_participant'] = {
'participant_uuid': self.test_invitation_participant.participant_uuid,
'participant_name': self.test_invitation_participant.participant_name
}

# Add device information
if self.test_invitation_device is not None:
json_value['test_invitation_device'] = {
'device_uuid': self.test_invitation_device.device_uuid,
'device_name': self.test_invitation_device.device_name
}

return json_value


def from_json(self, json, ignore_fields=None):
if ignore_fields is None:
ignore_fields = []

ignore_fields.extend(['test_invitation_test_type',
'test_invitation_session'
'test_invitation_user',
'test_invitation_participant',
'test_invitation_device'])

super().from_json(json, ignore_fields)

@staticmethod
def create_defaults(test=False):
if test:
Expand Down
87 changes: 87 additions & 0 deletions teraserver/python/tests/opentera/db/models/test_TeraTestInvitation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,36 @@ def test_update_invitation_key_should_raise_integrity_error(self):
TeraTestInvitation.update(invitation.id_test_invitation,
TeraTestInvitation.clean_values(invitation.to_json()))

def test_to_json(self):
"""
Test to_json method
"""
with self._flask_app.app_context():
invitation1 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_user=1)
invitation2 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_participant=1)
invitation3 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_device=1)
invitation4 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_session=1, id_user=1)

for invitation in [invitation1, invitation2, invitation3, invitation4]:
self._verify_to_json(invitation, minimal=True)
self._verify_to_json(invitation, minimal=False)

def test_from_json(self):
"""
Test from_json method
"""
with self._flask_app.app_context():
invitation1 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_user=1)
invitation2 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_participant=1)
invitation3 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_device=1)
invitation4 : TeraTestInvitation = TeraTestInvitationTest.new_test_invitation(id_test_type=1, id_session=1, id_user=1)

for invitation in [invitation1, invitation2, invitation3, invitation4]:
invitation_json = invitation.to_json(minimal=True)
new_invitation = TeraTestInvitation()
new_invitation.from_json(invitation_json)
self.assertEqual(invitation_json, new_invitation.to_json(minimal=True))

@staticmethod
def new_test_invitation(id_test_type: int,
id_session: int = None,
Expand All @@ -172,3 +202,60 @@ def new_test_invitation(id_test_type: int,
invitation.test_invitation_message = "Test invitation message"
TeraTestInvitation.insert(invitation)
return invitation

def _verify_to_json(self, invitation : TeraTestInvitation, minimal: bool = False):

invitation_json = invitation.to_json(minimal=minimal)
self.assertTrue('id_test_invitation' in invitation_json)
self.assertEqual(invitation_json['id_test_invitation'], invitation.id_test_invitation)
self.assertTrue('id_test_type' in invitation_json)
self.assertEqual(invitation_json['id_test_type'], invitation.id_test_type)
self.assertTrue('id_user' in invitation_json)
self.assertEqual(invitation_json['id_user'], invitation.id_user)
self.assertTrue('id_participant' in invitation_json)
self.assertEqual(invitation_json['id_participant'], invitation.id_participant)
self.assertTrue('id_device' in invitation_json)
self.assertEqual(invitation_json['id_device'], invitation.id_device)
self.assertTrue('id_session' in invitation_json)
self.assertEqual(invitation_json['id_session'], invitation.id_session)
self.assertTrue('test_invitation_key' in invitation_json)
self.assertEqual(invitation_json['test_invitation_key'], invitation.test_invitation_key)
self.assertTrue('test_invitation_message' in invitation_json)
self.assertEqual(invitation_json['test_invitation_message'], invitation.test_invitation_message)
self.assertTrue('test_invitation_creation_date' in invitation_json)
self.assertEqual(invitation_json['test_invitation_creation_date'], invitation.test_invitation_creation_date.isoformat())
self.assertTrue('test_invitation_expiration_date' in invitation_json)
self.assertEqual(invitation_json['test_invitation_expiration_date'], invitation.test_invitation_expiration_date.isoformat())
self.assertTrue('test_invitation_max_count' in invitation_json)
self.assertEqual(invitation_json['test_invitation_max_count'], invitation.test_invitation_max_count)
self.assertTrue('test_invitation_count' in invitation_json)
self.assertEqual(invitation_json['test_invitation_count'], invitation.test_invitation_count)

if minimal:
self.assertEqual(len(invitation_json), 12)
self.assertFalse('test_invitation_test_type' in invitation_json)
self.assertFalse('test_invitation_session' in invitation_json)
self.assertFalse('test_invitation_user' in invitation_json)
self.assertFalse('test_invitation_participant' in invitation_json)
self.assertFalse('test_invitation_device' in invitation_json)
else:
count = 13
self.assertTrue('test_invitation_test_type' in invitation_json)

if invitation.id_session:
count += 1
self.assertTrue('test_invitation_session' in invitation_json)

if invitation.id_user:
count += 1
self.assertTrue('test_invitation_user' in invitation_json)

if invitation.id_participant:
count += 1
self.assertTrue('test_invitation_participant' in invitation_json)

if invitation.id_device:
count += 1
self.assertTrue('test_invitation_device' in invitation_json)

self.assertEqual(len(invitation_json), count)

0 comments on commit b0f5a66

Please sign in to comment.