Finished getters

This commit is contained in:
zandercymatics 2023-09-13 16:02:37 -06:00
parent e5037cd953
commit 43a636b286
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7

View file

@ -773,6 +773,9 @@ class Domain(TimeStampedModel, DomainHelper):
logger.error("Contact does not exist") logger.error("Contact does not exist")
raise error raise error
else: else:
# TODO - is this even needed???????
print(f"generic_contact_getter -> contacts?? {contacts}")
# --> Map to public contact
cached_contact = self.grab_contact_in_keys(contacts, contact_type_choice) cached_contact = self.grab_contact_in_keys(contacts, contact_type_choice)
if(cached_contact is None): if(cached_contact is None):
raise ValueError("No contact was found in cache or the registry") raise ValueError("No contact was found in cache or the registry")
@ -817,29 +820,14 @@ class Domain(TimeStampedModel, DomainHelper):
Otherwise, we grab from the registry. Otherwise, we grab from the registry.
""" """
for contact in contacts: for contact in contacts:
print(f"grab_contact_in_keys -> contact item {contact}")
print(f"grab_contact_in_keys -> isInstace {isinstance(contact, dict)}")
if ( if (
isinstance(contact, dict) isinstance(contact, dict)
and "type" in contact.keys() and "type" in contact.keys()
and "contact" in contact.keys()
and contact["type"] == check_type and contact["type"] == check_type
): ):
# return contact
if(get_latest_from_registry):
request = commands.InfoContact(id=contact.get("contact"))
# TODO - Maybe have this return contact instead,
# Then create a global timer which eventually returns
# the requested content.... And updates it!
contact_info = registry.send(request, cleaned=True)
logger.debug(f"grab_contact_in_keys -> rest data is {contact_info.res_data[0]}")
return self.map_to_public_contact(contact_info.res_data[0])
return contact["contact"]
# If nothing is found in cache, then grab from registry
request = commands.InfoContact(id=contact.get("contact"))
contact_info = registry.send(request, cleaned=True)
logger.debug(f"grab_contact_in_keys -> rest data is {contact_info.res_data[0]}")
return self.map_to_public_contact(contact_info.res_data[0])
# ForeignKey on UserDomainRole creates a "permissions" member for # ForeignKey on UserDomainRole creates a "permissions" member for
# all of the user-roles that are in place for this domain # all of the user-roles that are in place for this domain