fix: remove parsing warning status and overwritten default warning

fix: remove parsing warning status and overwritten default warning st…
tryterra · Jun 15, 2023 · b8d1cdf · b8d1cdf
2 parents fcb4ce1 + 9a5f71a
commit b8d1cdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/terra/api/api_responses.py b/terra/api/api_responses.py
@@ -72,7 +72,7 @@ def _parse_api_body(
     if "user" in body:
         Auser = models.user.User.from_dict(body["user"])
 
-    if ("status" in body) and (body["status"] in STATUS.keys()):
+    if ("status" in body) and (body["status"] in STATUS.keys()) and (body["status"] != "warning"):
         response = STATUS[body["status"]]().from_dict(body)
 
     elif dtype in USER_DATATYPES:
@@ -352,7 +352,6 @@ class SentToWebhook(TerraParsedApiResponse):
     "nutrition": models.v2.nutrition.Nutrition,
 }
 
-
 DTYPE_TO_RESPONSE = {
     "widget_session": WidgetSession,
     "auth_url": UserAuthUrl,

diff --git a/terra/models/base_model.py b/terra/models/base_model.py
@@ -137,6 +137,9 @@ def from_dict(
                 (inner_item := getattr(data_model, k, *(("NOT_FOUND",) if safe else ()))) in [None, []]
                 or isinstance(inner_item, TerraDataModel)
                 or isinstance(v, list)
+                or (inner_item := getattr(data_model, k, *(("NOT_FOUND",) if safe else ()))) != v  # Added this
+                # condition because the data model has a default status: warning and this condition allows it to
+                # get overwritten
             ):
                 if isinstance(inner_item, TerraDataModel):
                     v = inner_item.from_dict(v)