From 299cbcdd46672eb4424066d44891e03fd7c41115 Mon Sep 17 00:00:00 2001 From: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com> Date: Fri, 28 Jan 2022 12:07:20 +0000 Subject: [PATCH] Apply suggestions from code review #265 Co-authored-by: Matthew Richards <32678030+MRichards99@users.noreply.github.com> --- datagateway_api/src/search_api/models.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/datagateway_api/src/search_api/models.py b/datagateway_api/src/search_api/models.py index 16f341f5..a2a2211d 100644 --- a/datagateway_api/src/search_api/models.py +++ b/datagateway_api/src/search_api/models.py @@ -1,5 +1,4 @@ -import abc -from abc import ABC +from abc import ABC, abstractmethod from datetime import datetime, timezone import sys from typing import ClassVar, List, Optional, Union @@ -33,7 +32,7 @@ def _get_icat_field_value(icat_field_name, icat_data): class PaNOSCAttribute(ABC, BaseModel): @classmethod - @abc.abstractmethod + @abstractmethod def from_icat(cls, icat_data, required_related_fields): # noqa: B902, N805 model_fields = cls.__fields__ @@ -54,9 +53,8 @@ def from_icat(cls, icat_data, required_related_fields): # noqa: B902, N805 field_value = None for field_name in icat_field_name: try: - value = _get_icat_field_value(field_name, icat_data) - if value: - field_value = value + field_value = _get_icat_field_value(field_name, icat_data) + if field_value: break except KeyError: continue