diff --git a/ucs-school-import/modules/ucsschool/importer/models/import_user.py b/ucs-school-import/modules/ucsschool/importer/models/import_user.py index 6a2e7697..71d36363 100644 --- a/ucs-school-import/modules/ucsschool/importer/models/import_user.py +++ b/ucs-school-import/modules/ucsschool/importer/models/import_user.py @@ -694,6 +694,7 @@ class ImportUser(User): :returns value read from CSV or calculated from scheme or None :rtype str or None """ + self.logger.debug('### property_name=%r', property_name) try: return self.udm_properties[property_name] except KeyError: @@ -703,10 +704,12 @@ class ImportUser(User): self._lo, _po = get_admin_connection() ldap_attr = get_ldap_mapping_for_udm_property(property_name, self._meta.udm_module, self._lo) if self._schema_write_check(property_name, property_name, ldap_attr): + self.logger.debug('### self._schema_write_check() -> yes') self.udm_properties[property_name] = self.format_from_scheme( property_name, self.config["scheme"][property_name] ) + self.logger.debug('### from format_from_scheme(): self.udm_properties[property_name]=%r', self.udm_properties[property_name]) return self.udm_properties.get(property_name) def make_username(self): @@ -923,14 +926,18 @@ class ImportUser(User): :param kwargs: dict: additional data to use for formatting :return: None """ + self.logger.debug('## prop_to_format=%r scheme=%r kwargs=%r', prop_to_format, scheme, kwargs) no_brackets = scheme props_used_in_scheme = [x[0] for x in self._prop_regex.findall(no_brackets) if x[0]] + self.logger.debug('## props_used_in_scheme=%r', props_used_in_scheme) for prop_used_in_scheme in props_used_in_scheme: + self.logger.debug('## prop_used_in_scheme=%r', prop_used_in_scheme) if (hasattr(self, prop_used_in_scheme) and getattr(self, prop_used_in_scheme) or self.udm_properties.get(prop_used_in_scheme) or prop_used_in_scheme in kwargs or prop_used_in_scheme == "username" and (self.name or self.udm_properties.get("username"))): # property exists and has value + self.logger.debug('## property exists and has value') continue if ( prop_used_in_scheme not in self._prop_providers and @@ -948,6 +955,7 @@ class ImportUser(User): method_sig = FunctionSignature(self._prop_providers[prop_used_in_scheme], (), {}) except KeyError: method_sig = FunctionSignature("make_udm_property", (prop_used_in_scheme,), {}) + self.logger.debug('## method_sig=%r', method_sig) if method_sig in self._used_methods[prop_to_format]: # already ran make_() for his formatting job self.logger.error( @@ -962,8 +970,11 @@ class ImportUser(User): entry_count=self.entry_count, import_user=self ) self._used_methods[prop_to_format].append(method_sig) - getattr(self, method_sig.name)(*method_sig.args, **method_sig.kwargs) + self.logger.debug('## self._used_methods[%r].append(%r)', prop_to_format, method_sig) + res = getattr(self, method_sig.name)(*method_sig.args, **method_sig.kwargs) + self.logger.debug('## getattr(self, %r)(%r, %r)=%r', method_sig.name, method_sig.args, method_sig.kwargs, res) self._used_methods.pop(prop_to_format, None) + self.logger.debug('## self._used_methods.pop(%r, None)', prop_to_format) def format_from_scheme(self, prop_name, scheme, **kwargs): """ @@ -982,6 +993,7 @@ class ImportUser(User): :param kwargs: dict: additional data to use for formatting :return: str: formatted string """ + self.logger.debug('## prop_name=%r scheme=%r kwargs=%r', prop_name, scheme, kwargs) self.solve_format_dependencies(prop_name, scheme, **kwargs) if self.input_data: all_fields = self.reader.get_data_mapping(self.input_data)